nlopess Sat Feb 11 20:31:34 2006 UTC
Modified files:
/phpdoc/entities global.ent
/phpdoc/en/faq build.xml installation.xml
Log:
update some URL entities.
remove references to the INSTALL and install.txt files that are in php-src
CVS, as they are now generated from phpdoc sources, thus offering no advantage
http://cvs.php.net/viewcvs.cgi/phpdoc/entities/global.ent?r1=1.257&r2=1.258&diff_format=u
Index: phpdoc/entities/global.ent
diff -u phpdoc/entities/global.ent:1.257 phpdoc/entities/global.ent:1.258
--- phpdoc/entities/global.ent:1.257 Sun Jan 15 00:47:10 2006
+++ phpdoc/entities/global.ent Sat Feb 11 20:31:33 2006
@@ -1,12 +1,12 @@
<!-- -*- SGML -*-
- $Id: global.ent,v 1.257 2006/01/15 00:47:10 hholzgra Exp $
+ $Id: global.ent,v 1.258 2006/02/11 20:31:33 nlopess Exp $
Contains global "macros" for all the XML documents.
-->
<!ENTITY url.7zip "http://www.7-zip.org/";>
-<!ENTITY url.adabas "http://www.softwareag.com/adabasd/";>
+<!ENTITY url.adabas
"http://www.softwareag.com/Corporate/products/adabas/adad/";>
<!ENTITY url.adobe.acrobat
"http://www.adobe.com/products/acrobat/readstep2.html";>
<!ENTITY url.apache "http://www.apache.org/";>
<!ENTITY url.apachedso "http://httpd.apache.org/docs/1.3/dso.html";>
@@ -44,7 +44,7 @@
<!ENTITY url.chm.history "http://www.winwriters.com/mshelp.htm";>
<!ENTITY url.coldfusion.summary
"http://marc.theaimsgroup.com/?l=php-general&m=95602167412542&w=1";>
<!ENTITY url.comspecs "http://www.microsoft.com/Com/resources/comdocs.asp";>
-<!ENTITY url.connectionstrings "http://connectionstrings.com/";>
+<!ENTITY url.connectionstrings "http://www.connectionstrings.com/";>
<!ENTITY url.cpdf "http://www.fastio.com/";>
<!ENTITY url.crack "http://www.crypticide.com/users/alecm/";>
<!ENTITY url.curl "http://curl.haxx.se/";>
@@ -91,8 +91,6 @@
<!ENTITY url.fastio "http://www.fastio.com/";>
<!ENTITY url.fbsql "http://www.frontbase.com/";>
<!ENTITY url.fbsql.docs
"http://www.frontbase.com/cgi-bin/WebObjects/FrontBase.woa/wa/productsPage?currentPage=Documentation";>
-<!ENTITY url.file.installation "http://cvs.php.net/co.php/php-src/INSTALL";>
-<!ENTITY url.file.readmewin
"http://cvs.php.net/co.php/php-src/win32/install.txt";>
<!ENTITY url.filepro "http://www.fptech.com/";>
<!ENTITY url.firebird "http://www.firebirdsql.org/";>
<!ENTITY url.flex "http://www.gnu.org/software/flex/flex.html";>
http://cvs.php.net/viewcvs.cgi/phpdoc/en/faq/build.xml?r1=1.31&r2=1.32&diff_format=u
Index: phpdoc/en/faq/build.xml
diff -u phpdoc/en/faq/build.xml:1.31 phpdoc/en/faq/build.xml:1.32
--- phpdoc/en/faq/build.xml:1.31 Fri Aug 13 04:34:34 2004
+++ phpdoc/en/faq/build.xml Sat Feb 11 20:31:33 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.31 $ -->
+<!-- $Revision: 1.32 $ -->
<chapter id="faq.build">
<title>Build Problems</title>
<titleabbrev>Build Problems</titleabbrev>
@@ -183,9 +183,8 @@
<para>
If you're linking with Apache 1.2.x, did you remember to add the
appropriate information to the EXTRA_LIBS line of the Configuration
- file and re-rerun Apache's Configure script? See the
- <ulink url="&url.file.installation;">INSTALL</ulink> file that
- comes with the distribution for more information.
+ file and re-rerun Apache's Configure script? See the <link
+ linkend="install">installation chapter</link> for more information.
</para>
<para>
Some people have also reported that they had to add '-ldl' immediately
http://cvs.php.net/viewcvs.cgi/phpdoc/en/faq/installation.xml?r1=1.45&r2=1.46&diff_format=u
Index: phpdoc/en/faq/installation.xml
diff -u phpdoc/en/faq/installation.xml:1.45 phpdoc/en/faq/installation.xml:1.46
--- phpdoc/en/faq/installation.xml:1.45 Fri Jun 3 17:57:13 2005
+++ phpdoc/en/faq/installation.xml Sat Feb 11 20:31:33 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.45 $ -->
+<!-- $Revision: 1.46 $ -->
<chapter id="faq.installation">
<title>Installation FAQ</title>
<titleabbrev>Installation</titleabbrev>
@@ -10,12 +10,7 @@
MacOS before OSX), and almost any web server.
</para>
<para>
- To install PHP, follow the instructions in the
- <ulink url="&url.file.installation;">INSTALL</ulink>
- file located in the distribution. Windows users should also read the
- <ulink url="&url.file.readmewin;">install.txt</ulink>
- file. There are also some helpful hints for Windows users
- <link linkend="install.windows">here</link>.
+ To install PHP, follow the instructions in <xref linkend="install"/>.
</para>
<qandaset>
