cvs: phpdoc /en/install/windows manual.xml /entities global.ent

nlopess Fri Jun 11 05:10:03 2004 EDT Modified files: /phpdoc/entities global.ent /phpdoc/en/install/windows manual.xml Log: fix some IDs, remove bogus link, remove info about oreilly server http://cvs.php.net/diff.php/phpdoc/entities/global.ent?r1=1.185&r2=1.186&ty=u Index: phpdoc/entities/global.ent diff -u phpdoc/entities/global.ent:1.185 phpdoc/entities/global.ent:1.186 --- phpdoc/entities/global.ent:1.185 Wed Jun 9 05:54:47 2004 +++ phpdoc/entities/global.ent Fri Jun 11 05:10:02 2004 @@ -1,6 +1,6 @@ <!-- -*- SGML -*- - $Id: global.ent,v 1.185 2004/06/09 09:54:47 goba Exp $ + $Id: global.ent,v 1.186 2004/06/11 09:10:02 nlopess Exp $ Contains global "macros" for all the XML documents. @@ -300,7 +300,6 @@ <!ENTITY url.w3.validator "http://validator.w3.org/"> <!ENTITY url.win32.buildtools "http://www.php.net/extra/win32build.zip"> <!ENTITY url.win32.dnsresolver "http://www.php.net/extra/bindlib_w32.zip"> -<!ENTITY url.win32install "http://www.umesd.k12.or.us/php/win32install.html"> <!ENTITY url.wincmd "http://www.ghisler.com/"> <!ENTITY url.winexif "http://www.canon-asia.com/products/digital_cameras/winxp_problems.html"> <!ENTITY url.winhelp "http://msdn.microsoft.com/library/en-us/htmlhelp/html/vsconhh1start.asp"> @@ -351,8 +350,6 @@ <!ENTITY email.php.doc.subscribe 'phpdoc-subscribe@lists.php.net'> <!ENTITY email.sample 'yourname@example.com'> -<!ENTITY link.bob '<ulink url="mailto:&email.bob;">Bob Silva</ulink>'> - <!ENTITY link.superglobals '<link linkend="language.variables.predefined">superglobals</link>'> <!ENTITY spec.cookies 'http://www.netscape.com/newsref/std/cookie_spec.html'> @@ -390,6 +387,7 @@ <!ENTITY url.velocis "http://www.birdstep.com/database_technology/rdm_server.php3"> <!ENTITY url.php.snaps.manual "http://www.php.net/download-docs.php"> <!ENTITY url.php.stats "../images/phpstats-200002.gif"> +<!ENTITY url.win32install "http://www.umesd.k12.or.us/php/win32install.html"> <!ENTITY email.rasmus 'rasmus@php.net'> <!ENTITY email.stig 'stig@php.net'> <!ENTITY email.bob 'bob_silva@mail.umesd.k12.or.us'> @@ -398,5 +396,6 @@ <!ENTITY email.dams 'damien.seguy@nexen.net'> <!ENTITY email.php3 'php-general@lists.php.net'> <!ENTITY email.php3.subscribe 'php-general-subscribe@lists.php.net'> +<!ENTITY link.bob '<ulink url="mailto:&email.bob;">Bob Silva</ulink>'> <!ENTITY link.rasmus '<ulink url="mailto:&email.rasmus;">Rasmus Lerdorf</ulink>'> <!ENTITY link.stig '<ulink url="mailto:&email.stig;">Stig S&aelig;ther Bakken</ulink>'> http://cvs.php.net/diff.php/phpdoc/en/install/windows/manual.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/install/windows/manual.xml diff -u phpdoc/en/install/windows/manual.xml:1.1 phpdoc/en/install/windows/manual.xml:1.2 --- phpdoc/en/install/windows/manual.xml:1.1 Thu Jun 3 18:45:11 2004 +++ phpdoc/en/install/windows/manual.xml Fri Jun 11 05:10:03 2004 @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <sect1 id="install.windows.manual"> <title>Manual Installation Steps</title> <simpara> This install guide will help you manually install and configure PHP on your - Windows webserver. The original version of this guide was compiled by - &link.bob;, and can be found at - <ulink url="&url.win32install;">&url.win32install;</ulink>. + Windows webserver. You need to download the zip binary distribution from the downloads page at <ulink url="&url.php.downloads;">&url.php.downloads;</ulink>. </simpara> @@ -228,7 +226,7 @@ <listitem> <para> Edit your new &php.ini; file. - If you plan to use <link linkend="install.omnihttpd">OmniHTTPd</link>, + If you plan to use <link linkend="install.windows.omnihttpd">OmniHTTPd</link>, do not follow the next step. Set the <link linkend="ini.doc-root">doc_root</link> to point to your webservers document_root. For example: @@ -275,7 +273,7 @@ <itemizedlist> <listitem> <simpara> - .. the <link linkend="install.iis">Windows server family</link>, Personal + .. the <link linkend="install.windows.iis">Windows server family</link>, Personal Web server (PWS) 3 and 4 or newer; Internet Information Server (IIS) 3 and 4 or newer. </simpara> @@ -283,39 +281,33 @@ <listitem> <simpara> .. the Apache servers - <link linkend="install.apache.windows">Apache 1.3.x</link>, and - <link linkend="install.apache2.windows">Apache 2.x</link>. + <link linkend="install.windows.apache1">Apache 1.3.x</link>, and + <link linkend="install.windows.apache2">Apache 2.x</link>. </simpara> </listitem> <listitem> <simpara> .. the - <link linkend="install.netscape.windows">Netscape/iPlanet</link> servers. + <link linkend="install.windows.sun">Sun/Netscape/iPlanet</link> servers. </simpara> </listitem> <listitem> <simpara> - .. the <link linkend="install.omnihttpd">OmniHTTPd</link> server. - </simpara> - </listitem> - - <listitem> - <simpara> - .. the <link linkend="install.oreilly">Oreilly Website Pro</link> server. + .. the <link linkend="install.windows.omnihttpd">OmniHTTPd</link> server. </simpara> </listitem> <listitem> <simpara> - .. the <link linkend="install.sambar">Sambar</link> server. + .. the <link linkend="install.windows.sambar">Sambar</link> server. </simpara> </listitem> <listitem> <simpara> - .. the <link linkend="install.xitami">Xitami</link> server. + .. the <link linkend="install.windows.xitami">Xitami</link> server. </simpara> </listitem> </itemizedlist>