cvs: phpdoc /en/language basic-syntax.xml control-structures.xml expressions.xml functions.xml oop.xml operators.xml types.xml

From: Date: Wed, 05 May 2004 20:19:51 +0000
Subject: cvs: phpdoc /en/language basic-syntax.xml control-structures.xml expressions.xml functions.xml oop.xml operators.xml types.xml
Groups: php.doc 
Request: Send a blank email to phpdoc+get-969360505@lists.php.net to get a copy of this message
dams Wed May 5 16:19:51 2004 EDT Modified files: /phpdoc/en/language basic-syntax.xml control-structures.xml expressions.xml functions.xml oop.xml operators.xml types.xml Log: moved repleable to varname, added some extra tags

http://cvs.php.net/diff.php/phpdoc/en/language/basic-syntax.xml?r1=1.37&r2=1.38&ty=u Index: phpdoc/en/language/basic-syntax.xml diff -u phpdoc/en/language/basic-syntax.xml:1.37 phpdoc/en/language/basic-syntax.xml:1.38 --- phpdoc/en/language/basic-syntax.xml:1.37 Wed May 5 14:58:33 2004 +++ phpdoc/en/language/basic-syntax.xml Wed May 5 16:19:50 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.37 $ --> +<!-- $Revision: 1.38 $ --> <chapter id="language.basic-syntax"> <title>Basic syntax</title> @@ -109,9 +109,9 @@ <function>short_tags</function> function (PHP 3 only), by enabling the <link linkend="ini.short-open-tag">short_open_tag</link> configuration setting in the PHP config file, or by compiling PHP - with the --enable-short-tags option to + with the <option>--enable-short-tags</option> option to <command>configure</command>. Even if it is enabled by default in - php.ini-dist, use of short tags are discouraged. + <filename>php.ini-dist</filename>, use of short tags are discouraged. </para> <para> @@ -120,12 +120,11 @@ </para> <para> - The fourth way is only available if ASP-style tags have been - enabled using the <link linkend="ini.asp-tags">asp_tags</link> + The fourth way is only available if <productname>ASP</productname> + tags have been enabled using the <link linkend="ini.asp-tags">asp_tags</link> configuration setting. - <note> - <para>Support for ASP-style tags was added in 3.0.4.</para> + <para>Support for <productname>ASP</productname> tags was added in 3.0.4.</para> </note> </para> http://cvs.php.net/diff.php/phpdoc/en/language/control-structures.xml?r1=1.89&r2=1.90&ty=u Index: phpdoc/en/language/control-structures.xml diff -u phpdoc/en/language/control-structures.xml:1.89 phpdoc/en/language/control-structures.xml:1.90 --- phpdoc/en/language/control-structures.xml:1.89 Sun Mar 21 05:27:53 2004 +++ phpdoc/en/language/control-structures.xml Wed May 5 16:19:50 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.89 $ --> +<!-- $Revision: 1.90 $ --> <chapter id="language.control-structures"> <title>Control Structures</title> @@ -24,8 +24,10 @@ <informalexample> <programlisting> <![CDATA[ -if (expr) - statement +<?php + if (expression) + commandes +?> ]]> </programlisting> </informalexample> @@ -42,8 +44,8 @@ </simpara> <para> The following example would display <computeroutput>a is bigger - than b</computeroutput> if <replaceable>$a</replaceable> is bigger - than <replaceable>$b</replaceable>: + than b</computeroutput> if <varname>$a</varname> is bigger + than <varname>$b</varname>: <informalexample> <programlisting role="php"> <![CDATA[ @@ -61,9 +63,9 @@ with an <literal>if</literal> clause. Instead, you can group several statements into a statement group. For example, this code would display <computeroutput>a is bigger than b</computeroutput> - if <replaceable>$a</replaceable> is bigger than - <replaceable>$b</replaceable>, and would then assign the value of - <replaceable>$a</replaceable> into <replaceable>$b</replaceable>: + if <varname>$a</varname> is bigger than + <varname>$b</varname>, and would then assign the value of + <varname>$a</varname> into <varname>$b</varname>: <informalexample> <programlisting role="php"> <![CDATA[ @@ -95,8 +97,8 @@ in case the expression in the <literal>if</literal> statement evaluates to &false;. For example, the following code would display <computeroutput>a is bigger than - b</computeroutput> if <replaceable>$a</replaceable> is bigger than - <replaceable>$b</replaceable>, and <computeroutput>a is NOT bigger + b</computeroutput> if <varname>$a</varname> is bigger than + <varname>$b</varname>, and <computeroutput>a is NOT bigger than b</computeroutput> otherwise: <informalexample> <programlisting role="php"> @@ -199,7 +201,7 @@ <simpara> In the above example, the HTML block "A is equal to 5" is nested within an <literal>if</literal> statement written in the alternative syntax. The - HTML block would be displayed only if $a is equal to 5. + HTML block would be displayed only if <varname>$a</varname> is equal to 5. </simpara> <para> The alternative syntax applies to <literal>else</literal> and @@ -390,24 +392,24 @@ </informalexample> </para> <simpara> - The first expression (<replaceable>expr1</replaceable>) is + The first expression (<varname>expr1</varname>) is evaluated (executed) once unconditionally at the beginning of the loop. </simpara> <simpara> In the beginning of each iteration, - <replaceable>expr2</replaceable> is evaluated. If it evaluates to + <varname>expr2</varname> is evaluated. If it evaluates to &true;, the loop continues and the nested statement(s) are executed. If it evaluates to &false;, the execution of the loop ends. </simpara> <simpara> - At the end of each iteration, <replaceable>expr3</replaceable> is + At the end of each iteration, <varname>expr3</varname> is evaluated (executed). </simpara> <simpara> Each of the expressions can be empty. - <replaceable>expr2</replaceable> being empty means the loop should + <varname>expr2</varname> being empty means the loop should be run indefinitely (PHP implicitly considers it as &true;, like C). This may not be as useless as you might think, since often you'd want to end the loop using a @@ -880,10 +882,10 @@ </informalexample> </para> <simpara> - Here, if $i is equal to 0, PHP would execute all of the echo - statements! If $i is equal to 1, PHP would execute the last two + Here, if <varname>$i</varname> is equal to 0, PHP would execute all of the echo + statements! If <varname>$i</varname> is equal to 1, PHP would execute the last two echo statements. You would get the expected behavior ('i equals 2' - would be displayed) only if $i is equal to 2. Thus, + would be displayed) only if <varname>$i</varname> is equal to 2. Thus, it is important not to forget <literal>break</literal> statements (even though you may want to avoid supplying them on purpose under certain circumstances). @@ -1035,10 +1037,10 @@ <sect2 id="control-structures.declare.ticks"> <title>Ticks</title> <para>A tick is an event that occurs for every - <replaceable>N</replaceable> low-level statements executed + <varname>N</varname> low-level statements executed by the parser within the <literal>declare</literal> block. - The value for <replaceable>N</replaceable> is specified - using <literal>ticks=<replaceable>N</replaceable></literal> + The value for <varname>N</varname> is specified + using <literal>ticks=<varname>N</varname></literal> within the <literal>declare</literal> blocks's <literal>directive</literal> section. </para> http://cvs.php.net/diff.php/phpdoc/en/language/expressions.xml?r1=1.28&r2=1.29&ty=u Index: phpdoc/en/language/expressions.xml diff -u phpdoc/en/language/expressions.xml:1.28 phpdoc/en/language/expressions.xml:1.29 --- phpdoc/en/language/expressions.xml:1.28 Tue Apr 6 14:29:53 2004 +++ phpdoc/en/language/expressions.xml Wed May 5 16:19:50 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.28 $ --> +<!-- $Revision: 1.29 $ --> <chapter id="language.expressions"> <title>Expressions</title> <simpara> @@ -208,7 +208,7 @@ documenting it entirely goes beyond the scope of this manual. The above examples should give you a good idea about what expressions are and how you can construct useful expressions. Throughout the - rest of this manual we'll write <replaceable>expr</replaceable> + rest of this manual we'll write <varname>expr</varname> to indicate any valid PHP expression. </simpara> </chapter> http://cvs.php.net/diff.php/phpdoc/en/language/functions.xml?r1=1.46&r2=1.47&ty=u Index: phpdoc/en/language/functions.xml diff -u phpdoc/en/language/functions.xml:1.46 phpdoc/en/language/functions.xml:1.47 --- phpdoc/en/language/functions.xml:1.46 Sun Apr 11 11:41:59 2004 +++ phpdoc/en/language/functions.xml Wed May 5 16:19:50 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.46 $ --> +<!-- $Revision: 1.47 $ --> <chapter id="language.functions"> <title>Functions</title> @@ -515,7 +515,7 @@ you'll get fatal "undefined function" errors. For example, to use <link linkend="ref.image">image</link> functions such as <function>imagecreatetruecolor</function>, you'll need your PHP compiled - with GD support. Or, to use <function>mysql_connect</function> you'll + with <productname>GD</productname> support. Or, to use <function>mysql_connect</function> you'll need your PHP compiled in with <link linkend="ref.mysql">MySQL</link> support. There are many core functions that are included in every version of PHP like the <link linkend="ref.strings">string</link> and http://cvs.php.net/diff.php/phpdoc/en/language/oop.xml?r1=1.50&r2=1.51&ty=u Index: phpdoc/en/language/oop.xml diff -u phpdoc/en/language/oop.xml:1.50 phpdoc/en/language/oop.xml:1.51 --- phpdoc/en/language/oop.xml:1.50 Thu Apr 1 01:31:13 2004 +++ phpdoc/en/language/oop.xml Wed May 5 16:19:50 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.50 $ --> +<!-- $Revision: 1.51 $ --> <chapter id="language.oop"> <title>Classes and Objects</title> @@ -171,7 +171,7 @@ functions add_item(), remove_item() and a variable items. These are distinct functions and variables. You can think of the objects as something similar to directories in a filesystem. In a filesystem you can - have two different files README.TXT, as long as they are in different + have two different files <filename>README.TXT</filename>, as long as they are in different directories. Just like with directories where you'll have to type the full pathname in order to reach each file from the toplevel directory, you have to specify the complete name of the function you want to call: In PHP @@ -223,7 +223,7 @@ <para> There are some nice functions to handle classes and objects. You might want to take a look at the <link linkend="ref.classobj">Class/Object - Functions</link> + Functions</link>. </para> </note> </sect1> http://cvs.php.net/diff.php/phpdoc/en/language/operators.xml?r1=1.65&r2=1.66&ty=u Index: phpdoc/en/language/operators.xml diff -u phpdoc/en/language/operators.xml:1.65 phpdoc/en/language/operators.xml:1.66 --- phpdoc/en/language/operators.xml:1.65 Thu Apr 8 00:25:42 2004 +++ phpdoc/en/language/operators.xml Wed May 5 16:19:50 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.65 $ --> +<!-- $Revision: 1.66 $ --> <chapter id="language.operators"> <title>Operators</title> <simpara> @@ -469,7 +469,7 @@ be generated by that expression will be ignored. </simpara> <simpara> - If the <link linkend="ini.track-errors">track_errors</link> + If the <link linkend="ini.track-errors"><option>track_errors</option></link> feature is enabled, any error message generated by the expression will be saved in the variable <link linkend="reserved.variables.phperrormsg">$php_errormsg</link>. http://cvs.php.net/diff.php/phpdoc/en/language/types.xml?r1=1.136&r2=1.137&ty=u Index: phpdoc/en/language/types.xml diff -u phpdoc/en/language/types.xml:1.136 phpdoc/en/language/types.xml:1.137 --- phpdoc/en/language/types.xml:1.136 Wed Mar 24 11:39:43 2004 +++ phpdoc/en/language/types.xml Wed May 5 16:19:50 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.136 $ --> +<!-- $Revision: 1.137 $ --> <chapter id="language.types"> <title>Types</title> @@ -338,10 +338,10 @@ <programlisting role="php"> <![CDATA[ <?php -$a = 1234; # decimal number -$a = -123; # a negative number -$a = 0123; # octal number (equivalent to 83 decimal) -$a = 0x1A; # hexadecimal number (equivalent to 26 decimal) +$a = 1234; // decimal number +$a = -123; // a negative number +$a = 0123; // octal number (equivalent to 83 decimal) +$a = 0x1A; // hexadecimal number (equivalent to 26 decimal) ?> ]]> </programlisting>
« previous php.doc (#969360505) next »