[PHP-DOC] cvs: phpdoc /en/appendices tokens.xml /en/chapters install.windows.xml tutorial.xml /en/language expressions.xml types.xml /en/reference/hwapi reference.xml

[Kenneth Schwartz]

irchtml         Wed Mar 24 11:39:44 2004 EDT

  Modified files:              
    /phpdoc/en/appendices       tokens.xml 
    /phpdoc/en/chapters install.windows.xml tutorial.xml 
    /phpdoc/en/language expressions.xml types.xml 
    /phpdoc/en/reference/hwapi  reference.xml 
  Log:
  changed links to new id's
  
http://cvs.php.net/diff.php/phpdoc/en/appendices/tokens.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/appendices/tokens.xml
diff -u phpdoc/en/appendices/tokens.xml:1.10 phpdoc/en/appendices/tokens.xml:1.11
--- phpdoc/en/appendices/tokens.xml:1.10        Fri May 16 23:37:43 2003
+++ phpdoc/en/appendices/tokens.xml     Wed Mar 24 11:39:43 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 
 <appendix id="tokens">
  <title>List of Parser Tokens</title>
@@ -272,7 +272,7 @@
     <row>
      <entry>T_FUNCTION</entry>
      <entry>function or cfunction</entry>
-     <entry><link linkend="functions">functions</link></entry>
+     <entry><link linkend="language.functions">functions</link></entry>
     </row>
     <row>
      <entry>T_GLOBAL</entry>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.windows.xml?r1=1.39&r2=1.40&ty=u
Index: phpdoc/en/chapters/install.windows.xml
diff -u phpdoc/en/chapters/install.windows.xml:1.39 
phpdoc/en/chapters/install.windows.xml:1.40
--- phpdoc/en/chapters/install.windows.xml:1.39 Wed Dec 31 10:25:25 2003
+++ phpdoc/en/chapters/install.windows.xml      Wed Mar 24 11:39:43 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.39 $ -->
+<!-- $Revision: 1.40 $ -->
   <sect1 id="install.windows">
    <title>Installation on Windows systems</title>
    <para>
@@ -948,7 +948,7 @@
   </row>
   <row>
    <entry>php_hyperwave.dll</entry>
-   <entry><link linkend="ref.hyperwave">HyperWave</link> functions</entry>
+   <entry><link linkend="ref.hw">HyperWave</link> functions</entry>
    <entry>None</entry>
   </row>
   <row>
http://cvs.php.net/diff.php/phpdoc/en/chapters/tutorial.xml?r1=1.31&r2=1.32&ty=u
Index: phpdoc/en/chapters/tutorial.xml
diff -u phpdoc/en/chapters/tutorial.xml:1.31 phpdoc/en/chapters/tutorial.xml:1.32
--- phpdoc/en/chapters/tutorial.xml:1.31        Fri Feb 20 18:12:50 2004
+++ phpdoc/en/chapters/tutorial.xml     Wed Mar 24 11:39:43 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.31 $ -->
+<!-- $Revision: 1.32 $ -->
  <chapter id="tutorial">
   <title>A simple tutorial</title>
 
@@ -261,8 +261,8 @@
    </para>
    <para>
     <example>
-     <title>Example using <link linkend="control-structures">control 
-     structures</link> and <link linkend="functions">functions</link></title>
+     <title>Example using <link linkend="language.control-structures">control 
+     structures</link> and <link linkend="language.functions">functions</link></title>
      <programlisting role="php">
 <![CDATA[
 <?php
@@ -311,7 +311,7 @@
     too.  If you are unsure how to use functions, you will want to read both
     the manual page on <link linkend="about.prototypes">how to read a
     function definition</link> and the section about  
-    <link linkend="functions">PHP functions</link>.
+    <link linkend="language.functions">PHP functions</link>.
    </para>
    <para>
     We can take this a step further and show how you can jump in and out
http://cvs.php.net/diff.php/phpdoc/en/language/expressions.xml?r1=1.26&r2=1.27&ty=u
Index: phpdoc/en/language/expressions.xml
diff -u phpdoc/en/language/expressions.xml:1.26 phpdoc/en/language/expressions.xml:1.27
--- phpdoc/en/language/expressions.xml:1.26     Thu Feb 12 07:53:04 2004
+++ phpdoc/en/language/expressions.xml  Wed Mar 24 11:39:43 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.26 $ -->
+<!-- $Revision: 1.27 $ -->
  <chapter id="language.expressions">
    <title>Expressions</title>
    <simpara>
@@ -40,7 +40,7 @@
    <simpara>
     Assuming you're familiar with the concept of functions (if you're
     not, take a look at the chapter about <link
-    linkend="functions">functions</link>), you'd assume
+    linkend="language.functions">functions</link>), you'd assume
     that typing <literal>$c = foo()</literal> is essentially just like
     writing <literal>$c = 5</literal>, and you're right.  Functions
     are expressions with the value of their return value.  Since foo()
http://cvs.php.net/diff.php/phpdoc/en/language/types.xml?r1=1.135&r2=1.136&ty=u
Index: phpdoc/en/language/types.xml
diff -u phpdoc/en/language/types.xml:1.135 phpdoc/en/language/types.xml:1.136
--- phpdoc/en/language/types.xml:1.135  Tue Feb 17 08:17:07 2004
+++ phpdoc/en/language/types.xml        Wed Mar 24 11:39:43 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.135 $ -->
+<!-- $Revision: 1.136 $ -->
  <chapter id="language.types">
   <title>Types</title>
 
@@ -201,7 +201,7 @@
       Usually you 
       use some kind of <link linkend="language.operators">operator</link>
       which returns a <type>boolean</type> value, and then pass it 
-      on to a <link linkend="control-structures">control
+      on to a <link linkend="language.control-structures">control
       structure</link>.
       <informalexample>
        <programlisting role="php">
http://cvs.php.net/diff.php/phpdoc/en/reference/hwapi/reference.xml?r1=1.11&r2=1.12&ty=u
Index: phpdoc/en/reference/hwapi/reference.xml
diff -u phpdoc/en/reference/hwapi/reference.xml:1.11 
phpdoc/en/reference/hwapi/reference.xml:1.12
--- phpdoc/en/reference/hwapi/reference.xml:1.11        Tue Feb 24 03:45:48 2004
+++ phpdoc/en/reference/hwapi/reference.xml     Wed Mar 24 11:39:43 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
  <reference id="ref.hwapi">
   <title>Hyperwave API Functions</title>
   <titleabbrev>Hyperwave API</titleabbrev>
@@ -20,7 +20,7 @@
      A time limited version can be ordered for free (30 days).
     </para>
     <para>
-     See also the <link linkend="ref.hyperwave">Hyperwave</link> module.
+     See also the <link linkend="ref.hw">Hyperwave</link> module.
     </para>
     <para>
      Hyperwave is an information system similar to a database
@@ -51,7 +51,7 @@
     <title>Integration with Apache</title>
     <para>
      The integration with Apache and possible other servers is already
-     described in the <link linkend="ref.hyperwave">Hyperwave module</link>
+     described in the <link linkend="ref.hw">Hyperwave module</link>
      which has been the first extension to connect a Hyperwave Server.
     </para>
    </section>