From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 25 Jun 2014 11:26:58 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/oerdnj/phpdbg into master
X-Git-Tag: php-5.6.0RC2~1^2~23^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=858b45d4ad86a9d1ec857e20cf8c8e33c15500c0;p=php

Merge branch 'master' of https://github.com/oerdnj/phpdbg into master
Rewritten author line and included instructions to make install the man page
---

858b45d4ad86a9d1ec857e20cf8c8e33c15500c0
diff --cc Makefile.frag
index d787b0fb18,d787b0fb18..b276aaaa53
--- a/Makefile.frag
+++ b/Makefile.frag
@@@ -26,6 -26,6 +26,9 @@@ install-phpdbg: $(BUILD_BINARY
  	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
  	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
  	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
++	@echo "Installing phpdbg man page:       $(INSTALL_ROOT)$(mandir)/man1/"
++	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
++	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
  
  clean-phpdbg:
  	@echo "Cleaning phpdbg object files ..."
diff --cc phpdbg.1
index 0000000000,68568d03e1..5e4d144c83
mode 000000,100644..100644
--- a/phpdbg.1
+++ b/phpdbg.1
@@@ -1,0 -1,59 +1,59 @@@
+ .TH PHPDBG 1
+ .SH NAME
+ phpdbg \- The interactive PHP debugger
+ .SH SYNOPSIS
+ .B phpdbg
+ [OPTION]
+ [\fB\-e\fIFILE\fR]
+ .SH DESCRIPTION
+ .B phpdbg
+ a lightweight, powerful, easy to use debugging platform for PHP5.
+ .SH OPTIONS
+ The following switches are implemented (just like cli SAPI):
+ .TP
+ .BR \-n
+ No \fBphp.ini\fR file will be used
+ .TP
+ .BR \-c \fIpath\fB|\fIfile\fR
+ Look for \fBphp.ini\fR file in the directory \fIpath\fR or use the specified \fIfile\fR
+ .TP
+ .BR \-z \fIfile\fR
+ Load Zend extension \fIfile\fR
+ .TP
+ .BR \-d \fIfoo\fB[=\fIbar\fB]\fR
+ Define INI entry \fIfoo\fR with value \fIbar\fR
+ .PP The following switches change the default behaviour of phpdbg:
+ .TP
+ .BR \-v
+ Disables quietness
+ .TP
+ .BR \-s
+ Enabled stepping
+ .TP
+ .BR -e \fIfile\fR
+ Sets execution context
+ .TP
+ .BR \-b
+ Disables use of colour on the console
+ .TP
+ .BR \-I
+ Ignore .phpdbginit (default init file)
+ .TP
+ .BR \-i \fIpath\fB|\ffile\fR
+ Override .phpgdbinit location (implies -I)
+ .TP
+ .BR \-O \fIfile\fR
+ Set oplog output to \fIfile\fR
+ .TP
+ .BR \-q
+ Do not print banner on startup
+ .TP
+ .BR \-r
+ Jump straight to run
+ .TP
+ .BR \-E
+ Enable step through eval()
+ .SH NOTES
+ Passing -rr will cause phpdbg to quit after execution, rather than returning to the console
+ .SH AUTHOR
 -Written by Ondřej Surý for Debian project.
++Written by Felipe Pena, Joe Watkins and Bob Weinand, formatted by Ondřej Surý for Debian project.