nlopess Sun Apr 11 11:42:00 2004 EDT
Modified files:
/phpdoc/en/appendices aliases.xml reserved.xml
/phpdoc/en/chapters config.xml
/phpdoc/en/language functions.xml variables.xml
/phpdoc/en/reference/array/functions extract.xml
/phpdoc/en/reference/dba reference.xml
/phpdoc/en/reference/dbx reference.xml
/phpdoc/en/reference/mnogosearch reference.xml
/phpdoc/en/reference/uodbc reference.xml
/phpdoc/en/reference/var reference.xml
/phpdoc/en/security database.xml globals.xml
Log:
try to have better IDs so that livedocs doesnt complain
http://cvs.php.net/diff.php/phpdoc/en/appendices/aliases.xml?r1=1.27&r2=1.28&ty=u
Index: phpdoc/en/appendices/aliases.xml
diff -u phpdoc/en/appendices/aliases.xml:1.27 phpdoc/en/appendices/aliases.xml:1.28
--- phpdoc/en/appendices/aliases.xml:1.27 Wed Dec 31 10:03:07 2003
+++ phpdoc/en/appendices/aliases.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.27 $ -->
+<!-- $Revision: 1.28 $ -->
<appendix id="aliases">
<title>List of Function Aliases</title>
<para>
@@ -1082,12 +1082,12 @@
<row>
<entry>odbc_do</entry>
<entry><function>odbc_exec</function></entry>
- <entry><link linkend="ref.odbc">OCI8</link></entry>
+ <entry><link linkend="ref.uodbc">OCI8</link></entry>
</row>
<row>
<entry>odbc_field_precision</entry>
<entry><function>odbc_field_len</function></entry>
- <entry><link linkend="ref.odbc">OCI8</link></entry>
+ <entry><link linkend="ref.uodbc">OCI8</link></entry>
</row>
<row>
<entry>output</entry>
http://cvs.php.net/diff.php/phpdoc/en/appendices/reserved.xml?r1=1.38&r2=1.39&ty=u
Index: phpdoc/en/appendices/reserved.xml
diff -u phpdoc/en/appendices/reserved.xml:1.38 phpdoc/en/appendices/reserved.xml:1.39
--- phpdoc/en/appendices/reserved.xml:1.38 Fri Mar 5 21:50:47 2004
+++ phpdoc/en/appendices/reserved.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.38 $ -->
+<!-- $Revision: 1.39 $ -->
<appendix id="reserved">
<title>List of Reserved Words</title>
@@ -275,7 +275,7 @@
global scope of the script; i.e., separate from the
<varname>$_SERVER</varname> and <varname>$HTTP_SERVER_VARS</varname>
arrays. For related information, see the security chapter titled
- <link linkend="security.registerglobals">Using Register
+ <link linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
@@ -690,7 +690,7 @@
global scope of the script; i.e., separate from the
<varname>$_ENV</varname> and <varname>$HTTP_ENV_VARS</varname>
arrays. For related information, see the security chapter titled
- <link linkend="security.registerglobals">Using Register
+ <link linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
</sect2>
@@ -732,7 +732,7 @@
global scope of the script; i.e., separate from the
<varname>$_COOKIE</varname> and <varname>$HTTP_COOKIE_VARS</varname>
arrays. For related information, see the security chapter titled
- <link linkend="security.registerglobals">Using Register
+ <link linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
</sect2>
@@ -774,7 +774,7 @@
global scope of the script; i.e., separate from the
<varname>$_GET</varname> and <varname>$HTTP_GET_VARS</varname>
arrays. For related information, see the security chapter titled
- <link linkend="security.registerglobals">Using Register
+ <link linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
</sect2>
@@ -816,7 +816,7 @@
global scope of the script; i.e., separate from the
<varname>$_POST</varname> and <varname>$HTTP_POST_VARS</varname>
arrays. For related information, see the security chapter titled
- <link linkend="security.registerglobals">Using Register
+ <link linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
</sect2>
@@ -856,7 +856,7 @@
global scope of the script; i.e., separate from the
<varname>$_FILES</varname> and <varname>$HTTP_POST_FILES</varname>
arrays. For related information, see the security chapter titled
- <link linkend="security.registerglobals">Using Register
+ <link linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
</sect2>
@@ -897,7 +897,7 @@
global scope of the script; i.e., separate from the
<varname>$_REQUEST</varname> array. For related information, see
the security chapter titled <link
- linkend="security.registerglobals">Using Register
+ linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
</sect2>
@@ -939,7 +939,7 @@
global scope of the script; i.e., separate from the
<varname>$_SESSION</varname> and <varname>$HTTP_SESSION_VARS</varname>
arrays. For related information, see the security chapter titled
- <link linkend="security.registerglobals">Using Register
+ <link linkend="security.globals">Using Register
Globals</link>. These individual globals are not autoglobals.
</simpara>
</sect2>
http://cvs.php.net/diff.php/phpdoc/en/chapters/config.xml?r1=1.115&r2=1.116&ty=u
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.115 phpdoc/en/chapters/config.xml:1.116
--- phpdoc/en/chapters/config.xml:1.115 Wed Jan 28 19:35:22 2004
+++ phpdoc/en/chapters/config.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.115 $ -->
+<!-- $Revision: 1.116 $ -->
<chapter id="configuration">
<title>Runtime Configuration</title>
@@ -723,7 +723,7 @@
<varname>$_ENV</varname>, <varname>$_GET</varname>,
<varname>$_POST</varname>, <varname>$_COOKIE</varname>, and
<varname>$_SERVER</varname>. Please read the security chapter on
- <link linkend="security.registerglobals">Using register_globals</link>
+ <link linkend="security.globals">Using register_globals</link>
for related information.
</para>
<para>
http://cvs.php.net/diff.php/phpdoc/en/language/functions.xml?r1=1.45&r2=1.46&ty=u
Index: phpdoc/en/language/functions.xml
diff -u phpdoc/en/language/functions.xml:1.45 phpdoc/en/language/functions.xml:1.46
--- phpdoc/en/language/functions.xml:1.45 Sun Mar 21 05:27:53 2004
+++ phpdoc/en/language/functions.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.45 $ -->
+<!-- $Revision: 1.46 $ -->
<chapter id="language.functions">
<title>Functions</title>
@@ -519,7 +519,7 @@
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
- <link linkend="ref.variables">variable</link> functions. A call
+ <link linkend="ref.var">variable</link> functions. A call
to <function>phpinfo</function> or
<function>get_loaded_extensions</function> will show you which
extensions are loaded into your PHP. Also note that many extensions are
http://cvs.php.net/diff.php/phpdoc/en/language/variables.xml?r1=1.75&r2=1.76&ty=u
Index: phpdoc/en/language/variables.xml
diff -u phpdoc/en/language/variables.xml:1.75 phpdoc/en/language/variables.xml:1.76
--- phpdoc/en/language/variables.xml:1.75 Wed Jan 28 19:35:24 2004
+++ phpdoc/en/language/variables.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.75 $ -->
+<!-- $Revision: 1.76 $ -->
<chapter id="language.variables">
<title>Variables</title>
@@ -142,7 +142,7 @@
<simpara>
For related information on this change, read the configuration entry for
<link linkend="ini.register-globals">register_globals</link>, the security
- chapter on <link linkend="security.registerglobals">Using Register Globals
+ chapter on <link linkend="security.globals">Using Register Globals
</link>, as well as the PHP <ulink url="&url.php.release4.1.0;">4.1.0
</ulink> and <ulink url="&url.php.release4.2.0;">4.2.0</ulink> Release
Announcements.
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/extract.xml?r1=1.16&r2=1.17&ty=u
Index: phpdoc/en/reference/array/functions/extract.xml
diff -u phpdoc/en/reference/array/functions/extract.xml:1.16
phpdoc/en/reference/array/functions/extract.xml:1.17
--- phpdoc/en/reference/array/functions/extract.xml:1.16 Tue Mar 30 05:17:12
2004
+++ phpdoc/en/reference/array/functions/extract.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.extract">
<refnamediv>
@@ -152,7 +152,7 @@
Do not use <function>extract</function> on untrusted data, like
user-input ($_GET, ...). If you do, for example, if you want to run old
code that relies on
- <link linkend="security.registerglobals">register_globals</link>
+ <link linkend="security.globals">register_globals</link>
temporarily, make sure you use one of the non-overwriting
<parameter>extract_type</parameter> values such as
<constant>EXTR_SKIP</constant> and be aware that you should extract
http://cvs.php.net/diff.php/phpdoc/en/reference/dba/reference.xml?r1=1.22&r2=1.23&ty=u
Index: phpdoc/en/reference/dba/reference.xml
diff -u phpdoc/en/reference/dba/reference.xml:1.22
phpdoc/en/reference/dba/reference.xml:1.23
--- phpdoc/en/reference/dba/reference.xml:1.22 Tue Feb 24 03:45:30 2004
+++ phpdoc/en/reference/dba/reference.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<reference id="ref.dba">
<title>Database (dbm-style) Abstraction Layer Functions</title>
<titleabbrev>dba</titleabbrev>
@@ -17,7 +17,7 @@
supported by modern databases such as
<ulink url="&url.sleepycat;">Sleepycat Software's DB2</ulink>.
(This is not to be confused with IBM's DB2 software, which is
- supported through the <link linkend="ref.odbc">ODBC functions</link>.)
+ supported through the <link linkend="ref.uodbc">ODBC functions</link>.)
</para>
</section>
http://cvs.php.net/diff.php/phpdoc/en/reference/dbx/reference.xml?r1=1.15&r2=1.16&ty=u
Index: phpdoc/en/reference/dbx/reference.xml
diff -u phpdoc/en/reference/dbx/reference.xml:1.15
phpdoc/en/reference/dbx/reference.xml:1.16
--- phpdoc/en/reference/dbx/reference.xml:1.15 Tue Feb 24 03:45:31 2004
+++ phpdoc/en/reference/dbx/reference.xml Sun Apr 11 11:41:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<!--
If anyone from the translator group has problems with the
@@ -49,7 +49,7 @@
</listitem>
<listitem>
<simpara>
- <link linkend="ref.odbc">ODBC</link>
+ <link linkend="ref.uodbc">ODBC</link>
</simpara>
</listitem>
<listitem>
http://cvs.php.net/diff.php/phpdoc/en/reference/mnogosearch/reference.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/mnogosearch/reference.xml
diff -u phpdoc/en/reference/mnogosearch/reference.xml:1.6
phpdoc/en/reference/mnogosearch/reference.xml:1.7
--- phpdoc/en/reference/mnogosearch/reference.xml:1.6 Sat Nov 30 10:33:21 2002
+++ phpdoc/en/reference/mnogosearch/reference.xml Sun Apr 11 11:41:59 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
-<reference id="ref.mnogo">
+<!-- $Revision: 1.7 $ -->
+<reference id="ref.mnogosearch">
<title>mnoGoSearch Functions</title>
<titleabbrev>mnoGoSearch</titleabbrev>
<partintro>
http://cvs.php.net/diff.php/phpdoc/en/reference/uodbc/reference.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/uodbc/reference.xml
diff -u phpdoc/en/reference/uodbc/reference.xml:1.6
phpdoc/en/reference/uodbc/reference.xml:1.7
--- phpdoc/en/reference/uodbc/reference.xml:1.6 Tue Feb 24 03:46:31 2004
+++ phpdoc/en/reference/uodbc/reference.xml Sun Apr 11 11:42:00 2004
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
- <reference id="ref.odbc">
+<!-- $Revision: 1.7 $ -->
+ <reference id="ref.uodbc">
<title>Unified ODBC Functions</title>
<titleabbrev>ODBC</titleabbrev>
<partintro>
- <section id="odbc.intro">
+ <section id="uodbc.intro">
&reftitle.intro;
<para>
In addition to normal ODBC support, the Unified ODBC functions in
@@ -37,7 +37,7 @@
</note>
</section>
- <section id="odbc.requirements">
+ <section id="uodbc.requirements">
&reftitle.required;
<para>
To access any of the supported databases you need to have
@@ -49,7 +49,7 @@
&reference.uodbc.ini;
- <section id="odbc.resources">
+ <section id="uodbc.resources">
&reftitle.resources;
&no.resource;
</section>
http://cvs.php.net/diff.php/phpdoc/en/reference/var/reference.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/var/reference.xml
diff -u phpdoc/en/reference/var/reference.xml:1.5
phpdoc/en/reference/var/reference.xml:1.6
--- phpdoc/en/reference/var/reference.xml:1.5 Sun Sep 29 20:09:47 2002
+++ phpdoc/en/reference/var/reference.xml Sun Apr 11 11:42:00 2004
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
- <reference id="ref.variables">
+<!-- $Revision: 1.6 $ -->
+ <reference id="ref.var">
<title>Variable Functions</title>
<titleabbrev>Variables</titleabbrev>
<partintro>
- <section id="variables.intro">
+ <section id="var.intro">
&reftitle.intro;
<para>
For information on how variables behave, see
@@ -14,24 +14,24 @@
</para>
</section>
- <section id="variables.requirements">
+ <section id="var.requirements">
&reftitle.required;
&no.requirement;
</section>
- <section id="variables.installation">
+ <section id="var.installation">
&reftitle.install;
&no.install;
</section>
&reference.var.ini;
- <section id="variables.resources">
+ <section id="var.resources">
&reftitle.resources;
&no.resource;
</section>
- <section id="variables.constants">
+ <section id="var.constants">
&reftitle.constants;
&no.constants;
</section>
http://cvs.php.net/diff.php/phpdoc/en/security/database.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/security/database.xml
diff -u phpdoc/en/security/database.xml:1.3 phpdoc/en/security/database.xml:1.4
--- phpdoc/en/security/database.xml:1.3 Sun Mar 21 11:45:37 2004
+++ phpdoc/en/security/database.xml Sun Apr 11 11:42:00 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./index.xml, last change in rev 1.66 -->
<sect1 id="security.database">
<title>Database Security</title>
@@ -378,7 +378,7 @@
<simpara>
Check if the given input has the expected data type. PHP has
a wide range of input validating functions, from the simplest ones
- found in <link linkend="ref.variables">Variable Functions</link> and
+ found in <link linkend="ref.var">Variable Functions</link> and
in <link linkend="ref.ctype">Character Type Functions</link>
(e.g. <function>is_numeric</function>, <function>ctype_digit</function>
respectively) and onwards to the
http://cvs.php.net/diff.php/phpdoc/en/security/globals.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/security/globals.xml
diff -u phpdoc/en/security/globals.xml:1.1 phpdoc/en/security/globals.xml:1.2
--- phpdoc/en/security/globals.xml:1.1 Mon Jan 26 08:22:25 2004
+++ phpdoc/en/security/globals.xml Sun Apr 11 11:42:00 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<!-- splitted from ./index.xml, last change in rev 1.66 -->
- <sect1 id="security.registerglobals">
+ <sect1 id="security.globals">
<title>Using Register Globals</title>
<para>
Perhaps the most controversial change in PHP is when the default value
