cvs: phpdoc /en language-snippets.ent /en/language constants.xml functions.xml oop5.xml variables.xml

nlopess Fri Aug 11 16:55:35 2006 UTC Modified files: /phpdoc/en language-snippets.ent /phpdoc/en/language constants.xml functions.xml oop5.xml variables.xml Log: Philip wants an entity there, so create a &tip.userlandnaming; entity http://cvs.php.net/viewvc.cgi/phpdoc/en/language-snippets.ent?r1=1.171&r2=1.172&diff_format=u Index: phpdoc/en/language-snippets.ent diff -u phpdoc/en/language-snippets.ent:1.171 phpdoc/en/language-snippets.ent:1.172 --- phpdoc/en/language-snippets.ent:1.171 Mon Jul 24 11:43:55 2006 +++ phpdoc/en/language-snippets.ent Fri Aug 11 16:55:35 2006 @@ -1,4 +1,4 @@ -<!-- $Revision: 1.171 $ --> +<!-- $Revision: 1.172 $ --> <!-- Keep 'em sorted --> @@ -96,6 +96,9 @@ the output of this function, and save it in a <type>string</type> (for example).</simpara></tip>'> +<!ENTITY tip.userlandnaming '<tip><simpara>You may also want to take a +look at the <xref linkend="userlandnaming" />.</simpara></tip>'> + <!-- Warnings --> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/constants.xml?r1=1.46&r2=1.47&diff_format=u Index: phpdoc/en/language/constants.xml diff -u phpdoc/en/language/constants.xml:1.46 phpdoc/en/language/constants.xml:1.47 --- phpdoc/en/language/constants.xml:1.46 Fri Aug 11 16:40:18 2006 +++ phpdoc/en/language/constants.xml Fri Aug 11 16:55:35 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.46 $ --> +<!-- $Revision: 1.47 $ --> <chapter id="language.constants"> <title>Constants</title> @@ -18,11 +18,7 @@ expression, it would be expressed thusly: <literal>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*</literal> </para> - <tip> - <para> - You may also want to take a look at the <xref linkend="userlandnaming" />. - </para> - </tip> + &tip.userlandnaming; <para> <example> <title>Valid and invalid constant names</title> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/functions.xml?r1=1.61&r2=1.62&diff_format=u Index: phpdoc/en/language/functions.xml diff -u phpdoc/en/language/functions.xml:1.61 phpdoc/en/language/functions.xml:1.62 --- phpdoc/en/language/functions.xml:1.61 Fri Aug 11 16:40:18 2006 +++ phpdoc/en/language/functions.xml Fri Aug 11 16:55:35 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.61 $ --> +<!-- $Revision: 1.62 $ --> <chapter id="language.functions"> <title>Functions</title> @@ -38,11 +38,7 @@ expression, it would be expressed thus: <literal>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*</literal>. </para> - <tip> - <para> - You may also want to take a look at the <xref linkend="userlandnaming" />. - </para> - </tip> + &tip.userlandnaming; <simpara> In PHP 3, functions must be defined before they are referenced. No such requirement exists since PHP 4. <emphasis>Except</emphasis> when http://cvs.php.net/viewvc.cgi/phpdoc/en/language/oop5.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc/en/language/oop5.xml diff -u phpdoc/en/language/oop5.xml:1.11 phpdoc/en/language/oop5.xml:1.12 --- phpdoc/en/language/oop5.xml:1.11 Fri Aug 11 16:40:18 2006 +++ phpdoc/en/language/oop5.xml Fri Aug 11 16:55:35 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <chapter id="language.oop5"> <title>Classes and Objects (PHP 5)</title> @@ -9,11 +9,7 @@ In PHP 5 there is a new Object Model. PHP's handling of objects has been completely rewritten, allowing for better performance and more features. </para> - <tip> - <para> - You may also want to take a look at the <xref linkend="userlandnaming" />. - </para> - </tip> + &tip.userlandnaming; </sect1> &language.oop5.basic; http://cvs.php.net/viewvc.cgi/phpdoc/en/language/variables.xml?r1=1.91&r2=1.92&diff_format=u Index: phpdoc/en/language/variables.xml diff -u phpdoc/en/language/variables.xml:1.91 phpdoc/en/language/variables.xml:1.92 --- phpdoc/en/language/variables.xml:1.91 Fri Aug 11 16:40:18 2006 +++ phpdoc/en/language/variables.xml Fri Aug 11 16:55:35 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.91 $ --> +<!-- $Revision: 1.92 $ --> <chapter id="language.variables"> <title>Variables</title> @@ -26,11 +26,7 @@ </simpara> </note> - <tip> - <para> - You may also want to take a look at the <xref linkend="userlandnaming" />. - </para> - </tip> + &tip.userlandnaming; <para> For information on variable related functions, see the