Browse Source

[DOCUMENTATION] English:
- fix all compilation errors

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19778 44c647ce-9c0f-0410-b52a-842ac1e357ba

mikaelkael 16 years ago
parent
commit
53a113f325

+ 0 - 2
documentation/manual/en/manual.xml.in

@@ -636,7 +636,6 @@
         <xi:include href="module_specs/Zend_Tool-Extending.xml" />
         <xi:include href="module_specs/Zend_Tool-Extending.xml" />
     </chapter>
     </chapter>
 
 
-    <!--
     <chapter id="zend.tool.framework">
     <chapter id="zend.tool.framework">
         <title>Zend_Tool_Framework</title>
         <title>Zend_Tool_Framework</title>
         <xi:include href="module_specs/Zend_Tool_Framework-Introduction.xml" />
         <xi:include href="module_specs/Zend_Tool_Framework-Introduction.xml" />
@@ -654,7 +653,6 @@
         <xi:include href="module_specs/Zend_Tool_Project-Providers.xml" />
         <xi:include href="module_specs/Zend_Tool_Project-Providers.xml" />
         <xi:include href="module_specs/Zend_Tool_Project-Internals.xml" />
         <xi:include href="module_specs/Zend_Tool_Project-Internals.xml" />
     </chapter>
     </chapter>
-    -->
 
 
     <chapter id="zend.translate">
     <chapter id="zend.translate">
         <title>Zend_Translate</title>
         <title>Zend_Translate</title>

+ 7 - 7
documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Blob.xml

@@ -33,7 +33,7 @@
                 storage.
                 storage.
             </para>
             </para>
 
 
-            <example id="zend.service.windowsazure.storage.blob.api.create-container">
+            <example id="zend.service.windowsazure.storage.blob.api.create-container.example">
                 <title>Creating a storage container</title>
                 <title>Creating a storage container</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -53,7 +53,7 @@ echo 'Container name is: ' . $result->Name;
                 storage.
                 storage.
             </para>
             </para>
 
 
