b74969
From c940aab7895fa4cb109e7790ae14080090b04959 Mon Sep 17 00:00:00 2001
b74969
From: Remi Collet <remi@php.net>
b74969
Date: Tue, 2 Jul 2013 10:42:47 +0200
b74969
Subject: [PATCH] Fixed Bug #65143 Missing php-cgi man page
b74969
b74969
Currently php-cgi man page is a simple redirect to
b74969
php (CLI) man page.
b74969
b74969
Could be splited / improved in the future.
b74969
---
b74969
 sapi/cgi/Makefile.frag | 3 +++
b74969
 sapi/cgi/config9.m4    | 2 ++
b74969
 sapi/cgi/php-cgi.1.in  | 1 +
b74969
 sapi/cli/php.1.in      | 2 ++
b74969
 4 files changed, 8 insertions(+)
b74969
 create mode 100644 sapi/cgi/php-cgi.1.in
b74969
b74969
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
b74969
index 505119e..d54dd40 100644
b74969
--- a/sapi/cgi/Makefile.frag
b74969
+++ b/sapi/cgi/Makefile.frag
b74969
@@ -6,4 +6,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
b74969
 install-cgi: $(SAPI_CGI_PATH)
b74969
 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
b74969
 	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
b74969
+	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
b74969
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
b74969
+	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
b74969
 
b74969
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
b74969
index 67251ae..49e61c8 100644
b74969
--- a/sapi/cgi/config9.m4
b74969
+++ b/sapi/cgi/config9.m4
b74969
@@ -71,6 +71,8 @@ if test "$PHP_CGI" != "no"; then
b74969
     dnl Expose to Makefile
b74969
     PHP_SUBST(SAPI_CGI_PATH)
b74969
     PHP_SUBST(BUILD_CGI)
b74969
+
b74969
+    PHP_OUTPUT(sapi/cgi/php-cgi.1)
b74969
 else
b74969
   AC_MSG_RESULT(yes)
b74969
 fi
b74969
diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in
b74969
new file mode 100644
b74969
index 0000000..340e6c5
b74969
--- /dev/null
b74969
+++ b/sapi/cgi/php-cgi.1.in
b74969
@@ -0,0 +1 @@
b74969
+.so man1/php.1
b74969
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
b74969
index 0e9d07a..6f0266d 100644
b74969
--- a/sapi/cli/php.1.in
b74969
+++ b/sapi/cli/php.1.in
b74969
@@ -1,6 +1,8 @@
b74969
 .TH PHP 1 "2013" "The PHP Group" "Scripting Language"
b74969
 .SH NAME
b74969
 php \- PHP Command Line Interface 'CLI'
b74969
+.P
b74969
+php-cgi \- PHP Command Gateway Interface 'CGI'
b74969
 .SH SYNOPSIS
b74969
 .B php
b74969
 [options] [
b74969
-- 
b74969
1.7.11.5
b74969
b74969
From f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023 Mon Sep 17 00:00:00 2001
b74969
From: Remi Collet <remi@php.net>
b74969
Date: Tue, 2 Jul 2013 10:46:50 +0200
b74969
Subject: [PATCH] Fixed Bug #65142 Missing phar man page
b74969
b74969
Simple man page from phar help output.
b74969
---
b74969
 NEWS                    |   3 +
b74969
 ext/phar/Makefile.frag  |   4 +
b74969
 ext/phar/config.m4      |   2 +
b74969
 ext/phar/phar.1.in      | 523 ++++++++++++++++++++++++++++++++++++++++++++++++
b74969
 ext/phar/phar.phar.1.in |   1 +
b74969
 5 files changed, 533 insertions(+)
b74969
 create mode 100644 ext/phar/phar.1.in
b74969
 create mode 100644 ext/phar/phar.phar.1.in
b74969
b74969
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
b74969
index b1c820f..ed6de9f 100644
b74969
--- a/ext/phar/Makefile.frag
b74969
+++ b/ext/phar/Makefile.frag
b74969
@@ -40,3 +40,7 @@ install-pharcmd: pharcmd
b74969
 	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
b74969
 	-@rm -f $(INSTALL_ROOT)$(bindir)/phar
b74969
 	$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
b74969
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
b74969
+	@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
b74969
+	@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1
b74969
+
b74969
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
b74969
index 2ac7f3d..d424060 100644
b74969
--- a/ext/phar/config.m4
b74969
+++ b/ext/phar/config.m4
b74969
@@ -27,4 +27,6 @@ if test "$PHP_PHAR" != "no"; then
b74969
   PHP_ADD_EXTENSION_DEP(phar, hash, true)
b74969
   PHP_ADD_EXTENSION_DEP(phar, spl, true)
b74969
   PHP_ADD_MAKEFILE_FRAGMENT
b74969
+
b74969
+  PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1)
b74969
 fi
