goba Fri Nov 9 10:48:16 2001 EDT
Modified files:
/phpdoc/en/appendices commandline.xml migration.xml phpdevel.xml
/phpdoc/en/chapters intro.xml security.xml
/phpdoc/en/faq com.xml databases.xml html.xml using.xml
/phpdoc/en/features file-upload.xml safe-mode.xml
/phpdoc/en/language basic-syntax.xml constants.xml
control-structures.xml expressions.xml
types.xml variables.xml
Log:
Changing programlisting roles.
All PHP programlistings to role="php"
All not PHP programlistings to something other...
Markup changes only, no content changed...
Index: phpdoc/en/appendices/commandline.xml
diff -u phpdoc/en/appendices/commandline.xml:1.3
phpdoc/en/appendices/commandline.xml:1.4
--- phpdoc/en/appendices/commandline.xml:1.3 Fri Oct 19 11:08:49 2001
+++ phpdoc/en/appendices/commandline.xml Fri Nov 9 10:48:10 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!--
TODO:
@@ -41,7 +41,7 @@
You can get the actual list and some one line descriptions
with the <literal>-h</literal> option. The output of
<literal>php -h</literal> should be something like this:
- <programlisting>
+ <computeroutput>
<![CDATA[
Usage: php [-q] [-h] [-s [-v] [-i] [-f <file>] | {<file> [args...]}
-q Quiet-mode. Suppress HTTP Header output.
@@ -58,7 +58,7 @@
-i PHP information
-h This help
]]>
- </programlisting>
+ </computeroutput>
</para>
<para>
Here we list some of the most important command line options
@@ -227,7 +227,7 @@
</para>
<example>
<title>Batch file to run a command line PHP script (script.bat)</title>
- <programlisting>
+ <programlisting role="winbat">
@c:\php\php.exe -q script.php %1 %2 %3 %4
</programlisting>
</example>
Index: phpdoc/en/appendices/migration.xml
diff -u phpdoc/en/appendices/migration.xml:1.11 phpdoc/en/appendices/migration.xml:1.12
--- phpdoc/en/appendices/migration.xml:1.11 Sun Oct 14 10:29:26 2001
+++ phpdoc/en/appendices/migration.xml Fri Nov 9 10:48:10 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<appendix id="migration">
<title>Migrating from PHP/FI 2.0 to PHP 3.0</title>
@@ -45,14 +45,14 @@
replaced by three new possible forms:
<example>
<title>Migration: old start/end tags</title>
- <programlisting>
+ <programlisting role="php">
<? echo "This is PHP/FI 2.0 code.\n"; >
</programlisting>
</example>
As of version 2.0, PHP/FI also supports this variation:
<example>
<title>Migration: first new start/end tags</title>
- <programlisting>
+ <programlisting role="php">
<? echo "This is PHP 3.0 code!\n"; ?>
</programlisting>
</example>
@@ -66,7 +66,7 @@
<example>
<title>Migration: second new start/end tags</title>
- <programlisting>
+ <programlisting role="php">
<?php echo "This is PHP 3.0 code!\n"; ?>
</programlisting>
</example>
@@ -78,7 +78,7 @@
<example>
<title>Migration: third new start/end tags</title>
- <programlisting>
+ <programlisting role="php">
<script language="php">
echo "This is PHP 3.0 code!\n";
@@ -99,7 +99,7 @@
this, the syntax has been changed:
<example>
<title>Migration: old if..endif syntax</title>
- <programlisting>
+ <programlisting role="php">
if ($foo);
echo "yep\n";
elseif ($bar);
@@ -111,7 +111,7 @@
</example>
<example>
<title>Migration: new if..endif syntax</title>
- <programlisting>
+ <programlisting role="php">
if ($foo):
echo "yep\n";
elseif ($bar):
@@ -134,7 +134,7 @@
as well:
<example>
<title>Migration: old while..endwhile syntax</title>
- <programlisting>
+ <programlisting role="php">
while ($more_to_come);
...
endwhile;
@@ -142,7 +142,7 @@
</example>
<example>
<title>Migration: new while..endwhile syntax</title>
- <programlisting>
+ <programlisting role="php">
while ($more_to_come):
...
endwhile;
@@ -168,7 +168,7 @@
<para>
Consider this example:
<informalexample>
- <programlisting>
+ <programlisting role="php">
$a[0]=5;
$a[1]=7;
@@ -195,7 +195,7 @@
<para>
The fix for this is simple. Replace the while statement with:
<informalexample>
- <programlisting>
+ <programlisting role="php">
while ((string)$key != "") {
</programlisting>
</informalexample>
@@ -243,7 +243,7 @@
<para>
<example>
<title>Migration from 2.0: return values, old code</title>
- <programlisting>
+ <programlisting role="php">
$fp = fopen($file, "r");
if ($fp == -1);
echo("Could not open $file for reading<br>\n");
@@ -252,7 +252,7 @@
</example>
<example>
<title>Migration from 2.0: return values, new code</title>
- <programlisting>
+ <programlisting role="php">
$fp = @fopen($file, "r") or print("Could not open $file for reading<br>\n");
</programlisting>
</example>
@@ -311,16 +311,16 @@
<example>
<title>Migration from 2.0: concatenation for strings</title>
- <programlisting>
+ <programlisting role="php">
echo "1" + "1";
</programlisting>
<para>
In PHP 2.0 this would echo 11, in PHP 3.0 it would
echo 2. Instead use:
- <programlisting>
+ <programlisting role="php">
echo "1"."1";
</programlisting>
- <programlisting>
+ <programlisting role="php">
$a = 1;
$b = 1;
echo $a + $b;
@@ -328,7 +328,7 @@
</para>
<para>
This would echo 2 in both PHP 2.0 and 3.0.
- <programlisting>
+ <programlisting role="php">
$a = 1;
$b = 1;
echo $a.$b;
Index: phpdoc/en/appendices/phpdevel.xml
diff -u phpdoc/en/appendices/phpdevel.xml:1.11 phpdoc/en/appendices/phpdevel.xml:1.12
--- phpdoc/en/appendices/phpdevel.xml:1.11 Fri Sep 21 18:47:29 2001
+++ phpdoc/en/appendices/phpdevel.xml Fri Nov 9 10:48:10 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<appendix id="phpdevel">
<title>PHP development</title>
@@ -11,7 +11,7 @@
<title>Function Prototype</title>
<para>
All functions look like this:
- <programlisting>
+ <programlisting role="c">
void php3_foo(INTERNAL_FUNCTION_PARAMETERS) {
}
@@ -30,7 +30,7 @@
<para>
<example>
<title>Fetching function arguments</title>
- <programlisting>
+ <programlisting role="c">
pval *arg1, *arg2;
if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&arg1,&arg2)==FAILURE) {
WRONG_PARAM_COUNT;
@@ -67,7 +67,7 @@
<para>
<example>
<title>Variable function arguments</title>
- <programlisting>
+ <programlisting role="c">
pval *arg1, *arg2, *arg3;
int arg_count = ARG_COUNT(ht);
@@ -134,7 +134,7 @@
certain type, you can use one of the following conversion
functions:
- <programlisting>
+ <programlisting role="c">
convert_to_long(arg1);
convert_to_double(arg1);
convert_to_string(arg1);
@@ -224,7 +224,7 @@
<para>
<example>
<title>Checking whether $foo exists in a symbol table</title>
- <programlisting>
+ <programlisting role="c">
if (hash_exists(active_symbol_table,"foo",sizeof("foo"))) { exists... }
else { doesn't exist }
</programlisting>
@@ -232,7 +232,7 @@
<example>
<title>Finding a variable's size in a symbol table</title>
- <programlisting>
+ <programlisting role="c">
hash_find(active_symbol_table,"foo",sizeof("foo"),&pvalue);
check(pvalue.type);
</programlisting>
@@ -256,7 +256,7 @@
<para>
<example>
<title>Initializing a new array</title>
- <programlisting>
+ <programlisting role="c">
pval arr;
if (array_init(&arr) == FAILURE) { failed... };
@@ -273,7 +273,7 @@
<para>
<example>
<title>Adding entries to a new array</title>
- <programlisting>
+ <programlisting role="c">
pval entry;
entry.type = IS_LONG;
@@ -307,14 +307,14 @@
If you are building an array to return from a function, you can
initialize the array just like above by doing:</simpara>
- <programlisting>
+ <programlisting role="c">
if (array_init(return_value) == FAILURE) { failed...; }
</programlisting>
<simpara>
...and then adding values with the helper functions:</simpara>
- <programlisting>
+ <programlisting role="c">
add_next_index_long(return_value,long_value);
add_next_index_double(return_value,double_value);
add_next_index_string(return_value,estrdup(string_value));
@@ -324,7 +324,7 @@
Of course, if the adding isn't done right after the array
initialization, you'd probably have to look for the array first:
- <programlisting>
+ <programlisting role="c">
pval *arr;
if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&arr)==FAILURE) {
can't find... }
@@ -397,7 +397,7 @@
should be IS_OBJECT, and it's basically a regular hash table
(i.e., you can use regular hash functions on .value.ht). The
actual registration of the function can be done using:
- <programlisting>
+ <programlisting role="c">
add_method( return_value, function_name, function_ptr );
</programlisting></para></listitem>
</orderedlist></para>
@@ -477,7 +477,7 @@
<para>
<example>
<title>Adding a new resource</title>
- <programlisting>
+ <programlisting role="c">
RESOURCE *resource;
/* ...allocate memory for resource and acquire resource... */
@@ -489,7 +489,7 @@
<example>
<title>Using an existing resource</title>
- <programlisting>
+ <programlisting role="c">
pval *resource_id;
RESOURCE *resource;
int type;
@@ -506,7 +506,7 @@
<example>
<title>Deleting an existing resource</title>
- <programlisting>
+ <programlisting role="c">
pval *resource_id;
RESOURCE *resource;
int type;
Index: phpdoc/en/chapters/intro.xml
diff -u phpdoc/en/chapters/intro.xml:1.19 phpdoc/en/chapters/intro.xml:1.20
--- phpdoc/en/chapters/intro.xml:1.19 Fri Sep 21 18:47:30 2001
+++ phpdoc/en/chapters/intro.xml Fri Nov 9 10:48:11 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
<chapter id="introduction">
<title>Introduction</title>
@@ -16,18 +16,20 @@
<example>
<title>An introductory example</title>
<programlisting role="php">
-<html>
- <head>
- <title>Example</title>
- </head>
- <body>
+<![CDATA[
+<html>
+ <head>
+ <title>Example</title>
+ </head>
+ <body>
- <?php
+ <?php
echo "Hi, I'm a PHP script!";
- ?>
+ ?>
- </body>
-</html>
+ </body>
+</html>
+]]>
</programlisting>
</example>
</para>
Index: phpdoc/en/chapters/security.xml
diff -u phpdoc/en/chapters/security.xml:1.31 phpdoc/en/chapters/security.xml:1.32
--- phpdoc/en/chapters/security.xml:1.31 Sun Nov 4 04:10:02 2001
+++ phpdoc/en/chapters/security.xml Fri Nov 9 10:48:11 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.31 $ -->
+<!-- $Revision: 1.32 $ -->
<chapter id="security">
<title>Security</title>
@@ -749,7 +749,7 @@
then use misleading file extensions:
<example>
<title>Hiding PHP as another language</title>
- <programlisting role="php">
+ <programlisting>
# Make PHP code look like other code types
AddType application/x-httpd-php .asp .py .pl
</programlisting>
@@ -757,7 +757,7 @@
Or obscure it completely:
<example>
<title>Using unknown types for PHP extensions</title>
- <programlisting role="php">
+ <programlisting>
# Make PHP code look like unknown types
AddType application/x-httpd-php .bop .foo .133t
</programlisting>
@@ -766,7 +766,7 @@
all html will be parsed through the PHP engine:
<example>
<title>Using html types for PHP extensions</title>
- <programlisting role="php">
+ <programlisting>
# Make all PHP code look like html
AddType application/x-httpd-php .htm .html
</programlisting>
Index: phpdoc/en/faq/com.xml
diff -u phpdoc/en/faq/com.xml:1.2 phpdoc/en/faq/com.xml:1.3
--- phpdoc/en/faq/com.xml:1.2 Thu Nov 1 15:27:47 2001
+++ phpdoc/en/faq/com.xml Fri Nov 9 10:48:12 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<chapter id="faq.com">
<title>PHP and COM</title>
<titleabbrev>PHP and COM</titleabbrev>
@@ -161,7 +161,7 @@
This is possible with the help of monikers. If you want to get multiple
references to the same word instance
you can create that instance like shown:
</para>
- <programlisting>
+ <programlisting role="php">
$word = new COM("C:\docs\word.doc");
</programlisting>
<para>
Index: phpdoc/en/faq/databases.xml
diff -u phpdoc/en/faq/databases.xml:1.10 phpdoc/en/faq/databases.xml:1.11
--- phpdoc/en/faq/databases.xml:1.10 Sun Oct 14 07:55:30 2001
+++ phpdoc/en/faq/databases.xml Fri Nov 9 10:48:13 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<chapter id="faq.databases">
<title>Database issues</title>
<titleabbrev>Database issues</titleabbrev>
@@ -213,7 +213,7 @@
after submitting a query and before you attempt to use the returned
result identifier. The proper way to do this is with code similar
to the following:
- <programlisting>
+ <programlisting role="php">
$result = mysql_query("SELECT * FROM tables_priv");
if (!$result) {
echo mysql_error();
@@ -221,7 +221,7 @@
}
</programlisting>
or
- <programlisting>
+ <programlisting role="php">
$result = mysql_query("SELECT * FROM tables_priv")
or die("Bad query: ".mysql_error());
</programlisting>
Index: phpdoc/en/faq/html.xml
diff -u phpdoc/en/faq/html.xml:1.9 phpdoc/en/faq/html.xml:1.10
--- phpdoc/en/faq/html.xml:1.9 Tue Nov 6 15:59:14 2001
+++ phpdoc/en/faq/html.xml Fri Nov 9 10:48:14 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<chapter id="faq.html">
<title>PHP and HTML</title>
<titleabbrev>PHP and HTML</titleabbrev>
@@ -135,7 +135,7 @@
<para>
When submitting a form, it is possible to use an image instead of
the standard submit button with a tag like:
- <programlisting>
+ <programlisting role="html">
<![CDATA[
<input type="image" src="image.gif" name="foo">
]]>
@@ -162,7 +162,7 @@
<link linkend="language.types.array">array</link> to your PHP script
you name the <input>, <select> or <textarea>
elements like this:
- <programlisting>
+ <programlisting role="html">
<![CDATA[
<input name="MyArray[]">
<input name="MyArray[]">
@@ -173,7 +173,7 @@
Notice the square brackets after the variable name, that's what
makes it an array. You can group the elements into different arrays
by assigning the same name to different elements:
- <programlisting>
+ <programlisting role="html">
<![CDATA[
<input name="MyArray[]">
<input name="MyArray[]">
@@ -184,7 +184,7 @@
This produces two arrays, MyArray and MyOtherArray, that gets sent
to the PHP script. It's also possible to assign specific keys
to your arrays:
- <programlisting>
+ <programlisting role="html">
<![CDATA[
<input name="AnotherArray[]">
<input name="AnotherArray[]">
@@ -223,7 +223,7 @@
select multiple items from a list. These items are then passed
to the action handler for the form. The problem is that they
are all passed with the same widget name. ie.
- <programlisting>
+ <programlisting role="html">
<![CDATA[
<select name="var" multiple>
]]>
@@ -238,7 +238,7 @@
<varname>$var</varname> variable. The solution is to use
PHP's "array from form element" feature. The following
should be used:
- <programlisting>
+ <programlisting role="html">
<![CDATA[
<select name="var[]" multiple>
]]>
Index: phpdoc/en/faq/using.xml
diff -u phpdoc/en/faq/using.xml:1.9 phpdoc/en/faq/using.xml:1.10
--- phpdoc/en/faq/using.xml:1.9 Sun Oct 14 07:55:30 2001
+++ phpdoc/en/faq/using.xml Fri Nov 9 10:48:14 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<chapter id="faq.using">
<title>Using PHP</title>
<titleabbrev>Using PHP</titleabbrev>
@@ -27,7 +27,7 @@
<literal>$HTTP_POST_VARS</literal>. So, to write a generic
script to handle POST method variables you would
need something similar to the following:
- <programlisting>
+ <programlisting role="php">
<![CDATA[
foreach ($HTTP_POST_VARS as $var => $value) {
echo "$var = $value<br>\n";
@@ -61,7 +61,7 @@
<para>
When I do the following, the output is printed in
the wrong order:
- <programlisting>
+ <programlisting role="php">
function myfunc($argument)
{
echo $argument + 10;
@@ -86,7 +86,7 @@
<question>
<para>
Hey, what happened to my newlines?
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<pre>
<?php echo "This should be the first line."; ?>
@@ -126,7 +126,7 @@
The <function>getallheaders</function> function will do this if
you are running PHP as an Apache module. So, the following bit
of code will show you all the request headers:
- <programlisting>
+ <programlisting role="php">
<![CDATA[
$headers = getallheaders();
foreach ($headers as $name => $content) {
Index: phpdoc/en/features/file-upload.xml
diff -u phpdoc/en/features/file-upload.xml:1.25 phpdoc/en/features/file-upload.xml:1.26
--- phpdoc/en/features/file-upload.xml:1.25 Fri Sep 21 18:47:32 2001
+++ phpdoc/en/features/file-upload.xml Fri Nov 9 10:48:15 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
<chapter id="features.file-upload">
<title>Handling file uploads</title>
@@ -345,7 +345,7 @@
Inside your put.php file you would then do something like this:
</simpara>
<para>
- <informalexample><programlisting>
+ <informalexample><programlisting role="php">
<![CDATA[
<?php copy($PHP_UPLOADED_FILE_NAME,$DOCUMENT_ROOT.$REQUEST_URI); ?>
]]>
Index: phpdoc/en/features/safe-mode.xml
diff -u phpdoc/en/features/safe-mode.xml:1.13 phpdoc/en/features/safe-mode.xml:1.14
--- phpdoc/en/features/safe-mode.xml:1.13 Fri Sep 21 18:47:32 2001
+++ phpdoc/en/features/safe-mode.xml Fri Nov 9 10:48:15 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<chapter id="features.safe-mode">
<title>Safe Mode</title>
@@ -35,7 +35,7 @@
?>
</programlisting>
results in this error when Safe Mode is enabled:
- <programlisting role="php">
+ <programlisting>
Warning: SAFE MODE Restriction in effect. The script whose uid is 500 is not
allowed to access /etc/passwd owned by uid 0 in /docroot/script.php on line 2
</programlisting>
@@ -51,7 +51,7 @@
</programlisting>
If you run the same script.php with this open_basedir setting then this is
the result:
- <programlisting role="php">
+ <programlisting>
Warning: open_basedir restriction in effect. File is in wrong directory in
/docroot/script.php on line 2
</programlisting>
@@ -63,7 +63,7 @@
disable_functions readfile,system
</programlisting>
Then we get this output:
- <programlisting role="php">
+ <programlisting>
Warning: readfile() has been disabled for security reasons in
/docroot/script.php on line 2
</programlisting>
Index: phpdoc/en/language/basic-syntax.xml
diff -u phpdoc/en/language/basic-syntax.xml:1.17
phpdoc/en/language/basic-syntax.xml:1.18
--- phpdoc/en/language/basic-syntax.xml:1.17 Fri Sep 28 17:06:44 2001
+++ phpdoc/en/language/basic-syntax.xml Fri Nov 9 10:48:15 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<chapter id="language.basic-syntax">
<title>Basic syntax</title>
@@ -64,7 +64,7 @@
<para>
<example>
<title>Ways of escaping from HTML</title>
- <programlisting>
+ <programlisting role="php">
1. <? echo ("this is the simplest, an SGML processing instruction\n"); ?>
<?= expression ?> This is a shortcut for "<? echo expression ?>"
@@ -146,7 +146,7 @@
following are equivalent:
<informalexample>
- <programlisting>
+ <programlisting role="php">
<?php
echo "This is a test";
?>
@@ -161,7 +161,7 @@
<para>
PHP supports 'C', 'C++' and Unix shell-style comments. For example:
- <informalexample><programlisting>
+ <informalexample><programlisting role="php">
<?php
echo "This is a test"; // This is a one-line c++ style comment
/* This is a multi line comment
@@ -176,7 +176,7 @@
The "one-line" comment styles actually only comment to the
end of the line or the current block of PHP code, whichever
comes first.</simpara>
- <informalexample><programlisting>
+ <informalexample><programlisting role="php">
<h1>This is an <?php # echo "simple";?> example.</h1>
<p>The header above will say 'This is an example'.
</programlisting></informalexample>
@@ -185,7 +185,7 @@
You should be careful not to nest 'C' style comments, which can
happen when commenting out large blocks.</simpara>
- <informalexample><programlisting>
+ <informalexample><programlisting role="php">
<?php
/*
echo "This is a test"; /* This comment will cause a problem */
Index: phpdoc/en/language/constants.xml
diff -u phpdoc/en/language/constants.xml:1.19 phpdoc/en/language/constants.xml:1.20
--- phpdoc/en/language/constants.xml:1.19 Wed Oct 17 12:24:01 2001
+++ phpdoc/en/language/constants.xml Fri Nov 9 10:48:15 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
<chapter id="language.constants">
<title>Constants</title>
@@ -97,7 +97,7 @@
<para>
<example>
<title>Defining Constants</title>
- <programlisting>
+ <programlisting role="php">
<?php
define("CONSTANT", "Hello world.");
echo CONSTANT; // outputs "Hello world."
@@ -254,7 +254,7 @@
<example>
<title>Using __FILE__ and __LINE__</title>
- <programlisting>
+ <programlisting role="php">
<?php
function report_error($file, $line, $message)
{
Index: phpdoc/en/language/control-structures.xml
diff -u phpdoc/en/language/control-structures.xml:1.40
phpdoc/en/language/control-structures.xml:1.41
--- phpdoc/en/language/control-structures.xml:1.40 Tue Oct 9 19:29:27 2001
+++ phpdoc/en/language/control-structures.xml Fri Nov 9 10:48:15 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.40 $ -->
+<!-- $Revision: 1.41 $ -->
<chapter id="control-structures">
<title>Control Structures</title>
@@ -243,7 +243,7 @@
The following examples are identical, and both print numbers from
1 to 10:
<informalexample>
- <programlisting>
+ <programlisting role="php">
/* example 1 */
$i = 1;
Index: phpdoc/en/language/expressions.xml
diff -u phpdoc/en/language/expressions.xml:1.15 phpdoc/en/language/expressions.xml:1.16
--- phpdoc/en/language/expressions.xml:1.15 Sun Oct 21 17:25:46 2001
+++ phpdoc/en/language/expressions.xml Fri Nov 9 10:48:16 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<chapter id="language.expressions">
<title>Expressions</title>
@@ -27,7 +27,7 @@
instance, consider the following function:
<informalexample>
- <programlisting>
+ <programlisting role="php">
function foo ()
{
return 5;
@@ -141,7 +141,7 @@
post-increment and expressions in general a bit better:
<informalexample>
- <programlisting>
+ <programlisting role="php">
function double($i)
{
return $i*2;
Index: phpdoc/en/language/types.xml
diff -u phpdoc/en/language/types.xml:1.61 phpdoc/en/language/types.xml:1.62
--- phpdoc/en/language/types.xml:1.61 Mon Nov 5 16:59:11 2001
+++ phpdoc/en/language/types.xml Fri Nov 9 10:48:16 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.61 $ -->
+<!-- $Revision: 1.62 $ -->
<chapter id="language.types">
<title>Types</title>
@@ -716,7 +716,7 @@
strings.
<example>
<title>Here doc string quoting example</title>
- <programlisting>
+ <programlisting role="php">
<?php
$str = <<<EOD
Example of string
Index: phpdoc/en/language/variables.xml
diff -u phpdoc/en/language/variables.xml:1.21 phpdoc/en/language/variables.xml:1.22
--- phpdoc/en/language/variables.xml:1.21 Wed Oct 31 14:24:18 2001
+++ phpdoc/en/language/variables.xml Fri Nov 9 10:48:16 2001
@@ -1,5 +1,5 @@
<?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.21 $ -->
+<!-- $Revision: 1.22 $ -->
<chapter id="language.variables">
<title>Variables</title>
@@ -793,7 +793,7 @@
</simpara>
<informalexample>
- <programlisting>
+ <programlisting role="php">
echo "$a $hello";
</programlisting>
</informalexample>