-            <example id="zend.service.windowsazure.storage.blob.api.delete-container">
+            <example id="zend.service.windowsazure.storage.blob.api.delete-container.example">
                 <title>Deleting a storage container</title>
                 <title>Deleting a storage container</title>
 
 
                 <programlisting role="php"><![CDATA[
                 <programlisting role="php"><![CDATA[
@@ -71,7 +71,7 @@ $storageClient->deleteContainer('testcontainer');
                 development storage. Note that the container has already been created before.
                 development storage. Note that the container has already been created before.
             </para>
             </para>
 
 
-            <example id="zend.service.windowsazure.storage.blob.api.storing-blob">
+            <example id="zend.service.windowsazure.storage.blob.api.storing-blob.example">
                 <title>Storing a blob</title>
                 <title>Storing a blob</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -97,7 +97,7 @@ echo 'Blob name is: ' . $result->Name;
                 created before.
                 created before.
             </para>
             </para>
 
 
-            <example id="zend.service.windowsazure.storage.blob.api.copy-blob">
+            <example id="zend.service.windowsazure.storage.blob.api.copy-blob.example">
                 <title>Copying a blob</title>
                 <title>Copying a blob</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -122,7 +122,7 @@ echo 'Copied blob name is: ' . $result->Name;
                 blob has been uploaded.
                 blob has been uploaded.
             </para>
             </para>
 
 
-            <example id="zend.service.windowsazure.storage.blob.api.download-blob">
+            <example id="zend.service.windowsazure.storage.blob.api.download-blob.example">
                 <title>Downloading a blob</title>
                 <title>Downloading a blob</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -151,7 +151,7 @@ $storageClient->getBlob(
                 storage. Note that the container has already been created before.
                 storage. Note that the container has already been created before.
             </para>
             </para>
 
 
-            <example id="zend.service.windowsazure.storage.blob.api.public-blob">
+            <example id="zend.service.windowsazure.storage.blob.api.public-blob.example">
                 <title>Making a blob publicly available</title>
                 <title>Making a blob publicly available</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -189,7 +189,7 @@ $storageClient->setContainerAcl('testcontainer', Zend_Service_WindowsAzure_Stora
             client as a PHP file stream wrapper. The blob storage stream wrapper provides
             client as a PHP file stream wrapper. The blob storage stream wrapper provides
             support for using regular file operations on Windows Azure Blob Storage.
             support for using regular file operations on Windows Azure Blob Storage.
             For example, one can open a file from Windows Azure Blob Storage with
             For example, one can open a file from Windows Azure Blob Storage with
-            the <modulename>fopen()</modulename> function:
+            the <methodname>fopen()</methodname> function:
         </para>
         </para>
 
 
         <example id="zend.service.windowsazure.storage.blob.wrapper.sample">
         <example id="zend.service.windowsazure.storage.blob.wrapper.sample">

+ 1 - 1
documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Table.xml

@@ -730,7 +730,7 @@ if (!isset($_SESSION['firstVisit'])) {
         <warning>
         <warning>
             <para>
             <para>
                 The <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session handler
                 The <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session handler
-                should be registered before a call to <modulename>session_start()</modulename>
+                should be registered before a call to <methodname>session_start()</methodname>
                 is made!
                 is made!
             </para>
             </para>
         </warning>
         </warning>

+ 9 - 9
documentation/manual/en/module_specs/Zend_Tool-Extending.xml

@@ -460,7 +460,7 @@ C:\WAMP\PHP\bin
                     they have to be physically present in the include paths.</para>
                     they have to be physically present in the include paths.</para>
                 </note>
                 </note>
 
 
-                <example id="zend.tool.framework.writing-providers.loading.example">
+                <example id="zend.tool.extending.zend-tool-framework.providers-and-manifests.loading.example">
                     <title>Exposing Your Providers with a Manifest</title>
                     <title>Exposing Your Providers with a Manifest</title>
 
 
                     <para>
                     <para>
@@ -490,7 +490,7 @@ class My_Component_Manifest
                 </example>
                 </example>
             </sect4>
             </sect4>
 
 
-            <sect4 id="zend.tool.framework.writing-providers.basic">
+            <sect4 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.basic">
                 <title>Basic Instructions for Creating Providers</title>
                 <title>Basic Instructions for Creating Providers</title>
 
 
                 <para>
                 <para>
@@ -528,7 +528,7 @@ Hello from my provider!
 ]]></programlisting>
 ]]></programlisting>
             </sect4>
             </sect4>
 
 
-            <sect4 id="zend.tool.framework.writing-providers.response">
+            <sect4 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.response">
                 <title>The response object</title>
                 <title>The response object</title>
 
 
                 <para>
                 <para>
@@ -558,10 +558,10 @@ class My_Component_HelloProvider
                 </para>
                 </para>
             </sect4>
             </sect4>
 
 
-            <sect4 id="zend.tool.framework.writing-providers.advanced">
+            <sect4 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced">
                 <title>Advanced Development Information</title>
                 <title>Advanced Development Information</title>
 
 
-                <sect5 id="zend.tool.framework.writing-providers.advanced.variables">
+                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.variables">
                     <title>Passing Variables to a Provider</title>
                     <title>Passing Variables to a Provider</title>
 
 
                     <para>
                     <para>
@@ -604,7 +604,7 @@ class My_Component_HelloProvider
 
 
                 </sect5>
                 </sect5>
 
 
-                <sect5 id="zend.tool.framework.writing-providers.advanced.prompt">
+                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.prompt">
                     <title>Prompt the User for Input</title>
                     <title>Prompt the User for Input</title>
 
 
                     <para>
                     <para>
@@ -636,7 +636,7 @@ class My_Component_HelloProvider
                     </para>
                     </para>
                 </sect5>
                 </sect5>
 
 
-                <sect5 id="zend.tool.framework.writing-providers.advanced.pretendable">
+                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.pretendable">
                     <title>Pretending to execute a Provider Action</title>
                     <title>Pretending to execute a Provider Action</title>
 
 
                     <para>
                     <para>
@@ -685,7 +685,7 @@ I would say hello Ralph.
 
 
                 </sect5>
                 </sect5>
 
 
-                <sect5 id="zend.tool.framework.writing-providers.advanced.verbosedebug">
+                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.verbosedebug">
                     <title>Verbose and Debug modes</title>
                     <title>Verbose and Debug modes</title>
 
 
                     <para>
                     <para>
@@ -712,7 +712,7 @@ class My_Component_HelloProvider
 ]]></programlisting>
 ]]></programlisting>
                 </sect5>
                 </sect5>
 
 
-                <sect5 id="zend.tool.framework.writing-providers.advanced.configstorage">
+                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.configstorage">
                     <title>Accessing User Config and Storage</title>
                     <title>Accessing User Config and Storage</title>
 
 
                     <para>
                     <para>

+ 2 - 2
documentation/manual/en/ref/installation.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
-<sect1 id="introduction.installation">
+<chapter id="introduction.installation">
 
 
     <title>Installation</title>
     <title>Installation</title>
 
 
@@ -97,4 +97,4 @@
         comprehensive reference to Zend Framework on a component-by-component basis.
         comprehensive reference to Zend Framework on a component-by-component basis.
     </para>
     </para>
 
 
