Merge branch 'PHP-5.5'

* PHP-5.5:
  Tinker with the wording of the short_open_tag description.

Conflicts:
	php.ini-development
	php.ini-production

1 files changed, 6 insertions, 7 deletions

diff --git a/php.ini-development b/php.ini-development
index 99532d20d9..beebabbd24 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -199,13 +199,12 @@
 engine = On
 
 ; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. For several
-; years we recommended that you not use the short tag shortcut and
-; instead to use the full <?php and ?> tag combination. With the widespread use
-; of XML and use of these tags by other languages, the server can become easily
-; confused and end up parsing the wrong code in the wrong context.
-; This shortcut is still supported for backwards compatibility, but we
-; recommend against its use.
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
 ; Default Value: On
 ; Development Value: Off
 ; Production Value: Off