b74969
diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in
b74969
new file mode 100644
b74969
index 0000000..259a2ba
b74969
--- /dev/null
b74969
+++ b/ext/phar/phar.1.in
b74969
@@ -0,0 +1,523 @@
b74969
+.TH PHAR 1 "2013" "The PHP Group" "User Commands"
b74969
+.SH NAME
b74969
+phar, phar.phar \- PHAR (PHP archive) command line tool
b74969
+.SH SYNOPSIS
b74969
+.B phar
b74969
+<command> [options] ...
b74969
+.LP
b74969
+.SH DESCRIPTION
b74969
+The \fBPHAR\fP file format provides a way to put entire PHP applications into a single
b74969
+file called a "phar" (PHP Archive) for easy distribution and installation.
b74969
+.P
b74969
+With the \fBphar\fP command you can create, update or extract PHP archives.
b74969
+.P
b74969
+Commands: 
b74969
+add compress delete extract help help-list info list meta-del
b74969
+meta-get meta-set pack sign stub-get stub-set tree version
b74969
+
b74969
+.SH add command
b74969
+Add entries to a PHAR package.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.TP
b74969
+.PD
b74969
+.B ...
b74969
+Any number of input files and directories. If -i is in
b74969
+use then ONLY files and matching the given regular
b74969
+expression are being packed. If -x is given then files
b74969
+matching that regular expression are NOT being packed.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-a \fIalias\fP
b74969
+Provide an \fIalias\fP name for the phar file.
b74969
+.TP
b74969
+.PD
b74969
+.B \-c \fIalgo\fP
b74969
+Compression algorithm (see 
b74969
+.SM
b74969
+.B COMPRESSION
b74969
+)
b74969
+.TP
b74969
+.PD
b74969
+.B \-i \fIregex\fP
b74969
+Specifies a regular expression for input files.
b74969
+.TP
b74969
+.PD
b74969
+.B \-l \fIlevel\fP
b74969
+Number of preceding subdirectories to strip from file entries
b74969
+.TP
b74969
+.PD
b74969
+.B \-x \fIregex\fP
b74969
+Regular expression for input files to exclude.
b74969
+
b74969
+.SH compress command
b74969
+Compress or uncompress all files or a selected entry.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-c \fIalgo\fP
b74969
+Compression algorithm (see 
b74969
+.SM
b74969
+.B COMPRESSION
b74969
+)
b74969
+.TP
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -e \fIentry\fP
b74969
+Name of \fIentry\fP to work on (must include PHAR internal
b74969
+directory name if any).
b74969
+
b74969
+.SH delete command
b74969
+Delete entry from a PHAR archive
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-e \fIentry\fP
b74969
+Name of \fIentry\fP to work on (must include PHAR internal
b74969
+directory name if any).
b74969
+.TP
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+
b74969
+.SH extract command
b74969
+Extract a PHAR package to a directory.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -i \fIregex\fP
b74969
+Specifies a regular expression for input files.
b74969
+.TP
b74969
+.PD
b74969
+.B -x \fIregex\fP
b74969
+Regular expression for input files to exclude.
b74969
+.TP
b74969
+.PD
b74969
+.B ...
b74969
+Directory to extract to (defaults to '.').
b74969
+
b74969
+
b74969
+.SH help command
b74969
+This help or help for a selected command.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B ...
b74969
+Optional command to retrieve help for.
b74969
+
b74969
+.SH help-list command
b74969
+Lists available commands.
b74969
+
b74969
+.SH info command
b74969
+Get information about a PHAR package.
b74969
+.P
b74969
+By using -k it is possible to return a single value.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -k \fIindex\fP
b74969
+Subscription \fIindex\fP to work on.
b74969
+
b74969
+.SH list command
b74969
+List contents of a PHAR archive.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -i \fIregex\fP
b74969
+Specifies a regular expression for input files.
b74969
+.TP
b74969
+.PD
b74969
+.B -x \fIregex\fP
b74969
+Regular expression for input files to exclude.
b74969
+
b74969
+
b74969
+.SH meta-del command
b74969
+Delete meta information of a PHAR entry or a PHAR package.
b74969
+.P
b74969
+If -k is given then the metadata is expected to be an array and the
b74969
+given index is being deleted.
b74969
+.P
b74969
+If something was deleted the return value is 0 otherwise it is 1.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -e \fIentry\fP
b74969
+Name of \fIentry\fP to work on (must include PHAR internal
b74969
+directory name if any).
b74969
+.TP
b74969
+.PD
b74969
+.B -k \fIindex\fP
b74969
+Subscription \fIindex\fP to work on.
b74969
+
b74969
+.SH meta-get command
b74969
+Get meta information of a PHAR entry or a PHAR package in serialized from. If
b74969
+no output file is specified for meta data then stdout is being used.
b74969
+You can also specify a particular index using -k. In that case the
b74969
+metadata is expected to be an array and the value of the given index
b74969
+is returned using echo rather than using serialize. If that index does
b74969
+not exist or no meta data is present then the return value is 1.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -e \fIentry\fP
b74969
+Name of \fIentry\fP to work on (must include PHAR internal
b74969
+directory name if any).
b74969
+.TP
b74969
+.PD
b74969
+.B -k \fIindex\fP
b74969
+Subscription \fIindex\fP to work on.
b74969
+
b74969
+.SH meta-set command
b74969
+Set meta data of a PHAR entry or a PHAR package using serialized input. If no
b74969
+input file is specified for meta data then stdin is being used. You can
b74969
+also specify a particular index using -k. In that case the metadata is
b74969
+expected to be an array and the value of the given index is being set.
b74969
+If the metadata is not present or empty a new array will be created.
b74969
+If the metadata is present and a flat value then the return value is
b74969
+1. Also using -k the input is been taken directly rather then being
b74969
+serialized.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.TP
b74969
+.PD
b74969
+.B -m \fImeta\fP
b74969
+Meta data to store with entry (serialized php data).
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -e \fIentry\fP
b74969
+Name of \fIentry\fP to work on (must include PHAR internal
b74969
+directory name if any).
b74969
+.TP
b74969
+.PD
b74969
+.B -k \fIindex\fP
b74969
+Subscription \fIindex\fP to work on.
b74969
+
b74969
+.SH pack command
b74969
+Pack files into a PHAR archive.
b74969
+.P
b74969
+When using -s <stub>, then the stub file is being excluded from the
b74969
+list of input files/dirs.To create an archive that contains PEAR class
b74969
+PHP_Archive then point -p argument to PHP/Archive.php.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.TP
b74969
+.PD
b74969
+.B ...
b74969
+Any number of input files and directories. If -i is in
b74969
+use then ONLY files and matching the given regular
b74969
+expression are being packed. If -x is given then files
b74969
+matching that regular expression are NOT being packed.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-a \fIalias\fP
b74969
+Provide an \fIalias\fP name for the phar file.
b74969
+.TP
b74969
+.PD
b74969
+.B \-b \fIbang\fP
b74969
+Hash-bang line to start the archive (e.g. #!/usr/bin/php).
b74969
+The hash mark itself '#!' and the newline character are optional.
b74969
+.TP
b74969
+.PD
b74969
+.B \-c \fIalgo\fP
b74969
+Compression algorithm (see 
b74969
+.SM
b74969
+.B COMPRESSION
b74969
+)
b74969
+.TP
b74969
+.PD
b74969
+.B \-h \fIhash\fP
b74969
+Selects the \fIhash\fP algorithm (see 
b74969
+.SM
b74969
+.B HASH
b74969
+)
b74969
+.TP
b74969
+.PD
b74969
+.B \-i \fIregex\fP
b74969
+Specifies a regular expression for input files.
b74969
+.TP
b74969
+.PD
b74969
+.B \-l \fIlevel\fP
b74969
+Number of preceding subdirectories to strip from file entries
b74969
+.TP
b74969
+.PD
b74969
+.B \-p \fIloader\fP
b74969
+Location of PHP_Archive class file (pear list-files
b74969
+PHP_Archive).You can use '0' or '1' to locate it
b74969
+automatically using the mentioned pear command. When
b74969
+using '0' the command does not error out when the class
b74969
+file cannot be located. This switch also adds some code
b74969
+around the stub so that class PHP_Archive gets
b74969
+registered as phar:// stream wrapper if necessary. And
b74969
+finally this switch will add the file phar.inc from
b74969
+this package and load it to ensure class Phar is
b74969
+present.
b74969
+.TP
b74969
+.PD
b74969
+.B \-s \fIstub\fP
b74969
+Select the \fIstub\fP file.
b74969
+.TP
b74969
+.PD
b74969
+.B \-x \fIregex\fP
b74969
+Regular expression for input files to exclude.
b74969
+.TP
b74969
+.PD
b74969
+.B \-y \fIkey\fP
b74969
+Private \fIkey\fP for OpenSSL signing.
b74969
+
b74969
+.SH sign command
b74969
+Set signature hash algorithm.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.TP
b74969
+.PD
b74969
+.B \-h \fIhash\fP
b74969
+Selects the \fIhash\fP algorithm (see 
b74969
+.SM
b74969
+.B HASH
b74969
+)
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-y \fIkey\fP
b74969
+Private \fIkey\fP for OpenSSL signing.
b74969
+
b74969
+.SH stub-get command
b74969
+Get the stub of a PHAR file. If no output file is specified as stub then stdout
b74969
+is being used.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-s \fIstub\fP
b74969
+Select the \fIstub\fP file.
b74969
+
b74969
+.SH stub-set command
b74969
+Set the stub of a PHAR file. If no input file is specified as stub then stdin
b74969
+is being used.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-b \fIbang\fP
b74969
+Hash-bang line to start the archive (e.g. #!/usr/bin/php).
b74969
+The hash mark itself '#!' and the newline character are optional.
b74969
+.TP
b74969
+.PD
b74969
+.B \-p \fIloader\fP
b74969
+Location of PHP_Archive class file (pear list-files
b74969
+PHP_Archive).You can use '0' or '1' to locate it
b74969
+automatically using the mentioned pear command. When
b74969
+using '0' the command does not error out when the class
b74969
+file cannot be located. This switch also adds some code
b74969
+around the stub so that class PHP_Archive gets
b74969
+registered as phar:// stream wrapper if necessary. And
b74969
+finally this switch will add the file phar.inc from
b74969
+this package and load it to ensure class Phar is
b74969
+present.
b74969
+.TP
b74969
+.PD
b74969
+.B \-s \fIstub\fP
b74969
+Select the \fIstub\fP file.
b74969
+
b74969
+
b74969
+.SH tree command
b74969
+Get a directory tree for a PHAR archive.
b74969
+.P
b74969
+Required arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B -f \fIfile\fP
b74969
+Specifies the phar \fIfile\fP to work on.
b74969
+.P
b74969
+Optional arguments:
b74969
+.TP 15
b74969
+.PD
b74969
+.B \-i \fIregex\fP
b74969
+Specifies a regular expression for input files.
b74969
+.TP
b74969
+.PD
b74969
+.B \-x \fIregex\fP
b74969
+Regular expression for input files to exclude.
b74969
+
b74969
+.SH version command
b74969
+Get information about the PHAR environment and the tool version.
b74969
+
b74969
+
b74969
+.SH COMPRESSION
b74969
+Algorithms:
b74969
+.TP 15
b74969
+.PD
b74969
+.B 0
b74969
+No compression
b74969
+.TP
b74969
+.PD
b74969
+.B none
b74969
+No compression
b74969
+.TP
b74969
+.PD
b74969
+.B auto
b74969
+Automatically select compression algorithm
b74969
+.TP
b74969
+.PD
b74969
+.B gz
b74969
+GZip compression
b74969
+.TP
b74969
+.PD
b74969
+.B gzip
b74969
+GZip compression
b74969
+.TP
b74969
+.PD
b74969
+.B bz2
b74969
+BZip2 compression
b74969
+.TP
b74969
+.PD
b74969
+.B bzip2
b74969
+BZip2 compression
b74969
+
b74969
+.SH HASH
b74969
+Algorithms:
b74969
+.TP 15
b74969
+.PD
b74969
+.TP
b74969
+.PD
b74969
+.B md5
b74969
+MD5
b74969
+.TP
b74969
+.PD
b74969
+.B sha1
b74969
+SHA1
b74969
+.TP
b74969
+.PD
b74969
+.B sha256
b74969
+SHA256
b74969
+.TP
b74969
+.PD
b74969
+.B sha512
b74969
+SHA512
b74969
+.TP
b74969
+.PD
b74969
+.B openssl
b74969
+OpenSSL
b74969
+
b74969
+.SH SEE ALSO
b74969
+For a more or less complete description of PHAR look here:
b74969
+.PD 0
b74969
+.P
b74969
+.B http://php.net/phar
b74969
+.PD 1
b74969
+.P
b74969
+.SH BUGS
b74969
+You can view the list of known bugs or report any new bug you
b74969
+found at:
b74969
+.PD 0
b74969
+.P
b74969
+.B http://bugs.php.net
b74969
+.PD 1
b74969
+.SH AUTHORS
b74969
+The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski.
b74969
+.P
b74969
+Work for the PHP archive was done by Gregory Beaver, Marcus Boerger.
b74969
+.P
b74969
+A List of active developers can be found here:
b74969
+.PD 0
b74969
+.P
b74969
+.B http://www.php.net/credits.php
b74969
+.PD 1
b74969
+.P
b74969
+And last but not least PHP was developed with the help of a huge amount of 
b74969
+contributors all around the world.
b74969
+.SH VERSION INFORMATION
b74969
+This manpage describes \fBphar\fP, version @PHP_VERSION@.
b74969
+.SH COPYRIGHT
b74969
+Copyright \(co 1997\-2013 The PHP Group
b74969
+.LP
b74969
+This source file is subject to version 3.01 of the PHP license,
b74969
+that is bundled with this package in the file LICENSE, and is
b74969
+available through the world-wide-web at the following url:
b74969
+.PD 0
b74969
+.P
b74969
+.B http://www.php.net/license/3_01.txt
b74969
+.PD 1
b74969
+.P
b74969
+If you did not receive a copy of the PHP license and are unable to
b74969
+obtain it through the world-wide-web, please send a note to
b74969
+.B license@php.net
b74969
+so we can mail you a copy immediately.
b74969
diff --git a/ext/phar/phar.phar.1.in b/ext/phar/phar.phar.1.in
b74969
new file mode 100644
b74969
index 0000000..b5eecbf
b74969
--- /dev/null
b74969
+++ b/ext/phar/phar.phar.1.in
b74969
@@ -0,0 +1 @@
b74969
+.so man1/phar.1
b74969
-- 
b74969
1.7.11.5
b74969
b74969
From 67817a199ca4c8bcff163cb005287c0087db6bf3 Mon Sep 17 00:00:00 2001
b74969
From: Remi Collet <remi@php.net>
b74969
Date: Tue, 2 Jul 2013 12:19:09 +0200
b74969
Subject: [PATCH] fix typo in php man page
b74969
b74969
---
b74969
 sapi/cli/php.1.in | 2 +-
b74969
 1 file changed, 1 insertion(+), 1 deletion(-)
b74969
b74969
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
b74969
index 6f0266d..749baa8 100644
b74969
--- a/sapi/cli/php.1.in
b74969
+++ b/sapi/cli/php.1.in
b74969
@@ -2,7 +2,7 @@
b74969
 .SH NAME
b74969
 php \- PHP Command Line Interface 'CLI'
b74969
 .P
b74969
-php-cgi \- PHP Command Gateway Interface 'CGI'
b74969
+php-cgi \- PHP Common Gateway Interface 'CGI' command
b74969
 .SH SYNOPSIS
b74969
 .B php
b74969
 [options] [
b74969
-- 
b74969
1.7.11.5
b74969