-</sect1>
+</chapter>

+ 2 - 2
documentation/manual/en/ref/overview.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
-<sect1 id="introduction.overview">
+<chapter id="introduction.overview">
 
 
     <title>Overview</title>
     <title>Overview</title>
 
 
@@ -39,7 +39,7 @@
         forums. Whatever question you have about Zend Framework, the community is always available
         forums. Whatever question you have about Zend Framework, the community is always available
         to address it.
         to address it.
     </para>
     </para>
-</sect1>
+</chapter>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:
 -->
 -->

+ 1 - 1
documentation/manual/en/tutorials/autoloading-conclusion.xml

@@ -14,7 +14,7 @@
     <para>
     <para>
         For more information on its usage, read the <link
         For more information on its usage, read the <link
             linkend="zend.loader.autoloader">Zend_Loader_Autoloader</link> and <link
             linkend="zend.loader.autoloader">Zend_Loader_Autoloader</link> and <link
-            linkend="zend.loader.autoloader-resources">Zend_Loader_Autoloader_Resource</link> manual
+            linkend="zend.loader.autoloader-resource">Zend_Loader_Autoloader_Resource</link> manual
         pages.
         pages.
     </para>
     </para>
 </sect1>
 </sect1>

+ 1 - 1
documentation/manual/en/tutorials/lucene-index-opening.xml

@@ -17,7 +17,7 @@ $index = Zend_Search_Lucene::create($indexPath);
 ]]></programlisting>
 ]]></programlisting>
     </example>
     </example>
 
 
-    <example id="learning.lucene.index-opening.creation">
+    <example id="learning.lucene.index-opening.opening">
         <title>Lucene Index Opening</title>
         <title>Lucene Index Opening</title>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[

+ 2 - 6
documentation/manual/en/tutorials/multiuser-authentication.xml

@@ -63,7 +63,7 @@ CREATE TABLE users (
             password salt column.  This salt column is used as part of a technique called salting that
             password salt column.  This salt column is used as part of a technique called salting that
             would improve the security of your database of information against brute force attacks
             would improve the security of your database of information against brute force attacks
             targeting the algorithm of your password hashing.
             targeting the algorithm of your password hashing.
-            <a href="http://en.wikipedia.org/wiki/Salting_%28cryptography%29">More information</a>
+            <ulink url="http://en.wikipedia.org/wiki/Salting_%28cryptography%29">More information</ulink>
             on salting.
             on salting.
         </para>
         </para>
 
 
@@ -72,9 +72,7 @@ CREATE TABLE users (
             "login form".  We will use Zend_Form to accomplish this.
             "login form".  We will use Zend_Form to accomplish this.
         </para>
         </para>
 
 
-
-<programlisting language="php"><![CDATA[
-<?php
+        <programlisting language="php"><![CDATA[
 // located at application/forms/Auth/Login.php
 // located at application/forms/Auth/Login.php
 
 
 class Default_Form_Auth_Login extends Zend_Form
 class Default_Form_Auth_Login extends Zend_Form
@@ -164,8 +162,6 @@ class AuthController extends Zend_Controller_Action
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
-<?php
-
 $this->form->setAction($this->url());
 $this->form->setAction($this->url());
 echo $this->form;
 echo $this->form;
 ]]></programlisting>
 ]]></programlisting>

+ 1 - 1
documentation/manual/en/tutorials/multiuser-authorization.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
-<sect1 id="learning.multiuser.authentication">
+<sect1 id="learning.multiuser.authorization">
     <title>Building an Authorization System in ZF</title>
     <title>Building an Authorization System in ZF</title>
 
 
     <sect2 id="learning.multiuser.authorization.intro">
     <sect2 id="learning.multiuser.authorization.intro">

+ 1 - 1
documentation/manual/en/tutorials/multiuser-sessions.xml

@@ -104,7 +104,7 @@ if ($mysession->counter > 1999) {
         </para>
         </para>
 
 
     </sect2>
     </sect2>
-    <sect2 id="learning.multiuser.sessions.basic-usage">
+    <sect2 id="learning.multiuser.sessions.advanced-usage">
         <title>Advanced Usage of Zend_Session</title>
         <title>Advanced Usage of Zend_Session</title>
 
 
         <para>
         <para>

+ 1 - 1
documentation/manual/en/tutorials/view-placeholders-standard.xml

@@ -130,7 +130,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            Then, in your layout script, simply <functionname>echo</functionname> the helper at the
+            Then, in your layout script, simply <function>echo</function> the helper at the
             top of the file:
             top of the file:
         </para>
         </para>