hholzgra Sun Jan 14 10:16:22 2001 EDT
Modified files:
/phpdoc/en/chapters install.xml
/phpdoc/en/functions uodbc.xml
Log:
made new install.xml build without warnungs
uodbc had a link to something in install.xml that's no longer there
Index: phpdoc/en/chapters/install.xml
diff -u phpdoc/en/chapters/install.xml:1.28 phpdoc/en/chapters/install.xml:1.29
--- phpdoc/en/chapters/install.xml:1.28 Sun Jan 14 00:42:08 2001
+++ phpdoc/en/chapters/install.xml Sun Jan 14 10:16:22 2001
@@ -96,16 +96,16 @@
</listitem>
</itemizedlist>
</para>
-
+
<sect2 id="install.unix.apache-module">
<title>Apache Module Quick Reference</title>
-
+
<para>
PHP can be compiled in a number of different ways, but one of
the most popular is as an Apache module. The following is a quick
installation overview.
</para>
-
+
<example id="install.unix.apache-module.quick">
<title>
Quick Installation Instructions for PHP 4 (Apache Module Version)
@@ -175,7 +175,7 @@
This section contains notes and hints specific to HP-UX installs
of PHP.
</para>
- <example id="install.hpux">
+ <example id="install.hpux.example">
<title>
Installation Instructions for HP-UX 10
</title>
@@ -250,7 +250,6 @@
Paul Mckay.
</programlisting>
</example>
-</sect2>
</sect1>
@@ -360,7 +359,7 @@
There are two slightly different versions of Mac OS X, client and
server. The following is for OS X server.
</simpara>
- <example id="install.macosx.compile">
+ <example id="install.macosx.compile.example">
<title>
Mac OS X server install
</title>
@@ -432,6 +431,7 @@
</programlisting>
</example>
+<simpara>
Other examples for
<ulink url="&url.stepwise.macosx-client;">Mac OS X client</ulink>
and
@@ -1619,7 +1619,7 @@
<parameter>--enable-force-cgi-redirect</parameter>
</term>
<listitem>
- <para>
+ <para>
PHP 3, PHP 4: Enable the security check for internal server redirects.
You should use this if you are running the CGI version with Apache.
</para>
@@ -2936,7 +2936,7 @@
</sect1>
- <sect1 id="install-windows95-nt">
+ <sect1 id="install-windows-modules">
<title>Installation of Windows Modules</title>
<para>
After installing PHP and a webserver on windows, you will
@@ -3513,17 +3513,16 @@
</sect2>
</sect1>
-
+
<sect1 id="install.netscape-enterprise">
<title>Netscape and iPlanet Enterprise Server Installs</title>
<para>
To build PHP with NES or iPlanet web servers, enter the proper
- install directory for the <option>
- <link linkend="install.configure.with-nsapi">--with-nsapi</link>=
- <replaceable>DIR</replaceable></option>
- option. The default directory is usually <filename
- class="directory">/opt/netscape/suitespot/</filename>. Please
- also read /php-xxx-version/sapi/nsapi/nsapi-readme.txt.
+ install directory for the
+ <option><link linkend="install.configure.with-nsapi">--with-nsapi</link> =
+<replaceable>DIR</replaceable></option>
+ 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>.
</para>
<para>
<example id="install.netscape-enterprise.solaris">
@@ -3577,13 +3576,13 @@
<filename
class="directory">/path/to/server/https-servername/start</filename>
</para>
- <para>
+ <para>
You may also need to edit the configuration files that are
- located in:<filename
+ located in:<filename
class="directory">/path/to/server/https-servername/config/</filename>.
- <para>
-
- <example id="install.netscape-enterprise.configure">
+ </para>
+
+ <example id="install.netscape-enterprise.configure">
<title>
Configuration Example for Netscape Enterprise
</title>
@@ -3601,7 +3600,7 @@
Init fn="load-modules" funcs="php4_init,php4_close,php4_execute,php4_auth_trans"
shlib="/php4/nsapiPHP4.dll"
Init fn=php4_init errorString="Failed to initialize PHP!"
- <Object name="default">
+ <object name="default">
.
.
.
@@ -3609,13 +3608,13 @@
Service fn="php4_execute" type="magnus-internal/x-httpd-php"
.
.
- </Object>
+ </Object>
- <Object name="x-httpd-php">
+ <Object name="x-httpd-php">
ObjectType fn="force-type" type="magnus-internal/x-httpd-php"
Service fn=php4_execute
- </Object>
+ </Object>
Authentication configuration
@@ -3624,22 +3623,21 @@
PASSED TO YOUR PHP SCRIPT. To configure PHP Authentication for the entire server,
add
the following line:
- <Object name="default">
+ <Object name="default">
AuthTrans fn=php4_auth_trans
.
.
.
.
- </Object>
+ </Object>
To use PHP Authentication on a single directory, add the following:
- <Object ppath="d:\path\to\authenticated\dir\*">
+ <Object ppath="d:\path\to\authenticated\dir\*">
AuthTrans fn=php4_auth_trans
- </Object>
+ </Object>
</programlisting>
</example>
- </para>
</sect1>
<sect1 id="install.omnihttpd">
@@ -3701,7 +3699,7 @@
</sect1>
- <sect1 id="install.otherhttpd.details">
+ <sect1 id="install.otherhttpd">
<title>Other web servers</title>
<para>
PHP can be built to support a large number of web servers. Please
Index: phpdoc/en/functions/uodbc.xml
diff -u phpdoc/en/functions/uodbc.xml:1.11 phpdoc/en/functions/uodbc.xml:1.12
--- phpdoc/en/functions/uodbc.xml:1.11 Fri Aug 18 08:32:54 2000
+++ phpdoc/en/functions/uodbc.xml Sun Jan 14 10:16:22 2001
@@ -18,12 +18,14 @@
url="&url.solid;">Solid</ulink>, and <ulink
url="&url.sybase;">Sybase SQL Anywhere</ulink>.
</simpara>
+<!-- install.xml has changed, so this link is no longer working
<simpara>
Please see the <link
linkend="database-support-options">Installation on Unix
Systems</link> chapter for more information about configuring PHP
with these databases.
</simpara>
+-->
<note>
<simpara>
There is no ODBC involved when connecting to the above
