nlopess Tue Aug 10 09:01:08 2004 EDT
Modified files:
/phpdoc/en/reference/apache reference.xml
/phpdoc/en/chapters tutorial.xml
/phpdoc/en/features safe-mode.xml
/phpdoc/en/install/unix fhttpd.xml sun.xml
/phpdoc/en/language/oop5 abstract.xml
Log:
fix IDs
http://cvs.php.net/diff.php/phpdoc/en/reference/apache/reference.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/apache/reference.xml
diff -u phpdoc/en/reference/apache/reference.xml:1.8
phpdoc/en/reference/apache/reference.xml:1.9
--- phpdoc/en/reference/apache/reference.xml:1.8 Mon Apr 19 10:52:33 2004
+++ phpdoc/en/reference/apache/reference.xml Tue Aug 10 09:01:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<reference id="ref.apache">
<title>Apache-specific Functions</title>
<titleabbrev>Apache</titleabbrev>
@@ -24,9 +24,8 @@
<section id="apache.installation">
&reftitle.install;
<para>
- For PHP installation on Apache see the
- <link linkend='install.apache'>Apache section</link> in the installation
- chapter.
+ For PHP installation on Apache see the <link
+ linkend='install'>installation chapter</link>.
</para>
</section>
http://cvs.php.net/diff.php/phpdoc/en/chapters/tutorial.xml?r1=1.36&r2=1.37&ty=u
Index: phpdoc/en/chapters/tutorial.xml
diff -u phpdoc/en/chapters/tutorial.xml:1.36 phpdoc/en/chapters/tutorial.xml:1.37
--- phpdoc/en/chapters/tutorial.xml:1.36 Fri Aug 6 18:37:44 2004
+++ phpdoc/en/chapters/tutorial.xml Tue Aug 10 09:01:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.36 $ -->
+<!-- $Revision: 1.37 $ -->
<chapter id="tutorial">
<title>A simple tutorial</title>
@@ -37,7 +37,7 @@
<para>
Let us say you want to save precious bandwidth and develop locally.
In this case, you will want to install a web server, such as
- <link linkend="install.apache">Apache</link>, and of course
+ <ulink url="&url.apache;">Apache</ulink>, and of course
<ulink url="&url.php.downloads;">PHP</ulink>. You will most likely
want to install a database as well, such as
<ulink url="&url.mysql.docs;">MySQL</ulink>.
http://cvs.php.net/diff.php/phpdoc/en/features/safe-mode.xml?r1=1.54&r2=1.55&ty=u
Index: phpdoc/en/features/safe-mode.xml
diff -u phpdoc/en/features/safe-mode.xml:1.54 phpdoc/en/features/safe-mode.xml:1.55
--- phpdoc/en/features/safe-mode.xml:1.54 Sun Aug 8 13:30:17 2004
+++ phpdoc/en/features/safe-mode.xml Tue Aug 10 09:01:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.54 $ -->
+<!-- $Revision: 1.55 $ -->
<chapter id="features.safe-mode">
<title>Safe Mode</title>
@@ -89,7 +89,7 @@
<listitem>
<para>
Whether to enable PHP's safe mode. Read the
- <link linkend="security.index">Security</link> chapter for more
+ <link linkend="security">Security</link> chapter for more
information.
</para>
</listitem>
@@ -243,7 +243,7 @@
<listitem>
<simpara>
This directive allows you to disable certain functions for
- <link linkend="security.index">security</link> reasons. It takes
+ <link linkend="security">security</link> reasons. It takes
on a comma-delimited list of function names. disable_functions
is not affected by <link linkend="ini.safe-mode">Safe Mode</link>.
</simpara>
@@ -261,7 +261,7 @@
<listitem>
<simpara>
This directive allows you to disable certain classes for
- <link linkend="security.index">security</link> reasons. It takes
+ <link linkend="security">security</link> reasons. It takes
on a comma-delimited list of class names. disable_classes
is not affected by <link linkend="ini.safe-mode">Safe Mode</link>.
</simpara>
http://cvs.php.net/diff.php/phpdoc/en/install/unix/fhttpd.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/unix/fhttpd.xml
diff -u phpdoc/en/install/unix/fhttpd.xml:1.1 phpdoc/en/install/unix/fhttpd.xml:1.2
--- phpdoc/en/install/unix/fhttpd.xml:1.1 Tue Jun 8 17:47:58 2004
+++ phpdoc/en/install/unix/fhttpd.xml Tue Aug 10 09:01:07 2004
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect1 id="install.unix.fhttpd">
<title>fhttpd related notes</title>
<para>
To build PHP as an fhttpd module, answer "yes" to "Build as an
fhttpd module?" (the <link
- linkend="install.configure.with-fhttpd">
+ linkend="configure.with-fhttpd">
--with-fhttpd</link>=<replaceable>DIR</replaceable>
option to configure) and specify the fhttpd source base
directory. The default directory is <filename
http://cvs.php.net/diff.php/phpdoc/en/install/unix/sun.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/unix/sun.xml
diff -u phpdoc/en/install/unix/sun.xml:1.1 phpdoc/en/install/unix/sun.xml:1.2
--- phpdoc/en/install/unix/sun.xml:1.1 Tue Jun 8 17:47:58 2004
+++ phpdoc/en/install/unix/sun.xml Tue Aug 10 09:01:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect1 id="install.unix.sun">
<title>Sun, iPlanet and Netscape servers on Sun Solaris</title>
<para>
@@ -23,7 +23,7 @@
<para>
To build PHP with Sun JSWS/Sun ONE WS/iPlanet/Netscape webservers,
enter the proper install directory for the
- <link linkend="install.configure.with-nsapi">--with-nsapi=[DIR]</link>
+ <link linkend="configure.with-nsapi">--with-nsapi=[DIR]</link>
option. The default directory is usually
<filename class="directory">/opt/netscape/suitespot/</filename>.
Please also read
<filename>/php-xxx-version/sapi/nsapi/nsapi-readme.txt</filename>.
http://cvs.php.net/diff.php/phpdoc/en/language/oop5/abstract.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/language/oop5/abstract.xml
diff -u phpdoc/en/language/oop5/abstract.xml:1.4
phpdoc/en/language/oop5/abstract.xml:1.5
--- phpdoc/en/language/oop5/abstract.xml:1.4 Sat Aug 7 14:11:34 2004
+++ phpdoc/en/language/oop5/abstract.xml Tue Aug 10 09:01:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<sect1 id="language.oop5.abstract">
<title>Object Abstraction</title>
@@ -13,7 +13,7 @@
<para>
The class that implements the abstract method must define with the same
- <link linkend="oop5.visibility">visibillity</link> or weaker. If the
+ <link linkend="language.oop5.visibility">visibillity</link> or weaker. If the
abstract method is defined as protected, the function implenetation must be
defined as either protected or public.
</para>
