nlopess Fri Aug 6 18:37:45 2004 EDT
Removed files:
/phpdoc installpart.xml.in
/phpdoc/en/chapters README config.xml install.apache.xml
install.apache2.xml install.caudium.xml
install.commandline.xml install.fhttpd.xml
install.general.xml install.hpux.xml
install.iis.xml install.iplanet.xml
install.linux.xml install.macosx.xml
install.omnihttpd.xml install.openbsd.xml
install.otherhttpd.xml install.problems.xml
install.sambar.xml install.solaris.xml
install.unix.xml install.windows.xml
install.xitami.xml
Modified files:
/phpdoc .cvsignore manual.xml.in
/phpdoc/en/appendices/configure index.xml
/phpdoc/en/chapters intro.xml tutorial.xml
/phpdoc/en/install/windows manual.xml
/phpdoc/en/language functions.xml
/phpdoc/en/reference/mbstring configure.xml
/phpdoc/scripts file-entities.php.in
Log:
finally switch to the new install part
#going to sleep now :)
http://cvs.php.net/diff.php/phpdoc/.cvsignore?r1=1.40&r2=1.41&ty=u
Index: phpdoc/.cvsignore
diff -u phpdoc/.cvsignore:1.40 phpdoc/.cvsignore:1.41
--- phpdoc/.cvsignore:1.40 Tue Oct 14 05:55:33 2003
+++ phpdoc/.cvsignore Fri Aug 6 18:37:44 2004
@@ -35,7 +35,6 @@
status.txt
revcheck.html
chmonly.xml
-installpart.xml
reserved.constants.xml
autom4te*
missing-entities.out
http://cvs.php.net/diff.php/phpdoc/manual.xml.in?r1=1.182&r2=1.183&ty=u
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.182 phpdoc/manual.xml.in:1.183
--- phpdoc/manual.xml.in:1.182 Tue Aug 3 07:52:56 2004
+++ phpdoc/manual.xml.in Fri Aug 6 18:37:44 2004
@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"@srcdir@/dtds/dbxml-4.1.2/docbookx.dtd" [
-<!-- $Revision: 1.182 $ -->
+<!-- $Revision: 1.183 $ -->
<!-- Add translated specific definitions and snippets -->
<!ENTITY % language-defs SYSTEM "@srcdir@/@LANGDIR@/language-defs.ent">
@@ -55,11 +55,8 @@
<title>&GettingStarted;</title>
&chapters.intro;
&chapters.tutorial;
- &chapters.install; <!-- note that this is not always chapters/install.xml -->
- &chapters.config;
</part>
- <!--
<part id="install">
<title>&InstallAndConfigure;</title>
&install.intro;
@@ -69,7 +66,6 @@
&install.problems;
&install.ini;
</part>
- -->
<part id="langref">
<title>&LanguageReference;</title>
http://cvs.php.net/diff.php/phpdoc/en/appendices/configure/index.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/appendices/configure/index.xml
diff -u phpdoc/en/appendices/configure/index.xml:1.3
phpdoc/en/appendices/configure/index.xml:1.4
--- phpdoc/en/appendices/configure/index.xml:1.3 Sun Jun 20 06:23:11 2004
+++ phpdoc/en/appendices/configure/index.xml Fri Aug 6 18:37:44 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<appendix id="configure">
<title>Configure options</title>
@@ -12,7 +12,7 @@
locations on the extension reference pages and not here. For a complete
up-to-date list of configure options, run <command>./configure --help</command>
in your PHP source directory after running <command>autoconf</command>
- (see also the <link linkend="installation">Installation chapter</link>).
+ (see also the <link linkend="install">Installation chapter</link>).
You may also be interested in reading the
<ulink url="&url.gnu.configure;">GNU configure</ulink> documentation for
information on additional <command>configure</command> options such as
http://cvs.php.net/diff.php/phpdoc/en/chapters/intro.xml?r1=1.37&r2=1.38&ty=u
Index: phpdoc/en/chapters/intro.xml
diff -u phpdoc/en/chapters/intro.xml:1.37 phpdoc/en/chapters/intro.xml:1.38
--- phpdoc/en/chapters/intro.xml:1.37 Sun May 23 15:32:27 2004
+++ phpdoc/en/chapters/intro.xml Fri Aug 6 18:37:44 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.37 $ -->
+<!-- $Revision: 1.38 $ -->
<chapter id="introduction">
<title>Introduction</title>
@@ -91,7 +91,7 @@
viewing the PHP page through the server. All these can
run on your home machine if you are just experimenting
with PHP programming. See the
- <link linkend="installation">installation instructions</link>
+ <link linkend="install">installation instructions</link>
section for more information.
</simpara>
</listitem>
@@ -229,7 +229,7 @@
<para>
As you can see this page is not enough to list all
the features and benefits PHP can offer. Read on in
- the sections about <link linkend="installation">installing
+ the sections about <link linkend="install">installing
PHP</link>, and see the <link linkend="funcref">function
reference</link> part for explanation of the extensions
mentioned here.
http://cvs.php.net/diff.php/phpdoc/en/chapters/tutorial.xml?r1=1.35&r2=1.36&ty=u
Index: phpdoc/en/chapters/tutorial.xml
diff -u phpdoc/en/chapters/tutorial.xml:1.35 phpdoc/en/chapters/tutorial.xml:1.36
--- phpdoc/en/chapters/tutorial.xml:1.35 Mon Jul 19 21:27:19 2004
+++ phpdoc/en/chapters/tutorial.xml Fri Aug 6 18:37:44 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.35 $ -->
+<!-- $Revision: 1.36 $ -->
<chapter id="tutorial">
<title>A simple tutorial</title>
@@ -44,7 +44,7 @@
</para>
<para>
You can either install these individually or choose a simpler way. Our
- manual has <link linkend="installation">installation instructions for
+ manual has <link linkend="install">installation instructions for
PHP</link> (assuming you already have some webserver set up). In case
you have problems with installing PHP yourself, we would suggest you ask
your questions on our <ulink url="&url.php.mailing-lists;">installation
@@ -120,7 +120,7 @@
for download, or you see the whole file as text, chances are that the
server you are on does not have PHP enabled, or is not configured properly.
Ask your administrator to enable it for you using the
- <link linkend="installation">Installation</link> chapter
+ <link linkend="install">Installation</link> chapter
of the manual. If you are developing locally, also read the
installation chapter to make sure everything is configured
properly. Make sure that you access the file via http with the server
http://cvs.php.net/diff.php/phpdoc/en/install/windows/manual.xml?r1=1.12&r2=1.13&ty=u
Index: phpdoc/en/install/windows/manual.xml
diff -u phpdoc/en/install/windows/manual.xml:1.12
phpdoc/en/install/windows/manual.xml:1.13
--- phpdoc/en/install/windows/manual.xml:1.12 Fri Aug 6 15:10:40 2004
+++ phpdoc/en/install/windows/manual.xml Fri Aug 6 18:37:44 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<sect1 id="install.windows.manual">
<title>Manual Installation Steps</title>
@@ -41,7 +41,7 @@
If you use Microsoft <emphasis>Windows 98/NT4</emphasis> download the
latest version of the Microsoft Data Access Components (MDAC) for your
platform. MDAC is available at <ulink url="&url.mdac;">&url.mdac;</ulink>.
- This requirement exists because <link linkend="ref.odbc">ODBC</link> is
+ This requirement exists because <link linkend="ref.uodbc">ODBC</link> is
built into the distributed Windows binaries.
</para>
</note>
http://cvs.php.net/diff.php/phpdoc/en/language/functions.xml?r1=1.51&r2=1.52&ty=u
Index: phpdoc/en/language/functions.xml
diff -u phpdoc/en/language/functions.xml:1.51 phpdoc/en/language/functions.xml:1.52
--- phpdoc/en/language/functions.xml:1.51 Tue Aug 3 16:59:42 2004
+++ phpdoc/en/language/functions.xml Fri Aug 6 18:37:44 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.51 $ -->
+<!-- $Revision: 1.52 $ -->
<chapter id="language.functions">
<title>Functions</title>
@@ -547,7 +547,7 @@
extensions are loaded into your PHP. Also note that many extensions are
enabled by default and that the PHP manual is split up by extension.
See the <link linkend="configuration">configuration</link>,
- <link linkend="installation">installation</link>, and individual
+ <link linkend="install">installation</link>, and individual
extension chapters, for information on how to setup your PHP.
</para>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/mbstring/configure.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/mbstring/configure.xml
diff -u phpdoc/en/reference/mbstring/configure.xml:1.4
phpdoc/en/reference/mbstring/configure.xml:1.5
--- phpdoc/en/reference/mbstring/configure.xml:1.4 Sat Mar 13 06:45:37 2004
+++ phpdoc/en/reference/mbstring/configure.xml Fri Aug 6 18:37:44 2004
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<section id="mbstring.installation">
&reftitle.install;
<para>
<literal>mbstring</literal> is a non-default extension. This means it
is not enabled by default. You must explicitly enable the module with
the <literal>configure</literal> option. See the
- <link linkend="installation">Install</link> section for details.
+ <link linkend="install">Install</link> section for details.
</para>
<simpara>
The following configure options are related to the
http://cvs.php.net/diff.php/phpdoc/scripts/file-entities.php.in?r1=1.16&r2=1.17&ty=u
Index: phpdoc/scripts/file-entities.php.in
diff -u phpdoc/scripts/file-entities.php.in:1.16
phpdoc/scripts/file-entities.php.in:1.17
--- phpdoc/scripts/file-entities.php.in:1.16 Fri Jun 25 14:05:19 2004
+++ phpdoc/scripts/file-entities.php.in Fri Aug 6 18:37:45 2004
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: file-entities.php.in,v 1.16 2004/06/25 18:05:19 nlopess Exp $
+ $Id: file-entities.php.in,v 1.17 2004/08/06 22:37:45 nlopess Exp $
*/
/**
@@ -108,23 +108,6 @@
entstr("zendapi.toc", "") . "\n"
);
echo " Zend part not found\n";
-}
-
-// Install part already splitted? [temporary]
-if (file_exists("$trans_dir/chapters/install.xml")) {
- fputs(
- $fp,
- "<!-- old install.xml found in language dir -->\n" .
- entstr("chapters.install", "$trans_dir/chapters/install.xml") . "\n"
- );
- echo " Using install.xml in language dir\n";
-} else {
- fputs(
- $fp,
- "<!-- old install.xml not found in language dir -->\n" .
- entstr("chapters.install", "$out_dir/installpart.xml") . "\n"
- );
- echo " Using the install part from installpart.xml\n";
}
// Reserved constants list is special [temporary]
