Skip to content

Commit dde4d2e

Browse files
committed
Fix bug #67878 program_prefix not honoured in man pages
- add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
1 parent 333f093 commit dde4d2e

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

sapi/cli/php.1.in

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
.TH PHP 1 "2014" "The PHP Group" "Scripting Language"
1+
.TH @program_prefix@php 1 "2014" "The PHP Group" "Scripting Language"
22
.SH NAME
3-
php \- PHP Command Line Interface 'CLI'
3+
@program_prefix@php \- PHP Command Line Interface 'CLI'
44
.P
5-
php-cgi \- PHP Common Gateway Interface 'CGI' command
5+
@program_prefix@php-cgi \- PHP Common Gateway Interface 'CGI' command
66
.SH SYNOPSIS
7-
.B php
7+
.B @program_prefix@php
88
[options] [
99
.B \-f\fP ]
1010
.IR file
1111
[[\-\-]
1212
.IR args.\|.\|. ]
1313
.LP
14-
.B php
14+
.B @program_prefix@php
1515
[options]
1616
.B \-r
1717
.IR code
1818
[[\-\-]
1919
.IR args.\|.\|. ]
2020
.LP
21-
.B php
21+
.B @program_prefix@php
2222
[options] [\-B
2323
.IR begin_code ]
2424
.B \-R
@@ -28,7 +28,7 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
2828
[[\-\-]
2929
.IR args.\|.\|. ]
3030
.LP
31-
.B php
31+
.B @program_prefix@php
3232
[options] [\-B
3333
.IR begin_code ]
3434
.B \-F
@@ -38,13 +38,13 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
3838
[[\-\-]
3939
.IR args.\|.\|. ]
4040
.LP
41-
.B php
41+
.B @program_prefix@php
4242
[options] \-\- [
4343
.IR args.\|.\|. ]
4444
.LP
45-
\fBphp \fP[options] \fB\-a\fP
45+
\fB@program_prefix@php \fP[options] \fB\-a\fP
4646
.LP
47-
.B php
47+
.B @program_prefix@php
4848
[options] \-S
4949
.IR addr:port
5050
[\-t
@@ -374,35 +374,35 @@ The standard configuration file will only be used when
374374
cannot be found.
375375
.SH EXAMPLES
376376
.TP 5
377-
\fIphp \-r 'echo "Hello World\\n";'\fP
377+
\fI@program_prefix@php \-r 'echo "Hello World\\n";'\fP
378378
This command simply writes the text "Hello World" to standard out.
379379
.TP
380-
\fIphp \-r 'print_r(gd_info());'\fP
380+
\fI@program_prefix@php \-r 'print_r(gd_info());'\fP
381381
This shows the configuration of your gd extension. You can use this
382382
to easily check which image formats you can use. If you have any
383383
dynamic modules you may want to use the same ini file that php uses
384384
when executed from your webserver. There are more extensions which
385385
have such a function. For dba use:
386386
.RS
387-
\fIphp \-r 'print_r(dba_handlers(1));'\fP
387+
\fI@program_prefix@php \-r 'print_r(dba_handlers(1));'\fP
388388
.RE
389389
.TP
390-
\fIphp \-R 'echo strip_tags($argn)."\\n";'\fP
390+
\fI@program_prefix@php \-R 'echo strip_tags($argn)."\\n";'\fP
391391
This PHP command strips off the HTML tags line by line and outputs the
392392
result. To see how it works you can first look at the following PHP command
393393
\'\fIphp \-d html_errors=1 \-i\fP\' which uses PHP to output HTML formatted
394394
configuration information. If you then combine those two
395395
\'\fIphp \.\.\.|php \.\.\.\fP\' you'll see what happens.
396396
.TP
397-
\fIphp \-E 'echo "Lines: $argi\\n";'\fP
397+
\fI@program_prefix@php \-E 'echo "Lines: $argi\\n";'\fP
398398
Using this PHP command you can count the lines being input.
399399
.TP
400-
\fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
400+
\fI@program_prefix@php \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
401401
In this example PHP expects each input line being a file. It counts all lines
402402
of the files specified by each input line and shows the summarized result.
403403
You may combine this with tools like find and change the php scriptlet.
404404
.TP
405-
\fIphp \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
405+
\fI@program_prefix@php \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
406406
Since you have access to STDIN from within \-B \-R \-F and \-E you can skip
407407
certain input lines with your code. But note that in such cases $argi only
408408
counts the lines being processed by php itself. Having read this you will

scripts/man1/php-config.1.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.TH php\-config 1 "2010" "The PHP Group" "Scripting Language"
1+
.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language"
22
.SH NAME
3-
php\-config \- get information about PHP configuration and compile options
3+
@program_prefix@php\-config \- get information about PHP configuration and compile options
44
.SH SYNOPSIS
5-
.B php\-config
5+
.B @program_prefix@php\-config
66
[options]
77
.LP
88
.SH DESCRIPTION
9-
.B php\-config
9+
.B @program_prefix@php\-config
1010
is a simple shell script for obtaining information about installed PHP configuration.
1111
.SH OPTIONS
1212
.TP 15
@@ -57,15 +57,15 @@ PHP version
5757
.PD 0
5858
.B \-\-vernum
5959
PHP version as integer
60-
.TP
60+
.RS
6161
.PD 1
6262
.P
6363
.SH SEE ALSO
64-
.BR php (1)
64+
.BR @program_prefix@php (1)
6565
.SH VERSION INFORMATION
6666
This manpage describes \fBphp\fP, version @PHP_VERSION@.
6767
.SH COPYRIGHT
68-
Copyright \(co 1997\-2010 The PHP Group
68+
Copyright \(co 1997\-2014 The PHP Group
6969
.LP
7070
This source file is subject to version 3.01 of the PHP license,
7171
that is bundled with this package in the file LICENSE, and is

scripts/man1/phpize.1.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.TH phpize 1 "2010" "The PHP Group" "Scripting Language"
1+
.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language"
22
.SH NAME
3-
phpize \- prepare a PHP extension for compiling
3+
@program_prefix@phpize \- prepare a PHP extension for compiling
44
.SH SYNOPSIS
5-
.B phpize
5+
.B @program_prefix@phpize
66
[options]
77
.LP
88
.SH DESCRIPTION
9-
.B phpize
9+
.B @program_prefix@phpize
1010
is a shell script to prepare PHP extension for compiling.
1111
.SH OPTIONS
1212
.TP 15
@@ -24,15 +24,15 @@ Prints usage information
2424
.PD 1
2525
.B \-v
2626
Prints API version information
27-
.TP
27+
.RS
2828
.PD 1
2929
.P
3030
.SH SEE ALSO
31-
.BR php (1)
31+
.BR @program_prefix@php (1)
3232
.SH VERSION INFORMATION
3333
This manpage describes \fBphp\fP, version @PHP_VERSION@.
3434
.SH COPYRIGHT
35-
Copyright \(co 1997\-2010 The PHP Group
35+
Copyright \(co 1997\-2014 The PHP Group
3636
.LP
3737
This source file is subject to version 3.01 of the PHP license,
3838
that is bundled with this package in the file LICENSE, and is

0 commit comments

Comments
 (0)