From cf0303e7824c3e20e9db240f9d4e4b154cc2a72d Mon Sep 17 00:00:00 2001
From: Florian MARGAINE <florian@margaine.com>
Date: Sat, 20 Sep 2014 10:01:44 +0200
Subject: Replaces php5 with php7, without whitespace changes.

---
 php.ini-development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'php.ini-development')

diff --git a/php.ini-development b/php.ini-development
index 562816fc44..41460485c7 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -867,8 +867,8 @@ default_socket_timeout = 60
 ;
 ; Windows Extensions
 ; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
+; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
+; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
 ;
 ;extension=php_bz2.dll
-- 
cgit v1.2.1


From 876792c756180bc62ae25b0b2c74b1484097b177 Mon Sep 17 00:00:00 2001
From: Sebastian Zartner <sebastianzartner@gmail.com>
Date: Tue, 23 Sep 2014 07:45:03 +0200
Subject: Fixed typo

---
 php.ini-development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'php.ini-development')

diff --git a/php.ini-development b/php.ini-development
index 148d194fef..bcc9ac6baf 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1765,7 +1765,7 @@ mssql.secure_connection = Off
 ;mbstring.encoding_translation = Off
 
 ; automatic encoding detection order.
-; "auto" detect order is changed accoding to mbstring.language
+; "auto" detect order is changed according to mbstring.language
 ; http://php.net/mbstring.detect-order
 ;mbstring.detect_order = auto
 
-- 
cgit v1.2.1


From e756333bbb0dd1496ee8f51044b104f3a997aa5f Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Tue, 9 Sep 2014 23:14:19 +0200
Subject: Remove <% and <script language="php"> tags

As per https://wiki.php.net/rfc/remove_alternative_php_tags.

Removes:
 * <% opening tag
 * %> closing tag
 * <%= short opening tag
 * /<script\s+language\s*=\s*(php|"php"|'php')\s*>/i opening tag
 * /</script>/i closing tag
 * asp_tags ini directive
---
 php.ini-development | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'php.ini-development')

diff --git a/php.ini-development b/php.ini-development
index 594ddb6ceb..61519f05aa 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -201,10 +201,6 @@ engine = On
 ; http://php.net/short-open-tag
 short_open_tag = Off
 
-; Allow ASP-style <% %> tags.
-; http://php.net/asp-tags
-asp_tags = Off
-
 ; The number of significant digits displayed in floating point numbers.
 ; http://php.net/precision
 precision = 14
-- 
cgit v1.2.1