Merge branch 'master-5.6' of git://anonscm.debian.org/pkg-php/php

Conflicts:
	debian/changelog
	debian/patches/series

3 files changed, 15 insertions, 15 deletions

diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php
index f95c46251..e841e2e95 100644
--- a/scripts/dev/find_tested.php
+++ b/scripts/dev/find_tested.php
@@ -88,7 +88,7 @@ function mark_methods_as_tested($method_info, $phpt_files) {
 
         foreach($tested_functions as $tested_function) {
 
-            // go through method info array marking this funtion as tested
+            // go through method info array marking this function as tested
             foreach($method_info as &$current_method_record) {
                 if (strcasecmp($tested_function, $current_method_record[METHOD_NAME]) == 0) {
                     // matched the method name
diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
index 5c60408f4..ae2ee56bb 100644
--- a/scripts/man1/php-config.1.in
+++ b/scripts/man1/php-config.1.in
@@ -1,12 +1,12 @@
-.TH php\-config 1 "2010" "The PHP Group" "Scripting Language"
+.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language"
 .SH NAME
-php\-config \- get information about PHP configuration and compile options
+@program_prefix@php\-config \- get information about PHP configuration and compile options
 .SH SYNOPSIS
-.B php\-config
+.B @program_prefix@php\-config
 [options]
 .LP
 .SH DESCRIPTION
-.B php\-config
+.B @program_prefix@php\-config
 is a simple shell script for obtaining information about installed PHP configuration.
 .SH OPTIONS
 .TP 15
@@ -57,15 +57,15 @@ PHP version
 .PD 0
 .B \-\-vernum
 PHP version as integer
-.TP
+.RS
 .PD 1
 .P
 .SH SEE ALSO
-.BR php (1)
+.BR @program_prefix@php (1)
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
-Copyright \(co 1997\-2010 The PHP Group
+Copyright \(co 1997\-2014 The PHP Group
 .LP
 This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is
diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in
index 8f62f867b..e49adb1b7 100644
--- a/scripts/man1/phpize.1.in
+++ b/scripts/man1/phpize.1.in
@@ -1,12 +1,12 @@
-.TH phpize 1 "2010" "The PHP Group" "Scripting Language"
+.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language"
 .SH NAME
-phpize \- prepare a PHP extension for compiling
+@program_prefix@phpize \- prepare a PHP extension for compiling
 .SH SYNOPSIS
-.B phpize
+.B @program_prefix@phpize
 [options]
 .LP
 .SH DESCRIPTION
-.B phpize
+.B @program_prefix@phpize
 is a shell script to prepare PHP extension for compiling.
 .SH OPTIONS
 .TP 15
@@ -24,15 +24,15 @@ Prints usage information
 .PD 1
 .B \-v
 Prints API version information
-.TP
+.RS
 .PD 1
 .P
 .SH SEE ALSO
-.BR php (1)
+.BR @program_prefix@php (1)
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
-Copyright \(co 1997\-2010 The PHP Group
+Copyright \(co 1997\-2014 The PHP Group
 .LP
 This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is