ソースを参照

[DOCUMENTATION] English: remove TABS and endline spaces

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19777 44c647ce-9c0f-0410-b52a-842ac1e357ba
mikaelkael 16 年 前
コミット
3bef036e99
44 ファイル変更1030 行追加1030 行削除
  1. 7 7
      documentation/manual/en/module_specs/Zend_Exception-Previous.xml
  2. 8 8
      documentation/manual/en/module_specs/Zend_Feed_Reader.xml
  3. 13 13
      documentation/manual/en/module_specs/Zend_Feed_Writer.xml
  4. 9 9
      documentation/manual/en/module_specs/Zend_Markup-Getting-Started.xml
  5. 35 35
      documentation/manual/en/module_specs/Zend_Markup-Parsers.xml
  6. 6 6
      documentation/manual/en/module_specs/Zend_Markup-Renderers.xml
  7. 1 1
      documentation/manual/en/module_specs/Zend_Markup.xml
  8. 2 2
      documentation/manual/en/module_specs/Zend_Pdf-InteractiveFeatures.xml
  9. 1 1
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure.xml
  10. 24 24
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Blob.xml
  11. 4 4
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Queue.xml
  12. 16 16
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Table.xml
  13. 488 488
      documentation/manual/en/module_specs/Zend_Tool-Extending.xml
  14. 143 143
      documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml
  15. 3 3
      documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml
  16. 2 2
      documentation/manual/en/tutorials/autoloading-usage.xml
  17. 8 8
      documentation/manual/en/tutorials/form-decorators-composite.xml
  18. 12 12
      documentation/manual/en/tutorials/form-decorators-individual.xml
  19. 1 1
      documentation/manual/en/tutorials/form-decorators-layering.xml
  20. 1 1
      documentation/manual/en/tutorials/form-decorators-simplest.xml
  21. 1 1
      documentation/manual/en/tutorials/layout-intro.xml
  22. 3 3
      documentation/manual/en/tutorials/lucene-index-opening.xml
  23. 5 5
      documentation/manual/en/tutorials/lucene-index-structure.xml
  24. 1 1
      documentation/manual/en/tutorials/lucene-indexing.xml
  25. 3 3
      documentation/manual/en/tutorials/lucene-pagination.xml
  26. 3 3
      documentation/manual/en/tutorials/lucene-queries.xml
  27. 5 5
      documentation/manual/en/tutorials/lucene-searching.xml
  28. 37 37
      documentation/manual/en/tutorials/multiuser-authentication.xml
  29. 33 33
      documentation/manual/en/tutorials/multiuser-authorization.xml
  30. 10 10
      documentation/manual/en/tutorials/multiuser-intro.xml
  31. 27 27
      documentation/manual/en/tutorials/multiuser-sessions.xml
  32. 12 12
      documentation/manual/en/tutorials/paginator-control.xml
  33. 5 5
      documentation/manual/en/tutorials/paginator-intro.xml
  34. 13 13
      documentation/manual/en/tutorials/paginator-simple.xml
  35. 13 13
      documentation/manual/en/tutorials/paginator-together.xml
  36. 1 1
      documentation/manual/en/tutorials/plugins-conclusion.xml
  37. 1 1
      documentation/manual/en/tutorials/plugins-intro.xml
  38. 1 1
      documentation/manual/en/tutorials/plugins-usage.xml
  39. 4 4
      documentation/manual/en/tutorials/quickstart-create-form.xml
  40. 6 6
      documentation/manual/en/tutorials/quickstart-create-layout.xml
  41. 17 17
      documentation/manual/en/tutorials/quickstart-create-model.xml
  42. 36 36
      documentation/manual/en/tutorials/quickstart-create-project.xml
  43. 2 2
      documentation/manual/en/tutorials/view-placeholders-basics.xml
  44. 7 7
      documentation/manual/en/tutorials/view-placeholders-standard.xml

+ 7 - 7
documentation/manual/en/module_specs/Zend_Exception-Previous.xml

@@ -23,18 +23,18 @@ try {
     $db->query($sql);
 } catch (Zend_Db_Statement_Exception $e) {
     if ($e->getPrevious()) {
-        echo '[' . get_class($e) 
-            . '] has the previous exception of [' 
-            . get_class($e->getPrevious()) 
+        echo '[' . get_class($e)
+            . '] has the previous exception of ['
+            . get_class($e->getPrevious())
             . ']' . PHP_EOL;
     } else {
-        echo '[' . get_class($e) 
-            . '] does not have a previous exception' 
+        echo '[' . get_class($e)
+            . '] does not have a previous exception'
             . PHP_EOL;
     }
 
-    echo $e; 
-    // displays all exceptions starting by the first thrown 
+    echo $e;
+    // displays all exceptions starting by the first thrown
     // exception if available.
 }
 ]]></programlisting>

+ 8 - 8
documentation/manual/en/module_specs/Zend_Feed_Reader.xml

@@ -1068,7 +1068,7 @@ $labels = $categories->getValues();
                 content oriented, and will not assist in detecting changes to other
                 relevant elements. Atom feeds should not require such steps.
             </para>
-            
+
             <para>
                 Further muddying the
                 waters, dates in feeds may follow different standards. Atom and
@@ -1576,10 +1576,10 @@ $firstIsbn = $feed->current()->getIsbn();
             </para>
         </sect3>
     </sect2>
-  
+
     <sect2 id="migrating.from.1.9.6.to.1.10.or.later">
         <title>Migrating from 1.9.6 to 1.10 or later</title>
-        
+
         <para>
             With the introduction of Zend Framework 1.10, <classname>Zend_Feed_Reader</classname>'s
             handling of retrieving Authors and Contributors was changed, introducing
@@ -1592,7 +1592,7 @@ $firstIsbn = $feed->current()->getIsbn();
             In addition, the original implementation applied its RSS limits to Atom
             feeds significantly reducing the usefulness of the parser with that format.
         </para>
-        
+
         <para>
             The change means that methods like <methodname>getAuthors()</methodname>
             and <methodname>getContributors</methodname> no longer return a simple array
@@ -1603,14 +1603,14 @@ $firstIsbn = $feed->current()->getIsbn();
             will be a simple array with three potential keys (as the source data permits).
             These include: name, email and uri.
         </para>
-        
+
         <para>
             The original behaviour of such methods would have returned a simple
             array of strings, each string attempting to present a single name, but
             in reality this was unreliable since there is no rule governing the format
             of RSS Author strings.
         </para>
-        
+
         <para>
             The simplest method of simulating the original behaviour of these
             methods is to use the <classname>Zend_Feed_Reader_Collection_Author</classname>'s
@@ -1620,7 +1620,7 @@ $firstIsbn = $feed->current()->getIsbn();
             attached to each Author (if present). In most cases this simple change is
             easy to apply as demonstrated below.
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 /**
  * In 1.9.6
@@ -1637,6 +1637,6 @@ $authors = $feed->getAuthors()->getValues();
 
 
 ]]></programlisting>
-        
+
     </sect2>
 </sect1>

+ 13 - 13
documentation/manual/en/module_specs/Zend_Feed_Writer.xml

@@ -14,7 +14,7 @@
             offer a simple Extension system which allows for any extension/module for either of
             these two specifications to be implemented if they are not provided out of the box.
         </para>
-        
+
         <para>
             In many ways, <classname>Zend_Feed_Writer</classname> is the inverse of
             <classname>Zend_Feed_Reader</classname>. Where <classname>Zend_Feed_Reader</classname>
@@ -23,7 +23,7 @@
             mutators. This ensures the API won't pose a learning curve to anyone familiar with
             <classname>Zend_Feed_Reader</classname>.
         </para>
-        
+
         <para>
             As a result of this design, the rest may even be obvious. Behind the scenes, data set on
             any <classname>Zend_Feed_Reader</classname> object is translated at render time onto a
@@ -33,23 +33,23 @@
             the most obvious being the ability to export the <classname>DOMDocument</classname> for
             additional processing and relying on PHP DOM for correct and valid rendering.
         </para>
-        
+
         <para>
             As with <classname>Zend_Feed_Reader</classname>, <classname>Zend_Feed_Writer</classname>
             is a standalone replacement for <classname>Zend_Feed</classname>'s Builder architecture
             and is not compatible with those classes.
         </para>
-        
+
     </sect2>
-    
+
     <sect2 id="zend.feed.writer.architecture">
         <title>Architecture</title>
-        
+
         <para>
             The architecture of <classname>Zend_Feed_Writer</classname> is very simple. It has two
             core sets of classes: containers and renderers.
         </para>
-        
+
         <para>
             The containers include the <classname>Zend_Feed_Writer_Feed</classname> and
             <classname>Zend_Feed_Writer_Entry</classname> classes. The Entry classes can be attached
@@ -60,7 +60,7 @@
             methods to allow for fast rendering and export of the final feed, and these can be
             reused at will.
         </para>
-        
+
         <para>
             While there are two data containers, there are four renderers - two matching container
             renderers per support feed type. The renderer accept a container, and based on its
@@ -70,7 +70,7 @@
             <classname>Exception</classname>s, this removes the default safeguard of ensuring you
             have sufficient data set to render a wholly valid feed.
         </para>
-        
+
         <para>
             Due to the system being divided between data containers and renderers, it can make
             Extensions somewhat interesting. A typical Extension offering namespaced feed and entry
@@ -81,15 +81,15 @@
             of this section.
         </para>
     </sect2>
-    
+
     <sect2 id="zend.feed.writer.getting.started">
         <title>Getting Started</title>
-    
+
         <para>
             Using <classname>Zend_Feed_Reader</classname> is as simple as setting data and
             triggering the renderer. Here is an example to generate a minimal Atom 1.0 feed.
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 /**
  * Create the parent feed
@@ -134,7 +134,7 @@ $out = $feed->export('atom');
         <para>
             The output rendered should be as follows:
         </para>
-        
+
         <programlisting language="xml">
 &#60;?xml version="1.0" encoding="utf-8"?&#62;
 &#60;feed xmlns="http://www.w3.org/2005/Atom"&#62;

+ 9 - 9
documentation/manual/en/module_specs/Zend_Markup-Getting-Started.xml

@@ -8,22 +8,22 @@
         and <acronym>HTML</acronym> renderer. The priciples discussed can be adapted to other
         parsers and renderers.
     </para>
-    
+
     <example id="zend.markup.getting-started.basic-usage">
         <title>Basic Zend_Markup Usage</title>
-        
+
         <para>
             We will first instantiate a <classname>Zend_Markup_Renderer_Html</classname> object
             using the <methodname>Zend_Markup::factory()</methodname> method.  This will also create
             a <classname>Zend_Markup_Parser_Bbcode</classname> object which will be added to the
             renderer object.
         </para>
-        
+
         <para>
             Afther that, we will use the <methodname>render()</methodname> method to convert a piece
             of BBCode to <acronym>HTML</acronym>.
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 // Creates instance of Zend_Markup_Renderer_Html,
 // with Zend_Markup_Parser_BbCode as its parser
@@ -33,15 +33,15 @@ echo $bbcode->render('[b]bold text[/b] and [i]cursive text[/i]');
 // Outputs: '<strong>bold text</strong> and <em>cursive text</em>'
 ]]></programlisting>
     </example>
-    
+
     <example id="zend.markup.getting-started.complicated-example">
         <title>A more complicated example of Zend_Markup</title>
-        
+
         <para>
             This time, we will do exactly the same as above, but with more complicated BBCode
             markup.
         </para>
-    
+
         <programlisting language="php"><![CDATA[
 $bbcode = Zend_Markup::factory('Bbcode');
 
@@ -62,7 +62,7 @@ Should output something like:
 */
 ]]></programlisting>
     </example>
-    
+
     <example id="zend.markup.getting-started.incorrect-input">
         <title>Processing incorrect input</title>
 
@@ -73,7 +73,7 @@ Should output something like:
             <classname>Zend_Markup</classname> corrects input that is nested incorrectly, and also
             closes tags that were not closed:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 $bbcode = Zend_Markup::factory('Bbcode');
 

+ 35 - 35
documentation/manual/en/module_specs/Zend_Markup-Parsers.xml

@@ -7,17 +7,17 @@
         <classname>Zend_Markup</classname> is currently shipped with two parsers, a BBCode parser
         and a Textile parser.
     </para>
-    
+
     <sect2 id="zend.markup.parsers.theory">
         <title>Theory of Parsing</title>
-        
+
         <para>
             The parsers of <classname>Zend_Markup</classname> are classes that convert text with
             markup to a token tree. Although we are using the BBCode parser as example here, the
             idea of the token tree remains the same across all parsers. We will start with this
             piece of BBCode for example:
         </para>
-        
+
         <programlisting><![CDATA[
 [b]foo[i]bar[/i][/b]baz
 ]]></programlisting>
@@ -26,7 +26,7 @@
             Then the BBCode parser will take that value, tear it apart and create the following
             tree:
         </para>
-        
+
         <itemizedlist>
             <listitem>
                 <para>[b]</para>
@@ -52,74 +52,74 @@
                 <para>baz</para>
             </listitem>
         </itemizedlist>
-        
+
         <para>
             You will notice that the closing tags are gone, they don't show up as content in the
             tree structure. This is because the closing tag isn't part of the actual content.
             Although, this does not mean that the closing tag is just lost, it is stored inside the
             tag information for the tag itself. Also, please note that this is just a simplified
             view of the tree itself. The actual tree contains a lot more information, like the tag's
-            attributes and its name. 
+            attributes and its name.
         </para>
     </sect2>
-    
+
     <sect2 id="zend.markup.parsers.bbcode">
         <title>The BBCode parser</title>
-        
+
         <para>
             The BBCode parser is a <classname>Zend_Markup</classname> parser that converts BBCode to
             a token tree. The syntax of all BBCode tags is:
         </para>
-        
+
         <programlisting language="text"><![CDATA[
-[name(=(value|"value"))( attribute=(value|"value"))*]        
+[name(=(value|"value"))( attribute=(value|"value"))*]
 ]]></programlisting>
 
         <para>
             Some examples of valid BBCode tags are:
         </para>
-        
+
         <programlisting><![CDATA[
 [b]
 [list=1]
 [code file=Zend/Markup.php]
 [url="http://framework.zend.com/" title="Zend Framework!"]
 ]]></programlisting>
-        
+
         <para>
             By default, all tags are closed by using the format '[/tagname]'.
         </para>
     </sect2>
-    
+
     <sect2 id="zend.markup.parsers.textile">
         <title>The Textile parser</title>
-        
+
         <para>
             The Textile parser is a <classname>Zend_Markup</classname> parser that converts Textile
             to a token tree. Because Textile doesn't have a tag structure, the following is a list
             of example tags:
         </para>
-        
+
         <table id="zend.markup.parsers.textile.tags">
             <title>List of basic Textile tags</title>
 
             <tgroup cols="2" align="left" colsep="1" rowsep="1">
-	            <thead>
-	                <row>
-	                    <entry>Sample input</entry>
-
-	                    <entry>Sample output</entry>
-	                </row>
-	            </thead>
-	            
-	            <tbody>
-	                <row>
-	                    <entry>*foo*</entry>
-
-	                    <entry><![CDATA[<strong>foo</strong>]]></entry>
-	                </row>
-
-	                <row>
+                <thead>
+                    <row>
+                        <entry>Sample input</entry>
+
+                        <entry>Sample output</entry>
+                    </row>
+                </thead>
+
+                <tbody>
+                    <row>
+                        <entry>*foo*</entry>
+
+                        <entry><![CDATA[<strong>foo</strong>]]></entry>
+                    </row>
+
+                    <row>
                         <entry>_foo_</entry>
 
                         <entry><![CDATA[<em>foo</em>]]></entry>
@@ -190,10 +190,10 @@
 
                         <entry><![CDATA[<img src="http://framework.zend.com/images/logo.gif" />]]></entry>
                     </row>
-	            </tbody>
+                </tbody>
             </tgroup>
         </table>
-        
+
         <para>
             Also, the Textile parser wraps all tags into paragraphs; a paragraph ends with two
             newlines, and if there are more tags, a new paragraph will be added.
@@ -201,12 +201,12 @@
 
         <sect3 id="zend.markup.parsers.textile.lists">
             <title>Lists</title>
-            
+
             <para>
                 The Textile parser also supports two types of lists. The numeric type, using the "#"
                 character and bullit-lists using the "*" character. An example of both lists:
             </para>
-            
+
             <programlisting><![CDATA[
 # Item 1
 # Item 2

+ 6 - 6
documentation/manual/en/module_specs/Zend_Markup-Renderers.xml

@@ -7,17 +7,17 @@
         <classname>Zend_Markup</classname> is currently shipped with one renderer, the
         <acronym>HTML</acronym> renderer.
     </para>
-    
+
     <sect2 id="zend.markup.renderers.add">
         <title>Adding your own tags</title>
-        
+
         <para>
             By adding your own tags, you can add your own functionality to the
             <classname>Zend_Markup</classname> renderers. With the tag structure, you can add about
             any functionality you want. From simple tags, to complicated tag structures. A simple
             example for a 'foo' tag:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 // Creates instance of Zend_Markup_Renderer_Html,
 // with Zend_Markup_Parser_BbCode as its parser
@@ -33,8 +33,8 @@ $bbcode->addTag(
     Zend_Markup_Renderer_RendererAbstract::TYPE_REPLACE
         | Zend_Markup_Renderer_RendererAbstract::TAG_NORMAL,
     array(
-        'start' => '-bar-', 
-        'end'   => '-baz-', 
+        'start' => '-bar-',
+        'end'   => '-baz-',
         'group' => 'inline',
     )
 );
@@ -42,7 +42,7 @@ $bbcode->addTag(
 // now, this will output: 'my -bar-tag-baz-'
 echo $bbcode->render('my [foo]tag[/foo]');
 ]]></programlisting>
-        
+
         <para>
             Please note that creating your own tags only makes sense when your parser also supports
             it with a tag structure. Currently, only BBCode supports this. Textile doesn't have

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

@@ -6,7 +6,7 @@
     <para>
         The <classname>Zend_Markup</classname> component provides an extensible
         way for parsing text and rendering lightweight markup languages like
-        BBcode and Textile. It is available as of Zend Framework version 1.10. 
+        BBcode and Textile. It is available as of Zend Framework version 1.10.
     </para>
 
     <para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Pdf-InteractiveFeatures.xml

@@ -791,7 +791,7 @@ $pdf->resolveDestination(Zend_Pdf_Destination_Named::create('Page3'));
             </itemizedlist>
 
             <para>
-                Only <classname>Zend_Pdf_Action_GoTo</classname> and 
+                Only <classname>Zend_Pdf_Action_GoTo</classname> and
                 <classname>Zend_Pdf_Action_URI</classname> actions can be created by
                 user now.
             </para>
@@ -807,7 +807,7 @@ $pdf->resolveDestination(Zend_Pdf_Destination_Named::create('Page3'));
             <para>
                 <methodname>Zend_Pdf_Action_URI::create($uri[, $isMap])</methodname> method has
                 to be used to create a URI action (see API documentation for the details).
-                Optional <varname>$isMap</varname> parameter is set to false by default. 
+                Optional <varname>$isMap</varname> parameter is set to false by default.
             </para>
 
             <para>

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

@@ -65,7 +65,7 @@
                 documentation</ulink> for detailed description of the service. You will need to be
             familiar with basic concepts in order to use this service.
         </para>
-    
+
     </sect2>
 
     <sect2 id="zend.service.windowsazure.features">

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

@@ -163,16 +163,16 @@ $storageClient->setContainerAcl('testcontainer', Zend_Service_WindowsAzure_Stora
             </example>
         </sect4>
     </sect3>
-  
+
     <sect3 id="zend.service.windowsazure.storage.blob.root">
         <title>Root container</title>
 
         <para>
-            Windows Azure Blob Storage provides support to work with a "root container". 
-            This means that a blob can be stored in the root of your storage account, 
+            Windows Azure Blob Storage provides support to work with a "root container".
+            This means that a blob can be stored in the root of your storage account,
             i.e. <code>http://myaccount.blob.core.windows.net/somefile.txt</code>.
         </para>
-        
+
         <para>
             In order to work with the root container, it should first be created using the
             <methodname>createContainer()</methodname> method, naming the container
@@ -180,7 +180,7 @@ $storageClient->setContainerAcl('testcontainer', Zend_Service_WindowsAzure_Stora
             with the container name set to <varname>$root</varname>.
         </para>
     </sect3>
-  
+
     <sect3 id="zend.service.windowsazure.storage.blob.wrapper">
         <title>Blob storage stream wrapper</title>
 
@@ -203,7 +203,7 @@ $fileHandle = fopen('azure://mycontainer/myfile.txt', 'r');
 fclose($fileHandle);
 ]]></programlisting>
         </example>
-    
+
         <para>
             In order to do this, the Windows Azure SDK for PHP blob storage client
             must be registered as a stream wrapper. This can be done by calling the
@@ -222,7 +222,7 @@ $storageClient->registerStreamWrapper(); // registers azure:// on this storage c
 $storageClient->registerStreamWrapper('blob://'); // regiters blob:// on this storage client
 ]]></programlisting>
         </example>
-    
+
         <para>
             To unregister the stream wrapper, the <methodname>unregisterStreamWrapper()</methodname>
             method can be used.
@@ -240,20 +240,20 @@ $storageClient->registerStreamWrapper('blob://'); // regiters blob:// on this st
             assigned on a container or a blob and given to a specific client using an URL-based
             model.
         </para>
-        
+
         <para>
             An example would be the following signature:
         </para>
-        
+
         <literallayout>
 http://phpstorage.blob.core.windows.net/phpazuretestshared1?st=2009-08-17T09%3A06%3A17Z&amp;se=2009-08-17T09%3A56%3A17Z&amp;sr=c&amp;sp=w&amp;sig=hscQ7Su1nqd91OfMTwTkxabhJSaspx%2BD%2Fz8UqZAgn9s%3D
         </literallayout>
-        
+
         <para>
             The above signature gives write access to the "phpazuretestshared1"
             container of the "phpstorage" account.
         </para>
-    
+
         <sect4 id="zend.service.windowsazure.storage.blob.sharedaccesssig.generate">
             <title>Generating a Shared Access Signature</title>
 
@@ -264,7 +264,7 @@ http://phpstorage.blob.core.windows.net/phpazuretestshared1?st=2009-08-17T09%3A0
                 <classname>Zend_Service_WindowsAzure_Storage_Blob</classname> storage client can be
                 used.
             </para>
-            
+
             <para>
                 The following example code will generate a Shared Access Signature for write access
                 in a container named "container1", within a timeframe of 3000 seconds.
@@ -278,14 +278,14 @@ $storageClient   = new Zend_Service_WindowsAzure_Storage_Blob();
 $sharedAccessUrl = storageClient->generateSharedAccessUrl(
     'container1',
     '',
-    'c', 
+    'c',
     'w',
     $storageClient ->isoDate(time() - 500),
     $storageClient ->isoDate(time() + 3000)
 );
 ]]></programlisting>
             </example>
-            
+
             <para>
                 The following example code will generate a Shared Access Signature for read access
                 in a blob named <filename>test.txt</filename> in a container named "container1"
@@ -300,7 +300,7 @@ $storageClient   = new Zend_Service_WindowsAzure_Storage_Blob();
 $sharedAccessUrl = storageClient->generateSharedAccessUrl(
     'container1',
     'test.txt',
-    'b', 
+    'b',
     'r',
     $storageClient ->isoDate(time() - 500),
     $storageClient ->isoDate(time() + 3000)
@@ -308,7 +308,7 @@ $sharedAccessUrl = storageClient->generateSharedAccessUrl(
 ]]></programlisting>
             </example>
         </sect4>
-        
+
         <sect4 id="zend.service.windowsazure.storage.blob.sharedaccesssig.consume">
             <title>Working with Shared Access Signatures from others</title>
 
@@ -317,11 +317,11 @@ $sharedAccessUrl = storageClient->generateSharedAccessUrl(
                 Windows Azure SDK for PHP to work with the addressed resource.  For example, the
                 following signature can be retrieved from the owner of a storage account:
             </para>
-            
+
             <literallayout>
 http://phpstorage.blob.core.windows.net/phpazuretestshared1?st=2009-08-17T09%3A06%3A17Z&amp;se=2009-08-17T09%3A56%3A17Z&amp;sr=c&amp;sp=w&amp;sig=hscQ7Su1nqd91OfMTwTkxabhJSaspx%2BD%2Fz8UqZAgn9s%3D
             </literallayout>
-            
+
             <para>
                 The above signature gives write access to the "phpazuretestshared1" "container" of
                 the phpstorage account. Since the shared key for the account is not known, the
@@ -334,19 +334,19 @@ http://phpstorage.blob.core.windows.net/phpazuretestshared1?st=2009-08-17T09%3A0
                 <programlisting language="php"><![CDATA[
 $storageClient = new Zend_Service_WindowsAzure_Storage_Blob(
     'blob.core.windows.net', 'phpstorage', ''
-); 
-$storageClient->setCredentials( 
-    new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature() 
 );
-$storageClient->getCredentials()->setPermissionSet(array( 
-    'http://phpstorage.blob.core.windows.net/phpazuretestshared1?st=2009-08-17T09%3A06%3A17Z&se=2009-08-17T09%3A56%3A17Z&sr=c&sp=w&sig=hscQ7Su1nqd91OfMTwTkxabhJSaspx%2BD%2Fz8UqZAgn9s%3D' 
+$storageClient->setCredentials(
+    new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature()
+);
+$storageClient->getCredentials()->setPermissionSet(array(
+    'http://phpstorage.blob.core.windows.net/phpazuretestshared1?st=2009-08-17T09%3A06%3A17Z&se=2009-08-17T09%3A56%3A17Z&sr=c&sp=w&sig=hscQ7Su1nqd91OfMTwTkxabhJSaspx%2BD%2Fz8UqZAgn9s%3D'
 ));
 $storageClient->putBlob(
     'phpazuretestshared1', 'NewBlob.txt', 'C:\Files\dataforazure.txt'
 );
 ]]></programlisting>
             </example>
-            
+
             <para>
                 Note that there was no explicit permission to write to a specific blob. Instead, the
                 Windows Azure SDK for PHP determined that a permission was required to either write

+ 4 - 4
documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Queue.xml

@@ -7,7 +7,7 @@
         The Queue service stores messages that may be read by any client who has access to the
         storage account.
     </para>
-    
+
     <para>
         A queue can contain an unlimited number of messages, each of which can be up to 8 KB in
         size. Messages are generally added to the end of the queue and retrieved from the front of
@@ -83,7 +83,7 @@ $storageClient->deleteQueue('testqueue');
 $storageClient = new Zend_Service_WindowsAzure_Storage_Queue();
 
 // 3600 = time-to-live of the message, if omitted defaults to 7 days
-$storageClient->putMessage('testqueue', 'This is a test message', 3600); 
+$storageClient->putMessage('testqueue', 'This is a test message', 3600);
 ]]></programlisting>
             </example>
         </sect4>
@@ -110,7 +110,7 @@ foreach ($messages as $message) {
 }
 ]]></programlisting>
             </example>
-            
+
             <para>
                 The messages that are read using <methodname>getMessages()</methodname> will be
                 invisible in the queue for 30 seconds, after which the messages will re-appear in
@@ -159,7 +159,7 @@ foreach ($messages as $message) {
 }
 ]]></programlisting>
             </example>
-            
+
             <para>
                 Note that messages that are read using <methodname>peekMessages()</methodname> will
                 not become invisible in the queue, nor can they be marked as processed using the

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

@@ -87,13 +87,13 @@ foreach ($result as $table) {
             has a primary key and a set of properties. A property is a named, typed-value pair,
             similar to a column.
         </para>
-        
+
         <para>
             The Table service does not enforce any schema for tables, so two entities in the same
             table may have different sets of properties. Developers may choose to enforce a schema
             on the client side. A table may contain any number of entities.
         </para>
-        
+
         <para>
             <classname>Zend_Service_WindowsAzure_Storage_Table</classname> provides 2 ways of
             working with entities:
@@ -127,12 +127,12 @@ class SampleEntity extends Zend_Service_WindowsAzure_Storage_TableEntity
     * @azure Name
     */
     public $Name;
-    
+
     /**
     * @azure Age Edm.Int64
     */
     public $Age;
-    
+
     /**
     * @azure Visible Edm.Boolean
     */
@@ -210,12 +210,12 @@ class SampleEntity extends Zend_Service_WindowsAzure_Storage_TableEntity
      * @azure Name
      */
     public $Name;
-    
+
     /**
      * @azure Age Edm.Int64
      */
     public $Age;
-    
+
     /**
      * @azure Visible Edm.Boolean
      */
@@ -404,7 +404,7 @@ $target->Name = 'Name'; // Will add property "Name" of type "Edm.String"
 $target->Age  = 25;     // Will add property "Age" of type "Edm.Int32"
 
 // Change type of property "Age" to "Edm.Int32":
-$target->setAzurePropertyType('Age', 'Edm.Int64'); 
+$target->setAzurePropertyType('Age', 'Edm.Int64');
 ]]></programlisting>
             </example>
 
@@ -515,7 +515,7 @@ $entity = $storageClient->retrieveEntityById(
 $entity->Name = 'New name';
 
 // last parameter instructs the Etag check:
-$result = $storageClient->updateEntity('testtable', $entity, true); 
+$result = $storageClient->updateEntity('testtable', $entity, true);
 ]]></programlisting>
                 </example>
             </sect5>
@@ -646,20 +646,20 @@ $storageClient = new Zend_Service_WindowsAzure_Storage_Table(
 
 // Start batch
 $batch = $storageClient->startBatch();
-            
+
 // Insert entities in batch
 $entities = generateEntities();
 foreach ($entities as $entity) {
     $storageClient->insertEntity($tableName, $entity);
 }
-            
+
 // Commit
 $batch->commit();
 ]]></programlisting>
             </example>
         </sect4>
     </sect3>
-  
+
     <sect3 id="zend.service.windowsazure.storage.table.sessionhandler">
         <title>Table storage session handler</title>
 
@@ -670,7 +670,7 @@ $batch->commit();
             <classname>Zend_Service_WindowsAzure_SessionHandler</classname> class, which uses
             Windows Azure Table Storage as a session handler for PHP applications.
         </para>
-        
+
         <para>
             To use the <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session
             handler, it should be registered as the default session handler for your PHP
@@ -691,19 +691,19 @@ $sessionHandler = new Zend_Service_WindowsAzure_SessionHandler(
 $sessionHandler->register();
 ]]></programlisting>
         </example>
-    
+
         <para>
             The above classname registers the
             <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session handler and will
             store sessions in a table called "sessionstable".
         </para>
-        
+
         <para>
             After registration of the
             <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session handler,
             sessions can be started and used in the same way as a normal PHP session:
         </para>
-        
+
         <example id="zend.service.windowsazure.storage.table.api.sessionhandler-usage">
             <title>Using table storage session handler</title>
 
@@ -726,7 +726,7 @@ if (!isset($_SESSION['firstVisit'])) {
 // ...
 ]]></programlisting>
         </example>
-    
+
         <warning>
             <para>
                 The <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session handler

ファイルの差分が大きいため隠しています
+ 488 - 488
documentation/manual/en/module_specs/Zend_Tool-Extending.xml


+ 143 - 143
documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml

@@ -2,28 +2,28 @@
 <!-- Reviewed: no -->
 <sect1 id="zend.tool.usage.cli">
     <title>Using Zend_Tool On The Command Line</title>
-    
+
     <para>
         The <acronym>CLI</acronym>, or command line tool (internally known as the console tool),
         is currently the primary interface for dispatching <classname>Zend_Tool</classname>
         requests. With the <acronym>CLI</acronym> tool, developers can issue tooling requests
-        inside the "command line window", also commonly known as a "terminal" window. This 
-        environment is predominant in the *nix environment, but also has a common implementation 
+        inside the "command line window", also commonly known as a "terminal" window. This
+        environment is predominant in the *nix environment, but also has a common implementation
         in windows with the <filename>cmd.exe</filename>, console2 and also with the Cygwin project.
     </para>
-    
+
     <!--
     <sect2 id="zend.tool.usage.cli.introduction">
         <title>Introduction</title>
     </sect2>
     -->
-    
+
     <sect2 id="zend.tool.usage.cli.installation">
         <title>Installation</title>
-        
+
         <sect3 id="zend.tool.usage.cli.installation.download-and-go">
             <title>Download And Go</title>
-            
+
             <para>
                 First download Zend Framework.  This can be done by going to framework.zend.com
                 and downloading the latest release.  After you've downloaded the package and placed
@@ -32,23 +32,23 @@
                 of the download, and place these files within the <emphasis>same</emphasis> directory
                 as the location of the php cli binary.
             </para>
-            
 
-                        
+
+
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.installation.pear">
             <title>Installing Via Pear</title>
-            
+
             <para>
                 To install via PEAR, you must use the 3rd party zfcampus.org site to retrieve the
                 latest Zend Framework PEAR package.  These packages are typically built within a day
                 of an official Zend Framework release.  The benefit of installing via the PEAR package
-                manager is that during the install process, the ZF library will end up on the 
+                manager is that during the install process, the ZF library will end up on the
                 include_path, and the zf.php and zf scripts will end up in a place on your system
                 that will allow you to run them without any additional setup.
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 pear discover-channel pear.zfcampus.org
 pear install zfcampus/zf
@@ -59,19 +59,19 @@ pear install zfcampus/zf
                 running the zf command.  Go good way to check to see if it't there is to run
                 zf --help
             </para>
-            
+
         </sect3>
-    
+
         <sect3 id="zend.tool.usage.cli.installation.install-by-hand">
             <title>Installing by Hand</title>
-            
+
             <para>
                 Installing by hand refers to the process of forcing the zf.php and Zend Framework
                 library to work together when they are placed in non-convential places, or at least,
                 in a place that your system cannot dispatch from easily (typical of programs in your
                 system PATH).
             </para>
-            
+
             <para>
                 If you are on a *nix or mac system, you can also create a link from somewhere in your
                 path to the zf.sh file.  If you do this, you do not need to worry about having
@@ -79,38 +79,38 @@ pear install zfcampus/zf
                 be able to access the library relative to where they are (meaning the ./bin/ files
                 are ../library/ relative to the Zend Framework library).
             </para>
-            
+
             <para>
                 There are a number of other options available for setting up the zf.php and library
                 on your system.  These options revolve around setting specific environment variables.
                 These are described in the later section on "customizing the CLI environement".  The
-                environment variables for setting the zf.php include_path, ZF_INCLUDE_PATH and 
+                environment variables for setting the zf.php include_path, ZF_INCLUDE_PATH and
                 ZF_INCLUDE_PATH_PREPEND, are the ones of most interest.
             </para>
-            
+
         </sect3>
 
     </sect2>
-    
+
     <sect2 id="zend.tool.usage.cli.general-purpose-commands">
         <title>General Purpose Commands</title>
 
         <sect3 id="zend.tool.usage.cli.general-purpose-commands.version">
             <title>Version</title>
-            
+
             <para>
-                This will show the current version number of the copy of Zend Framework the zf.php tool is using. 
+                This will show the current version number of the copy of Zend Framework the zf.php tool is using.
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf show version
 ]]></programlisting>
-            
+
         </sect3>
-    
+
         <sect3 id="zend.tool.usage.cli.general-purpose-commands.built-in-help">
             <title>Built-in Help</title>
-            
+
             <para>
                 The built-in help system is the primary place where you can get up-to-date information
                 on what your system is capable of doing.  The help system is dynamic in that as providers
@@ -118,21 +118,21 @@ zf show version
                 required to run them will be in the help screen.  The easiest way to retrieve the help
                 screen is the following:
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf --help
 ]]></programlisting>
-         
+
             <para>
-                This will give you an overview of the various capabilities of the system.  Sometimes, there 
-                are more finite commands than can be run, and to gain more information about these, you might 
-                have to run a more specialized help command.  For specialized help, simply replace any of the 
-                elements of the command with a "?". This will tell the help system that you want more 
+                This will give you an overview of the various capabilities of the system.  Sometimes, there
+                are more finite commands than can be run, and to gain more information about these, you might
+                have to run a more specialized help command.  For specialized help, simply replace any of the
+                elements of the command with a "?". This will tell the help system that you want more
                 information about what commands can go in place of the question mark. For example:
             </para>
-            
+
             <programlisting language="text"><![CDATA[
-zf ? controller            
+zf ? controller
 ]]></programlisting>
 
             <para>
@@ -144,52 +144,52 @@ zf show ?
 ]]></programlisting>
 
             <para>
-                means "show me all providers that support the 'show' action". This works for drilling down 
+                means "show me all providers that support the 'show' action". This works for drilling down
                 into options as well as you can see in the following examples:
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf show version.? (show any specialties)
 zf show version ? (show any options)
 ]]></programlisting>
-            
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.general-purpose-commands.manifest">
             <title>Manifest</title>
- 
+
             <para>
-                This will show what information is in the tooling systems manifest. This is more important 
-                for provider developers than casual users of the tooling system.            
+                This will show what information is in the tooling systems manifest. This is more important
+                for provider developers than casual users of the tooling system.
             </para>
 
             <programlisting language="text"><![CDATA[
 zf show manifest
 ]]></programlisting>
-            
+
         </sect3>
-        
+
         <!--
         <sect3 id="zend.tool.usage.cli.general-purpose-commands.tool-configuration">
             <title>Tool Configuration</title>
-            
+
             <para>Placeholder   need docs from @beberli </para>
-            
+
         </sect3>
         -->
-        
+
     </sect2>
-    
+
     <sect2 id="zend.tool.usage.cli.project-specific-commands">
         <title>Project Specific Commands</title>
-    
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.project">
             <title>Project</title>
-            
+
             <para>
-                The project provider is the first command you might want to run. This will setup the basic 
-                structure of your application. This is required before any of the other providers can 
-                be executed.            
+                The project provider is the first command you might want to run. This will setup the basic
+                structure of your application. This is required before any of the other providers can
+                be executed.
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -200,21 +200,21 @@ zf create project MyProjectName
                 This will create a project in a directory called ./MyProjectName.  From this point on,
                 it is important to note that any subsequent commands on the command line must be issued
                 from within the project directory you had just created.  So, after creation, changing into
-                that directory is required.     
+                that directory is required.
             </para>
- 
-            
+
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.module">
             <title>Project</title>
-            
+
             <para>
                 The module provider allows for the easy creation of a Zend Framework module.  A module
                 follows the hMVC pattern loosely.  When creating modules, it will take the same structure
                 used at the application/ level, and duplicate it inside of the chosen name for your module,
-                inside of the "modules" directory of the application/ directory without duplicating the 
-                modules directory itself.  For example:           
+                inside of the "modules" directory of the application/ directory without duplicating the
+                modules directory itself.  For example:
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -223,12 +223,12 @@ zf create module Blog
 
             <para>
                 This will create a module named Blog at application/modules/Blog, and all of the artifacts
-                that a module will need.            
+                that a module will need.
             </para>
- 
-            
+
+
         </sect3>
-    
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.controller">
             <title>Controller</title>
 
@@ -240,29 +240,29 @@ zf create module Blog
 
             <programlisting language="text"><![CDATA[
 zf create controller Auth
-]]></programlisting>            
+]]></programlisting>
 
             <para>
-				This will create a controller named Auth, specifically it will create a file at 
-				application/controllers/AuthController.php with the AuthController inside.
-				If you wish to create a controller for a module, use any of the following:
+                This will create a controller named Auth, specifically it will create a file at
+                application/controllers/AuthController.php with the AuthController inside.
+                If you wish to create a controller for a module, use any of the following:
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf create controller Post 1 Blog
 zf create controller Post -m Blog
 zf create controller Post --module=Blog
 ]]></programlisting>
-            
+
             <para>
-                Note: In the first command, 1 is the value for the "includeIndexAction" flag. 
+                Note: In the first command, 1 is the value for the "includeIndexAction" flag.
             </para>
-            
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.action">
             <title>Action</title>
-            
+
             <para>
                 To create an action within an existing controller:
             </para>
@@ -272,36 +272,36 @@ zf create action login Auth
 zf create action login -c Auth
 zf create action login --controller-name=Auth
 ]]></programlisting>
-           
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.view">
             <title>View</title>
-            
+
             <para>
-                To create a view outside of the normal controller/action creation, you would use 
+                To create a view outside of the normal controller/action creation, you would use
                 one of the following:
-			</para>
-			
-			<programlisting language="text"><![CDATA[
+            </para>
+
+            <programlisting language="text"><![CDATA[
 zf create view Auth my-script-name
 zf create view -c Auth -a my-script-name
-			]]></programlisting>
+            ]]></programlisting>
 
             <para>
-                This will create a view script in the controller folder of Auth. 
+                This will create a view script in the controller folder of Auth.
             </para>
-            
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.model">
             <title>Model</title>
-            
+
             <para>
-                The model provider is only responsible for creating the proper model files, 
+                The model provider is only responsible for creating the proper model files,
                 with the proper name inside the application folder. For example
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf create model User
 ]]></programlisting>
@@ -309,25 +309,25 @@ zf create model User
             <para>
                 If you wish to create a model within a specific module:
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf create model Post -m Blog
 ]]></programlisting>
-            
+
             <para>
                 The above will create a 'Post' model inside of the 'Blog' module.
             </para>
-            
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.form">
             <title>Form</title>
-            
+
             <para>
                 The form provider is only responsible for creating the proper form file and
                 init() method, with the proper name inside the application folder. For example:
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf create form Auth
 ]]></programlisting>
@@ -335,28 +335,28 @@ zf create form Auth
             <para>
                 If you wish to create a model within a specific module:
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf create form Comment -m Blog
 ]]></programlisting>
-            
+
             <para>
                 The above will create a 'Comment' form inside of the 'Blog' module.
             </para>
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.database-adapter">
             <title>DbAdapter</title>
-            
+
             <para>
                 To configure a DbAdapter, you will need to provide the information as a url
-                encoded string. This string needs to be in quotes on the command line.            
+                encoded string. This string needs to be in quotes on the command line.
             </para>
 
             <para>
-                    
+
                 For example, to enter the following information:
-                
+
                 <itemizedlist>
                     <listitem>
                         <para>adapter: Pdo_Mysql</para>
@@ -375,93 +375,93 @@ zf create form Comment -m Blog
                 The following will have to be run on the command line:
             </para>
 
-    
+
             <programlisting language="text"><![CDATA[
-zf configure dbadapter "adapter=Pdo_Mysql&username=test&password=test&dbname=test"            
+zf configure dbadapter "adapter=Pdo_Mysql&username=test&password=test&dbname=test"
 ]]></programlisting>
 
             <para>
-                This assumes you wish to store this information inside of the 
-                'production' space of the application configuration file. The following will 
-                demonstrate an sqlite configuration, in the 'development' section of the 
+                This assumes you wish to store this information inside of the
+                'production' space of the application configuration file. The following will
+                demonstrate an sqlite configuration, in the 'development' section of the
                 application config file.
             </para>
 
             <programlisting language="text"><![CDATA[
 zf configure dbadapter "adapter=Pdo_Sqlite&dbname=../data/test.db" development
-zf configure dbadapter "adapter=Pdo_Sqlite&dbname=../data/test.db" -s development            
+zf configure dbadapter "adapter=Pdo_Sqlite&dbname=../data/test.db" -s development
 ]]></programlisting>
-            
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.db-table">
             <title>DbTable</title>
-            
+
             <para>
-                The DbTable provider is responsible for creating Zend_Db_Table 
-                model/data access files for your application to consume, with the proper 
-                class name, and in the proper location in the application. The two 
-                important pieces of information are the <emphasis>DbTable name</emphasis>, 
-                and the <emphasis>actual database table name</emphasis>. For example:            
+                The DbTable provider is responsible for creating Zend_Db_Table
+                model/data access files for your application to consume, with the proper
+                class name, and in the proper location in the application. The two
+                important pieces of information are the <emphasis>DbTable name</emphasis>,
+                and the <emphasis>actual database table name</emphasis>. For example:
             </para>
 
             <programlisting language="text"><![CDATA[
 zf create dbtable User user
 zf create dbtable User -a user
- 
+
 // also accepts a force option to overwrite existing files
 zf create dbtable User user -f
 zf create dbtable User user --force-override
 ]]></programlisting>
 
             <para>
-                The DbTable provider is also capable of creating the proper files by 
+                The DbTable provider is also capable of creating the proper files by
                 scanning the database configured with the above DbAdapter provider.
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf create dbtable.from-database
 ]]></programlisting>
-            
+
             <para>
-                When executing the above, it might make sense to use the pretend / "-p" 
-                flag first so that you can see what would be done, and what tables can 
+                When executing the above, it might make sense to use the pretend / "-p"
+                flag first so that you can see what would be done, and what tables can
                 be found in the database.
             </para>
 
             <programlisting language="text"><![CDATA[
 zf -p create dbtable.from-database
 ]]></programlisting>
-            
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.project-specific-commands.layout">
             <title>Layout</title>
-            
+
             <para>
                 Currently, the only supported action for layouts is simply to enable them
                 will setup the proper keys in the application.ini file for the application
                 resource to work, and create the proper directories and layout.phtml file.
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf enable layout
 ]]></programlisting>
-            
+
         </sect3>
-    
+
     </sect2>
-    
+
     <sect2 id="zend.tool.usage.cli.environment-customization">
         <title>Environment Customization</title>
-    
+
         <sect3 id="zend.tool.usage.cli.environment-customization.storage-directory">
             <title>The Storage Directory</title>
-            
+
             <para>
-                The storage directory is important so that providers may have a place to find 
+                The storage directory is important so that providers may have a place to find
                 custom user generated logic that might change the way they behave. One example
-                can be found below is the placement of a custom project profile file.            
+                can be found below is the placement of a custom project profile file.
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -469,31 +469,31 @@ zf --setup storage-directory
 ]]></programlisting>
 
         </sect3>
-    
+
         <sect3 id="zend.tool.usage.cli.environment-customization.configuration-file">
             <title>The Configuration File</title>
-            
+
             <para>
-                This will create the proper zf.ini file. This <emphasis>should</emphasis> 
+                This will create the proper zf.ini file. This <emphasis>should</emphasis>
                 be run after <code>zf --setup storage-directory</code>. If it is not, it will
                 be located inside the users home directory. If it is, it will be located inside
                 the users storage directory.
             </para>
-            
+
             <programlisting language="text"><![CDATA[
 zf --setup config-file
 ]]></programlisting>
-            
+
         </sect3>
-        
+
         <sect3 id="zend.tool.usage.cli.environment-customization.environment-locations">
             <title>Environment Locations</title>
-        
+
             <para>
-                These should be set if you wish to override the default places where zf will 
-                attempt to read their values.            
+                These should be set if you wish to override the default places where zf will
+                attempt to read their values.
             </para>
-            
+
             <itemizedlist>
                 <listitem>
                     <para>ZF_HOME</para>
@@ -561,7 +561,7 @@ zf --setup config-file
             </itemizedlist>
 
         </sect3>
-    
+
     </sect2>
-    
+
 </sect1>

+ 3 - 3
documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml

@@ -66,7 +66,7 @@
             </para>
         </listitem>
 
-		<listitem>
+        <listitem>
             <para>
                 <command>setCharset($charset)</command>
             </para>
@@ -152,8 +152,8 @@ $this->headMeta()->appendHttpEquiv('Content-Type',
 ]]></programlisting>
 
         <para>
-            If you are serving an HTML5 document, you should provide the character 
-			set like this:
+            If you are serving an HTML5 document, you should provide the character
+            set like this:
         </para>
 
         <programlisting language="php"><![CDATA[

+ 2 - 2
documentation/manual/en/tutorials/autoloading-usage.xml

@@ -147,11 +147,11 @@ $loader->setFallbackAutoloader(true);
     </para>
 
     <programlisting language="php"><![CDATA[
-// Append function 'my_autoloader' to the stack, 
+// Append function 'my_autoloader' to the stack,
 // to manage classes with the prefix 'My_':
 $loader->pushAutoloader('my_autoloader', 'My_');
 
-// Prepend static method Foo_Loader::autoload() to the stack, 
+// Prepend static method Foo_Loader::autoload() to the stack,
 // to manage classes with the prefix 'Foo_':
 $loader->unshiftAutoloader(array('Foo_Loader', 'autoload'), 'Foo_');
 ]]></programlisting>

+ 8 - 8
documentation/manual/en/tutorials/form-decorators-composite.xml

@@ -156,8 +156,8 @@ class My_Form_Element_Date extends Zend_Form_Element_Xhtml
                  ->setMonth(date('m', $date))
                  ->setYear(date('Y', $date));
         } elseif (is_array($value)
-                  && (isset($value['day']) 
-                      && isset($value['month']) 
+                  && (isset($value['day'])
+                      && isset($value['month'])
                       && isset($value['year'])
                   )
         ) {
@@ -268,8 +268,8 @@ class My_Form_Element_Date extends Zend_Form_Element_Xhtml
     public function __construct($spec, $options = null)
     {
         $this->addPrefixPath(
-            'My_Form_Decorator', 
-            'My/Form/Decorator', 
+            'My_Form_Decorator',
+            'My/Form/Decorator',
             'decorator'
         );
         parent::__construct($spec, $options);
@@ -309,7 +309,7 @@ class My_Form_Element_Date extends Zend_Form_Element_Xhtml
             $this->addDecorator('Date')
                  ->addDecorator('Errors')
                  ->addDecorator('Description', array(
-                     'tag'   => 'p', 
+                     'tag'   => 'p',
                      'class' => 'description'
                  ))
                  ->addDecorator('HtmlTag', array(
@@ -348,10 +348,10 @@ $d->setValue(array('year' => '2009', 'month' => '04', 'day' => '20'));
     Date of Birth:
 </label></dt>
 <dd id="dateOfBirth-element">
-    <input type="text" name="dateOfBirth[day]" id="dateOfBirth-day" 
-        value="20" size="2" maxlength="2"> / 
+    <input type="text" name="dateOfBirth[day]" id="dateOfBirth-day"
+        value="20" size="2" maxlength="2"> /
     <input type="text" name="dateOfBirth[month]" id="dateOfBirth-month"
-        value="4" size="2" maxlength="2"> / 
+        value="4" size="2" maxlength="2"> /
     <input type="text" name="dateOfBirth[year]" id="dateOfBirth-year"
         value="2009" size="4" maxlength="4">
 </dd>

+ 12 - 12
documentation/manual/en/tutorials/form-decorators-individual.xml

@@ -8,7 +8,7 @@
         looked at how you can combine decorators to create complex output. We noted that while you
         have a ton of flexibility with this approach, it also adds some complexity and overhead. In
         this section, we will examine how to render decorators individually in order to create
-        custom markup for forms and/or individual elements. 
+        custom markup for forms and/or individual elements.
     </para>
 
     <para>
@@ -144,7 +144,7 @@ class My_Form_UserDemographics extends Zend_Form
                 <classname>ViewHelper</classname>: utilize a view helper to render a form input
             </para>
         </listitem>
-        
+
         <listitem>
             <para>
                 <classname>Errors</classname>: utilize the <classname>FormErrors</classname> view
@@ -185,8 +185,8 @@ class My_Form_UserDemographics extends Zend_Form
     </para>
 
     <programlisting language="php"><![CDATA[
-<?php 
-$form = $this->form; 
+<?php
+$form = $this->form;
 // Remove <dt> from label generation
 foreach ($form->getElements() as $element) {
     $element->getDecorator('label')->setOption('tag', null);
@@ -195,11 +195,11 @@ foreach ($form->getElements() as $element) {
 <form method="<?php echo $form->getMethod() ?>" action="<?php echo
     $form->getAction()?>">
     <div class="element">
-        <?php echo $form->title->renderLabel() 
+        <?php echo $form->title->renderLabel()
               . $form->title->renderViewHelper() ?>
-        <?php echo $form->firstName->renderLabel() 
+        <?php echo $form->firstName->renderLabel()
               . $form->firstName->renderViewHelper() ?>
-        <?php echo $form->lastName->renderLabel() 
+        <?php echo $form->lastName->renderLabel()
               . $form->lastName->renderViewHelper() ?>
     </div>
     <div class="element">
@@ -214,11 +214,11 @@ foreach ($form->getElements() as $element) {
             'size' => 4, 'maxlength' => 4)) ?>
     </div>
     <div class="element">
-        <?php echo $form->password->renderLabel() 
+        <?php echo $form->password->renderLabel()
               . $form->password->renderViewHelper() ?>
     </div>
     <div class="element">
-        <?php echo $form->passwordConfirmation->renderLabel() 
+        <?php echo $form->passwordConfirmation->renderLabel()
               . $form->passwordConfirmation->renderViewHelper() ?>
     </div>
     <?php echo $this->formSubmit('submit', 'Save') ?>
@@ -238,7 +238,7 @@ foreach ($form->getElements() as $element) {
 
         <label for="firstName" tag="" class="optional">First name:</label>
         <input type="text" name="firstName" id="firstName" value=""/>
-        
+
         <label for="lastName" tag="" class="optional">Last name:</label>
         <input type="text" name="lastName" id="lastName" value=""/>
     </div>
@@ -246,7 +246,7 @@ foreach ($form->getElements() as $element) {
     <div class="element">
         <label for="dateOfBirth" tag="" class="optional">Date of Birth
             (DD/MM/YYYY):</label>
-        <input type="text" name="dateOfBirth[day]" id="dateOfBirth-day" 
+        <input type="text" name="dateOfBirth[day]" id="dateOfBirth-day"
             value="" size="2" maxlength="2"/>
         /
         <input type="text" name="dateOfBirth[month]" id="dateOfBirth-month"
@@ -262,7 +262,7 @@ foreach ($form->getElements() as $element) {
     </div>
 
     <div class="element">
-        <label for="passwordConfirmation" tag="" class="" id="submit" 
+        <label for="passwordConfirmation" tag="" class="" id="submit"
             value="Save"/>
 </form>
 ]]></programlisting>

+ 1 - 1
documentation/manual/en/tutorials/form-decorators-layering.xml

@@ -11,7 +11,7 @@
         <methodname>render()</methodname> will then take this string and decide to either replace
         it, append to it, or prepend it. This allows you to have a chain of decorators -- which
         allows you to create decorators that render only a subset of the element's metadata, and
-        then layer these decorators to build the full markup for the element. 
+        then layer these decorators to build the full markup for the element.
     </para>
 
     <para>

+ 1 - 1
documentation/manual/en/tutorials/form-decorators-simplest.xml

@@ -121,7 +121,7 @@ class TextPerson
     public function __call($method, $args)
     {
         if (!method_exists($this->_person, $method)) {
-            throw new Exception('Invalid method called on HtmlPerson: ' 
+            throw new Exception('Invalid method called on HtmlPerson: '
                 .  $method);
         }
         return call_user_func_array(array($this->_person, $method), $args);

+ 1 - 1
documentation/manual/en/tutorials/layout-intro.xml

@@ -18,7 +18,7 @@
     <?php else: ?>
     <?php foreach ($this->users as $user): ?>
     <li>
-        <?php echo $this->escape($user->fullname) ?> 
+        <?php echo $this->escape($user->fullname) ?>
         (<?php echo $this->escape($user->email) ?>)
     </li>
     <?php endforeach ?>

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

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

+ 5 - 5
documentation/manual/en/tutorials/lucene-index-structure.xml

@@ -7,7 +7,7 @@
         In order to fully utilize <classname>Zend_Search_Lucene</classname>'s capabilities with
         maximum performance, you need to understand it's internal index structure.
     </para>
-    
+
     <para>
         An <emphasis>index</emphasis> is stored as a set of files within a single directory.
     </para>
@@ -26,7 +26,7 @@
     <para>
         Once an index segment file is created, it can't be updated.  New documents are added to new
         segments.  Deleted documents are only marked as deleted in an optional
-        <filename>&lt;segmentname&gt;.del</filename> file. 
+        <filename>&lt;segmentname&gt;.del</filename> file.
     </para>
 
     <para>
@@ -39,7 +39,7 @@
     </para>
 
     <para>
-        On the other hand, using several segments (one document per segment as a borderline case) 
+        On the other hand, using several segments (one document per segment as a borderline case)
         increases search time:
     </para>
 
@@ -59,8 +59,8 @@
     </itemizedlist>
 
     <para>
-        If the terms dictionary reaches a saturation point, then search through one segment is 
-        <emphasis>N</emphasis> times faster than search through <emphasis>N</emphasis> segments 
+        If the terms dictionary reaches a saturation point, then search through one segment is
+        <emphasis>N</emphasis> times faster than search through <emphasis>N</emphasis> segments
         in most cases.
     </para>
 

+ 1 - 1
documentation/manual/en/tutorials/lucene-indexing.xml

@@ -26,7 +26,7 @@ $doc->addField(Zend_Search_Lucene_Field::unStored('contents', $docBody));
 $doc->addField(Zend_Search_Lucene_Field::binary('avatar', $avatarData));
 ]]></programlisting>
     </example>
-    
+
     <para>
         The second method is to load it from <acronym>HTML</acronym> or Microsoft Office 2007 files:
     </para>

+ 3 - 3
documentation/manual/en/tutorials/lucene-pagination.xml

@@ -8,13 +8,13 @@
         result hit objects use lazy loading for stored document fields. When any stored field is
         accessed, the complete document is loaded.
     </para>
-        
+
     <para>
         Do not retrieve all documents if you actually need to work only with some portion of them.
         Go through the search results and store document IDs (and optionally the score) somewhere to
         retrive documents from the index during the next script execution.
     </para>
-        
+
     <example id="learning.lucene.pagination.example">
         <title>Search result pagination example</title>
 
@@ -38,7 +38,7 @@ if (!$resultSet = $cache->load($cacheId)) {
 $publishedResultSet = array();
 for ($resultId = $startId; $resultId < $endId; $resultId++) {
     $publishedResultSet[$resultId] = array(
-        'id'    => $resultSet[$resultId]['id'], 
+        'id'    => $resultSet[$resultId]['id'],
         'score' => $resultSet[$resultId]['score'],
         'doc'   => $index->getDocument($resultSet[$resultId]['id']),
     );

+ 3 - 3
documentation/manual/en/tutorials/lucene-queries.xml

@@ -8,13 +8,13 @@
         It allows searching for individual terms, phrases, ranges of terms; using wildcards and
         fuzzy search; combining queries using boolean operators; and so on.
     </para>
-        
+
     <para>
         A detailed query language description can be found in the <link
             linkend="zend.search.lucene.query-language">
             Zend_Search_Lucene component documentation</link>.
     </para>
-        
+
     <para>
         What follows are examples of some common query types and strategies.
     </para>
@@ -122,7 +122,7 @@ title:"The Right Way" AND  go
 
     <example id="learning.lucene.queries.fields-and-document-alt">
         <title>Querying against specific fields as well as the entire document (alternate)</title>
-        
+
         <programlisting language="text"><![CDATA[
 title:Do it right
 ]]></programlisting>

+ 5 - 5
documentation/manual/en/tutorials/lucene-searching.xml

@@ -23,7 +23,7 @@ foreach ($hits as $hit) {
         This example demonstrates the usage of two special search hit properties -
         <varname>id</varname> and <varname>score</varname>.
     </para>
-    
+
     <para>
         <varname>id</varname> is an internal document identifier used within a Lucene index. It may
         be used for a variety of operations, including deleting a document from the index:
@@ -59,26 +59,26 @@ $doc = $index->getDocument($id);
             auto-optimization procedure) or <methodname>optimize()</methodname> methods are called.
         </para>
     </note>
-    
+
     <para>
         The <varname>score</varname> field is a hit score. Search results are ordered by score by
         default (best results returned first).
     </para>
-    
+
     <para>
         It's also possible to order result sets by specific field values. See the <link
             linkend="zend.search.lucene.searching.sorting">
             <classname>Zend_Search_Lucene</classname> documentation</link> for more details about
         this possibility.
     </para>
-        
+
     <para>
         The example also demonstrates an ability to access stored fields (e.g.,
         <code>$hit-&gt;title</code>).  At the first access to any hit property other than
         <varname>id</varname> or <varname>score</varname>, document stored fields are loaded, and
         the corresponding field value is returned.
     </para>
-        
+
     <para>
         This causes an ambiguity for documents having their own <varname>id</varname> or
         <varname>score</varname> fields; as a result, it's not recommended to use these field names

+ 37 - 37
documentation/manual/en/tutorials/multiuser-authentication.xml

@@ -5,36 +5,36 @@
 
     <sect2 id="learning.multiuser.authentication.intro">
         <title>Introduction to Authentication</title>
-        
+
         <para>
-            Once a web application has been able to distinguish one user from another by establishing a 
-            session, web applications typically want to validate the identity of a user.  The process 
-            of validating a consumer as being authentic is "authentication."  Authentication is made up 
-            of two distinctive parts: an identity and a set of credentials.  It takes some variation of 
-            both presented to the application for processing so that it may authenticate a user.    
+            Once a web application has been able to distinguish one user from another by establishing a
+            session, web applications typically want to validate the identity of a user.  The process
+            of validating a consumer as being authentic is "authentication."  Authentication is made up
+            of two distinctive parts: an identity and a set of credentials.  It takes some variation of
+            both presented to the application for processing so that it may authenticate a user.
         </para>
-        
+
         <para>
             While the most common pattern of authentication revolves around usernames and passwords,
-            it should be stated that this is not always the case.  Identities are not limited to 
-            usernames.  In fact, any public identifier can be used: an assigned number, social security 
-            number, or residence address.  Likewise, credentials are not limited to passwords.  
-            Credentials can come in the form of protected private information: fingerprint, eye retinal 
-            scan, passphrase, or any other obscure personal information.  
+            it should be stated that this is not always the case.  Identities are not limited to
+            usernames.  In fact, any public identifier can be used: an assigned number, social security
+            number, or residence address.  Likewise, credentials are not limited to passwords.
+            Credentials can come in the form of protected private information: fingerprint, eye retinal
+            scan, passphrase, or any other obscure personal information.
         </para>
-        
+
     </sect2>
 
     <sect2 id="learning.multiuser.authentication.basic-usage">
         <title>Basic Usage of Zend_Auth</title>
-        
+
         <para>
             In the following example, we will be using Zend_Auth to complete what is probably the most
             prolific form of authentication: username and password from a database table.  This
             example assumes that you have already setup your application using Zend_Application, and
             that inside that application you have configured a database connection.
         </para>
-        
+
         <para>
             The job of the Zend_Auth class is twofold.  First, it should be able to accept an
             authentication adapter to use to authenticate a user.  Secondly, after a successful
@@ -43,32 +43,32 @@
             Zend_Auth consumes Zend_Session_Namespace, but you will generally never need to interact
             with this session object.
         </para>
-        
+
         <para>
             Lets assume we have the following database table setup:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 CREATE TABLE users (
-    id INTEGER  NOT NULL PRIMARY KEY, 
-    username VARCHAR(50) UNIQUE NOT NULL, 
-    password VARCHAR(32) NULL, 
+    id INTEGER  NOT NULL PRIMARY KEY,
+    username VARCHAR(50) UNIQUE NOT NULL,
+    password VARCHAR(32) NULL,
     password_salt VARCHAR(32) NULL,
     real_name VARCHAR(150) NULL
 )
 ]]></programlisting>
 
         <para>
-            The above demonstrates a user table that includes a username, password, and also a 
-            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 
-            targeting the algorithm of your password hashing. 
+            The above demonstrates a user table that includes a username, password, and also a
+            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
+            targeting the algorithm of your password hashing.
             <a href="http://en.wikipedia.org/wiki/Salting_%28cryptography%29">More information</a>
             on salting.
         </para>
 
         <para>
-            For this implementation, we must first make a simple form that we can utilized as the 
+            For this implementation, we must first make a simple form that we can utilized as the
             "login form".  We will use Zend_Form to accomplish this.
         </para>
 
@@ -111,7 +111,7 @@ class Default_Form_Auth_Login extends Zend_Form
             method called "loginAction" which will serve as the self-posting action.  In other words,
             regardless of the url was POSTed to or GETed to, this method will handle the logic.
         </para>
-        
+
         <para>
             The following code will demonstrate how to construct the proper adapter, integrate it
             with the form:
@@ -124,11 +124,11 @@ class AuthController extends Zend_Controller_Action
     public function loginAction()
     {
         $db = $this->_getParam('db');
-        
+
         $loginForm = new Default_Form_Auth_Login($_POST);
-        
+
         if ($loginForm->isValid()) {
-        
+
             $adapter = new Zend_Auth_Adapter_DbTable(
                 $db,
                 'users',
@@ -136,18 +136,18 @@ class AuthController extends Zend_Controller_Action
                 'password',
                 'MD5(CONCAT(?, password_salt))'
                 );
-            
+
             $adapter->setIdentity($loginForm->getValue('username'));
             $adapter->setCredential($loginForm->getValue('password'));
-            
+
             $result = $auth->authenticate($adapter);
-            
+
             if ($result->isValid()) {
                 $this->_helper->FlashMessenger('Successful Login');
                 $this->redirect('/');
                 return;
             }
-            
+
         }
 
         $this->view->loginForm = $loginForm;
@@ -164,18 +164,18 @@ class AuthController extends Zend_Controller_Action
         </para>
 
         <programlisting language="php"><![CDATA[
-<?php 
+<?php
 
 $this->form->setAction($this->url());
 echo $this->form;
 ]]></programlisting>
-        
+
         <para>
-            There you have it.  With these basics you can expand the general concepts to include 
+            There you have it.  With these basics you can expand the general concepts to include
             more complex authentication scenarios.  For more information on other Zend_Auth adapters,
             have a look in <link linkend="zend.auth">the reference guide</link>.
         </para>
-        
+
     </sect2>
 
 </sect1>

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

@@ -7,49 +7,49 @@
         <title>Introduction to Authorization</title>
 
         <para>
-            After a user has been identified as being authentic, an application can go about its 
-            business of providing some useful and desirable resources to a consumer.  In many cases, 
-            applications might contain different resource types, with some resources having stricter 
-            rules regarding access.  This process of determining who has access to which resources is 
-            the process of "authorization".  Authorization in its simplest form is the composition of 
+            After a user has been identified as being authentic, an application can go about its
+            business of providing some useful and desirable resources to a consumer.  In many cases,
+            applications might contain different resource types, with some resources having stricter
+            rules regarding access.  This process of determining who has access to which resources is
+            the process of "authorization".  Authorization in its simplest form is the composition of
             these elements:
         </para>
-        
+
         <itemizedlist>
             <listitem>
                 <para>
                     the identity whom wishes to be granted access
                 </para>
             </listitem>
-            
+
             <listitem>
                 <para>
                     the resource the identity is asking permission to consume
                 </para>
             </listitem>
-            
+
             <listitem>
                 <para>
                     and optionally, what the identity is privileged to do with the resource
                 </para>
             </listitem>
         </itemizedlist>
-        
+
         <para>
             In ZF, the Zend_Acl component handles the task of building a tree of roles, resources and
             privileges to manage and query authorization requests against.
         </para>
-        
+
     </sect2>
-    
+
     <sect2 id="learning.multiuser.authorization.basic-usage">
         <title>Basic Usage of Zend_Acl</title>
 
 <!-- explain the interaction with a User object, how -->
-        
+
         <para>
             When using Zend_Acl, any models can serve as roles or resources by simply implementing
-            the proper interface.  To be used in a role capacity, the class must implement the 
+            the proper interface.  To be used in a role capacity, the class must implement the
             Zend_Acl_Role_Interface, which requires only getRoleId().  To be used in a resource
             capacity, a class must implement the Zend_Acl_Resource_Interface which similarly requires
             the class implement the getResourceId() method.
@@ -62,18 +62,18 @@
             to this actual user object.  This value can effectively come from anywhere, a static definition
             or perhaps dynamically from the users database role itself.
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 class Default_Model_User implements Zend_Acl_Role_Interface
 {
     protected $_aclRoleId = null;
-    
+
     public function getRoleId()
     {
         if ($this->_aclRoleId == null) {
             return 'guest';
         }
-        
+
         return $this->_aclRoleId;
     }
 }
@@ -100,14 +100,14 @@ class Default_Model_BlogPost implements Zend_Acl_Resource_Interface
 
         <para>
             Now that we have at least a role and a resource, we can go about defining the rules of the
-            ACL system.  These rules will be consulted when the system receives a query about what is 
+            ACL system.  These rules will be consulted when the system receives a query about what is
             possible given a certain role, resources, and optionally a privilege.
         </para>
-        
+
         <para>
             Lets assume the following rules:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 $acl = new Zend_Acl();
 
@@ -129,28 +129,28 @@ $acl->allow('owner', 'blogPost', 'publish');
             type resource.  Guests are allowed to view blog posts, and owners are allowed to post and publish
             blog posts.  To query this system one might do any of the following:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
-$guestUser = new Default_Model_User(); // assume the user model is of type guest resource 
+$guestUser = new Default_Model_User(); // assume the user model is of type guest resource
 $ownerUser = new Default_Model_Owner('OwnersUsername');
 
 $post = new Default_Model_BlogPost();
-            
+
 $acl->isAllowed($guestUser, $post, 'view'); // true
 $acl->isAllowed($ownerUser, $post, 'view'); // true
 $acl->isAllowed($guestUser, $post, 'post'); // false
 $acl->isAllowed($ownerUser, $post, 'post'); // true
 ]]></programlisting>
-        
+
         <para>
             As you can see, the above rules exercise whether owners and guests can view posts, which
             they can, or post new posts, which owners can and guests cannot.  But as you might expect
             this type of system might not be as dynamic as we wish it to be.  What if we want to ensure
             a specific owner actual owns a very specific blog post before allowing him to publish it?
             In other words, we want to ensure that only post owners have the ability to publish their
-            own posts.  
+            own posts.
         </para>
-        
+
         <para>
             This is where assertions come in.  Assertions are methods that will be called out to
             when the static rule checking is simply not enough.  When registering an assertion object
@@ -173,7 +173,7 @@ class OwnerCanPublishBlogPostAssertion implements Zend_Acl_Assert_Interface
      */
     public function assert(Zend_Acl $acl, Zend_Acl_Role_Interface $user = null, Zend_Acl_Resource_Interface $blogPost = null, $privilege = null)
     {
-    	if (!$user instanceof Default_Model_User) {
+        if (!$user instanceof Default_Model_User) {
             throw new Exception(__CLASS__ . '::' . __METHOD__ . ' expects the role to be an instance of User');
         }
 
@@ -183,24 +183,24 @@ class OwnerCanPublishBlogPostAssertion implements Zend_Acl_Assert_Interface
 
         // if role is publisher, he can always modify a post
         if ($user->getRoleId() == 'publisher') {
-        	return true;
+            return true;
         }
 
         // check to ensure that everyone else is only modifying their own post
         if ($user->id != null && $blogPost->ownerUserId == $user->id) {
-        	return true;
+            return true;
         } else {
-        	return false;
+            return false;
         }
     }
 }
 
 ]]></programlisting>
-        
+
         <para>
             To hook this into our ACL system, we would do the following:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 // replace this:
 //   $acl->allow('owner', 'blogPost', 'publish');
@@ -220,7 +220,7 @@ $acl->allow('publisher', 'blogPost', 'publish');
             the id of the owner passed in.
         </para>
 
-        
+
     </sect2>
-    
+
 </sect1>

+ 10 - 10
documentation/manual/en/tutorials/multiuser-intro.xml

@@ -2,7 +2,7 @@
 <!-- Reviewed: no -->
 <sect1 id="learning.multiuser.intro">
     <title>Building Multi-User Applications With ZF</title>
-    
+
     <sect2 id="learning.multiuser.intro.zf">
         <title>Zend Framework</title>
 
@@ -14,7 +14,7 @@
             experience to many consumers from a single location, it makes it an ideal environment for
             building dynamically driven, multi-user, and more commonly today, social systems.
         </para>
-        
+
         <para>
             HTTP is the protocol of the web: a stateless, typically short lived, request/response
             protocol.  This protocol was designed this way because the original intent of the web was
@@ -33,13 +33,13 @@
                     How do you distinguish one application consumer from another?
                 </para>
             </listitem>
-            
+
             <listitem>
                 <para>
                     How do you identify a consumer as authentic?
                 </para>
             </listitem>
-            
+
             <listitem>
                 <para>
                     How do you control what a consumer has access to?
@@ -49,7 +49,7 @@
 
         <note>
             <title>Consumer Vs. User</title>
-            
+
             <para>
                 Notice we use the term "consumer" instead of person.  Increasingly, web applications
                 are becoming service driven.  This means that not only are real people ("users") with
@@ -58,13 +58,13 @@
                 people, as well as other consuming applications, should all be treated in same with
                 regard to the concerns outlined above.
             </para>
-            
+
         </note>
-        
+
         <para>
-            In the following chapters, we'll take a look at these common problems relating to 
-            authentication and authorization in detail.  We will discover how 3 main components: 
-            Zend_Session, Zend_Auth, and Zend_Acl; provide an out-of-the-box solution as well as the 
+            In the following chapters, we'll take a look at these common problems relating to
+            authentication and authorization in detail.  We will discover how 3 main components:
+            Zend_Session, Zend_Auth, and Zend_Acl; provide an out-of-the-box solution as well as the
             extension points each have that will cater to a more customized solution.
         </para>
     </sect2>

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

@@ -5,61 +5,61 @@
 
     <sect2 id="learning.multiuser.sessions.intro">
         <title>Introduction to Sessions</title>
-        
+
         <para>
             The success of the web is deeply rooted in the protocol that drives the web: HTTP.  HTTP
-            over TCP is by its very nature stateless, which means that inherently the web is also 
+            over TCP is by its very nature stateless, which means that inherently the web is also
             stateless.  While this very aspect is one of the dominating factors for why the web has
             become such a popular medium, it also causes an interesting problem for developers that
             want to use the web as an application platform.
         </para>
-        
+
         <para>
-            The act of interacting with a web application is typically defined by the sum 
-            of all requests sent to a web server.  Since there can be many consumers being served 
-            simultaneously, the application must decide which requests belong to which consumer.  These 
+            The act of interacting with a web application is typically defined by the sum
+            of all requests sent to a web server.  Since there can be many consumers being served
+            simultaneously, the application must decide which requests belong to which consumer.  These
             requests are typically known as a "session".
         </para>
-        
+
         <para>
-            In PHP, the session problem is solved by the session extension which utilizes some state 
-            tracking, typically cookies, and some form of local storage which is exposed via the 
-            $_SESSION superglobal.  In Zend Framework, the component Zend_Session adds value to the php 
-            session extension making it easier to use and depend on inside object-oriented 
+            In PHP, the session problem is solved by the session extension which utilizes some state
+            tracking, typically cookies, and some form of local storage which is exposed via the
+            $_SESSION superglobal.  In Zend Framework, the component Zend_Session adds value to the php
+            session extension making it easier to use and depend on inside object-oriented
             applications.
         </para>
 
     </sect2>
-    
+
     <sect2 id="learning.multiuser.sessions.basic-usage">
         <title>Basic Usage of Zend_Session</title>
-        
+
         <para>
             The Zend_Session component is both a session manager as well as an API for
             storing data into a session object for long-term persistence.  The Zend_Session API is
             for managing the options and behavior of a session, like options, starting and stopping
             a session, whereas Zend_Session_Namespace is the actual object used to store data.
         </para>
-        
+
         <para>
             While its generally good practice to start a session inside a bootstrap process, this
             is generally not necessary as all sessions will be automatically started upon the first
             creation of a Zend_Session_Namespace object.
         </para>
-        
+
         <para>
             Zend_Application is capable of configuring Zend_Session for you as part of the
             Zend_Application_Resource system.  To use this, assuming your project uses
-            Zend_Application to bootstrap, you would add the following code to your 
+            Zend_Application to bootstrap, you would add the following code to your
             application.ini file:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 resources.session.save_path = APPLICATION_PATH "/../data/session"
 resources.session.use_only_cookies = true
 resources.session.remember_me_seconds = 864000
 ]]></programlisting>
-        
+
         <para>
             As you can see, the options passed in are the same options that you'd expect to find
             in the ext/session extension in PHP.  Those options setup the path to the session
@@ -67,13 +67,13 @@ resources.session.remember_me_seconds = 864000
             use constants, the above will use the APPLICATION_PATH constant and relatively point
             to a data session directory.
         </para>
-        
+
         <para>
             Most Zend Framework components that use sessions need nothing more to use Zend_Session.
-            At this point, you an either use a component that consumes Zend_Session, or start 
+            At this point, you an either use a component that consumes Zend_Session, or start
             storing your own data inside a session with Zend_Session_Namespace.
         </para>
-        
+
         <para>
             Zend_Session_Namespace is a simple class that proxies data via an easy to use API
             into the Zend_Session managed $_SESSION superglobal.  The reason it is called
@@ -82,7 +82,7 @@ resources.session.remember_me_seconds = 864000
             following code, we'll explore how to build a simple session incrementing counter, starting
             at 1000 and resetting itself after 1999.
         </para>
-            
+
         <programlisting language="php"><![CDATA[
 $mysession = Zend_Session_Namespace('mysession');
 
@@ -96,7 +96,7 @@ if ($mysession->counter > 1999) {
     unset($mysession->counter);
 }
 ]]></programlisting>
-            
+
         <para>
             As you can see above, the session namespace object uses the magic __get, __set,
             __isset, and __unset to allow you to seemlessly and fluently interact with the session.
@@ -111,7 +111,7 @@ if ($mysession->counter > 1999) {
             Addionally, if you wanted to use the DbTable
             save handler for Zend_Session, you'd add the following code to your application.ini:
         </para>
-        
+
         <programlisting language="php"><![CDATA[
 resources.session.saveHandler.class = "Zend_Session_SaveHandler_DbTable"
 resources.session.saveHandler.options.name = "session"
@@ -125,9 +125,9 @@ resources.session.saveHandler.options.modifiedColumn = "modified"
 resources.session.saveHandler.options.dataColumn = "session_data"
 resources.session.saveHandler.options.lifetimeColumn = "lifetime"
 ]]></programlisting>
-        
-        
+
+
     </sect2>
-        
+
 
 </sect1>

+ 12 - 12
documentation/manual/en/tutorials/paginator-control.xml

@@ -2,24 +2,24 @@
 <!-- Reviewed: no -->
 <sect1 id="learning.paginator.control">
     <title>Pagination Control and ScrollingStyles</title>
-    
+
     <para>
-        Rendering the items for a page on the screen has been a good start. In the code 
+        Rendering the items for a page on the screen has been a good start. In the code
         snippets in previous section we have also seen the <methodname>setCurrentPageNumber()</methodname>
         method to set the active page number. The next step is to navigate through your pages.
         To do this, Paginator provides you with two important tools: the ability to render the Paginator
         with help of a View Partial, and support for so-called ScrollingStyles.
     </para>
-    
+
     <para>
-        The View Partial is a small view script that renders the Pagination controls, such as buttons to go 
+        The View Partial is a small view script that renders the Pagination controls, such as buttons to go
         to the next or previous page. Which pagination controls are rendered depends on the contents of
         the view partial. Working with the view partial requires that you have set up Zend_View.
         To get started with the pagination control, create a new view script somewhere in
         your view scripts path. You can name it anything you want, but we'll call it "controls.phtml" in this text.
         The reference manual contains various examples of what might go in the view script. Here is one example.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 <?php if ($this->pageCount): ?>
 <!-- First page link -->
@@ -61,16 +61,16 @@
 </div>
 <?php endif; ?>
 ]]></programlisting>
-    
+
     <para>
         The next step is to tell Zend_Paginator which view partial can be used to render
         the navigation controls. Put the following line in your application's bootstrap file.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 Zend_View_Helper_PaginationControl::setDefaultViewPartial('controls.phtml');
 ]]></programlisting>
-    
+
     <para>
         The last step is probably the easiest. Make sure you have assigned your Paginator object
         to the a script (NOT the 'controls.phtml' script!). The only thing left to do is echo the Paginator in the view script.
@@ -79,11 +79,11 @@ Zend_View_Helper_PaginationControl::setDefaultViewPartial('controls.phtml');
         Don't worry if you don't fully get how it all works yet. The next section will feature
         a complete example.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 <?php echo $this->paginator; ?>
 ]]></programlisting>
-    
+
     <para>
         <classname>Zend_Paginator</classname>, together with the 'controls.phtml' view script you wrote,
         makes sure your Paginator navigation is rendered properly. In order to decide
@@ -94,12 +94,12 @@ Zend_View_Helper_PaginationControl::setDefaultViewPartial('controls.phtml');
         or you can specify a ScrollingStyle dynamically when rendering the Paginator in your view script. This
         requires manual invocation of the view helper in your view script.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 // $this->paginator is a Paginator object
 <?php echo $this->paginationControl($this->paginator, 'Elastic', 'controls.phtml'); ?>
 ]]></programlisting>
-    
+
     <para>
         For a list of all available ScrollingStyles, see the reference manual.
     </para>

+ 5 - 5
documentation/manual/en/tutorials/paginator-intro.xml

@@ -2,7 +2,7 @@
 <!-- Reviewed: no -->
 <sect1 id="learning.paginator.intro">
     <title>Introduction</title>
-    
+
     <para>
         Let's say you're creating a blogging application that will be home to your vast
         collection of blog posts. There is a good chance that you do not want all of
@@ -14,24 +14,24 @@
         of data in smaller, more manageable sets more easily, with more consistency,
         and with less duplicate code.
     </para>
-    
+
     <para>
         <classname>Zend_Paginator</classname> uses Adapters to support various data sources and ScrollingStyles
         to support various methods of showing the user which pages are available.
         In later sections of this text we will have a closer look at what these things
         are and how they can help you to make the most out of <classname>Zend_Paginator</classname>.
     </para>
-    
+
     <para>
         Before going in-depth, we will have a look at some simple examples first.
         After these simple examples, we will see how <classname>Zend_Paginator</classname> supports the most
         common use-case; paginating database results.
     </para>
-    
+
     <para>
         This introduction has given you a quick overview of <classname>Zend_Paginator</classname>. To get
         started and to have a look at some code snippets, let's have a look at some
         simple examples.
     </para>
-    
+
 </sect1>

+ 13 - 13
documentation/manual/en/tutorials/paginator-simple.xml

@@ -2,7 +2,7 @@
 <!-- Reviewed: no -->
 <sect1 id="learning.paginator.simple">
     <title>Simple Examples</title>
-    
+
     <para>
         In this first example we won't do anything spectacular, but hopefully it will
         give you a good idea of what Zend_Paginator is designed to do.
@@ -11,7 +11,7 @@
         method in the <classname>Zend_Paginator</classname> class to get a <classname>Zend_Paginator</classname>
         object with our array in it.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 // Create an array with numbers 1 to 100
 $data = range(1, 100);
@@ -19,7 +19,7 @@ $data = range(1, 100);
 // Get a Paginator object using Zend_Paginator's built-in factory.
 $paginator = Zend_Paginator::factory($data);
 ]]></programlisting>
-    
+
     <para>
         We're already almost done! The $paginator variable now contains a reference to the
         Paginator object. By default it is setup to display 10 items per page.
@@ -29,7 +29,7 @@ $paginator = Zend_Paginator::factory($data);
         a specific page later on. The snippet below will display an unordered list containing the
         numbers 1 to 10, which are the numbers on the first page.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 // Create an array with numbers 1 to 100
 $data = range(1, 100);
@@ -46,12 +46,12 @@ foreach ($paginator as $item) {
 
 ?></ul>
 ]]></programlisting>
-    
+
     <para>
         Now let's try and render the items on the second page. You can use the
         <methodname>setCurrentPageNumber()</methodname> method to select which page you want to view.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 // Create an array with numbers 1 to 100
 $data = range(1, 100);
@@ -71,12 +71,12 @@ foreach ($paginator as $item) {
 
 ?></ul>
 ]]></programlisting>
-    
+
     <para>
         As expected, this little snippet will render an unordered list with the numbers
         11 to 20 in it.
     </para>
-    
+
     <para>
         These simple examples demonstrate a small portion of what can be achieved with
         <classname>Zend_Paginator</classname>. However, a real application rarely reads its data from a plain
@@ -84,13 +84,13 @@ foreach ($paginator as $item) {
         to paginate the results of a database query. Before reading on, make sure you're familiar with
         the way <classname>Zend_Db_Select</classname> works!
     </para>
-    
+
     <para>
         In the database examples we will look at a table with blog posts called 'posts'.
         The 'posts' table has four columns: id, title, body, date_created.
         Let's dive right in and have a look at a simple example.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 // Create a select query. $db is a Zend_Db_Adapter object, which we assume
 // already exists in your script.
@@ -111,14 +111,14 @@ foreach ($paginator as $item) {
 
 ?></ul>
 ]]></programlisting>
-    
+
     <para>
         As you can see, this example is not that different from the previous one.
-        The only difference is that you pass a <classname>Zend_Db_Select</classname> object to the 
+        The only difference is that you pass a <classname>Zend_Db_Select</classname> object to the
         Paginator's <methodname>factory()</methodname> method, rather than an array.
         For more details on how the database adapter makes sure that your query
         is being executed efficiently, see the Zend_Paginator chapter in the reference manual
         on the DbSelect and DbTableSelect adapters.
     </para>
-    
+
 </sect1>

+ 13 - 13
documentation/manual/en/tutorials/paginator-together.xml

@@ -2,25 +2,25 @@
 <!-- Reviewed: no -->
 <sect1 id="learning.paginator.together">
     <title>Putting it all Together</title>
-    
+
     <para>
         You have seen how to create a Paginator object, how to render the items on the current page, and
         how to render a navigation element to browse through your pages. In this section you will
         see how Paginator fits in with the rest of your MVC application.
     </para>
-    
+
     <para>
         In the following examples we will ignore the best practice implementation of using a Service Layer to keep
         the example simple and easier to understand. Once you get familiar with using Service Layers, it should be easy to see
         how Paginator can fit in with the best practice approach.
     </para>
-    
+
     <para>
         Lets start with the controller. The sample application is simple, and we'll just put everything
         in the IndexController and the IndexAction. Again, this is for demonstration purposes only. A real application
         should not use controllers in this manner.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 class IndexController extends Zend_Controller_Action
 {
@@ -29,30 +29,30 @@ class IndexController extends Zend_Controller_Action
         // Setup pagination control view script. See the pagation control tutorial page
         // for more information about this view script.
         Zend_View_Helper_PaginationControl::setDefaultViewPartial('controls.phtml');
-        
+
         // Fetch an already instantiated database connection from the registry
         $db = Zend_Registry::get('db');
-        
+
         // Create a select object which fetches blog posts, sorted decending by date of creation
         $select = $db->select()->from('posts')->sort('date_created DESC');
-        
+
         // Create a Paginator for the blog posts query
         $paginator = Zend_Paginator::factory($select);
-        
+
         // Read the current page number from the request. Default to 1 if no explicit page number is provided.
         $paginator->setCurrentPageNumber($this->_getParam('page', 1));
-        
+
         // Assign the Paginator object to the view
         $this->view->paginator = $paginator;
     }
 }
 ]]></programlisting>
-    
+
     <para>
         The following view script is the index.phtml view script for the IndexController's indexAction.
         The view script can be kept simple. We're assuming the use of the default ScrollingStyle.
     </para>
-    
+
     <programlisting language="php"><![CDATA[
 <ul>
 <?php
@@ -64,11 +64,11 @@ foreach ($this->paginator as $item) {
 </ul>
 <?php echo $this->paginator; ?>
 ]]></programlisting>
-    
+
     <para>
         Now navigate to your project's index and see Paginator in action. What we have discussed in this
         tutorial is just the tip of the iceberg. The reference manual and API documentation can tell
         you more about what you can do with Zend_Paginator.
     </para>
-    
+
 </sect1>

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

@@ -6,7 +6,7 @@
     <para>
         Understanding the concept of prefix paths and overriding existing plugins will help you with
         your understanding of many components within the framework. Plugins are used in a variety of
-        places: 
+        places:
     </para>
 
     <itemizedlist>

+ 1 - 1
documentation/manual/en/tutorials/plugins-intro.xml

@@ -25,7 +25,7 @@
         <listitem>
             <para>
                 Related plugins will share a common class prefix. For instance, if you have created
-                a number of view helpers, they might all share the class prefix "Foo_View_Helper_". 
+                a number of view helpers, they might all share the class prefix "Foo_View_Helper_".
             </para>
         </listitem>
 

+ 1 - 1
documentation/manual/en/tutorials/plugins-usage.xml

@@ -135,7 +135,7 @@ $element->addValidator('NotEmpty')
         </para>
 
         <programlisting language="php"><![CDATA[
-// Zend_View::addHelperPath() utilizes the PluginLoader; however, it inverts 
+// Zend_View::addHelperPath() utilizes the PluginLoader; however, it inverts
 // the arguments, as it provides a default value of "Zend_View_Helper" for the
 // plugin prefix.
 //

+ 4 - 4
documentation/manual/en/tutorials/quickstart-create-form.xml

@@ -48,8 +48,8 @@ class Default_Form_Guestbook extends Zend_Form
             'label'      => 'Please enter the 5 letters displayed below:',
             'required'   => true,
             'captcha'    => array(
-                'captcha' => 'Figlet', 
-                'wordLen' => 5, 
+                'captcha' => 'Figlet',
+                'wordLen' => 5,
                 'timeout' => 300
             )
         ));
@@ -118,7 +118,7 @@ class GuestbookController extends Zend_Controller_Action
                 return $this->_helper->redirector('index');
             }
         }
-        
+
         $this->view->form = $form;
     }
 }
@@ -133,7 +133,7 @@ class GuestbookController extends Zend_Controller_Action
 
 Please use the form below to sign our guestbook!
 
-<?php 
+<?php
 $this->form->setAction($this->url());
 echo $this->form;
 ]]></programlisting>

+ 6 - 6
documentation/manual/en/tutorials/quickstart-create-layout.xml

@@ -164,12 +164,12 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 // application/layouts/scripts/layout.phtml
 
 echo $this->doctype() ?>
-<html xmlns="http://www.w3.org/1999/xhtml"> 
-<head>  
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Zend Framework Quickstart Application</title>
   <?php echo $this->headLink()->appendStylesheet('/css/global.css') ?>
-</head> 
+</head>
 <body>
 <div id="header" style="background-color: #EEEEEE; height: 30px;">
     <div id="header-logo" style="float: left">
@@ -177,8 +177,8 @@ echo $this->doctype() ?>
     </div>
     <div id="header-navigation" style="float: right">
         <a href="<?php echo $this->url(
-            array('controller'=>'guestbook'), 
-            'default', 
+            array('controller'=>'guestbook'),
+            'default',
             true) ?>">Guestbook</a>
     </div>
 </div>

+ 17 - 17
documentation/manual/en/tutorials/quickstart-create-model.xml

@@ -148,7 +148,7 @@ resources.db.params.dbname = APPLICATION_PATH "/../data/db/guestbook-testing.db"
 [development : production]
 resources.db.params.dbname = APPLICATION_PATH "/../data/db/guestbook-dev.db"
 ]]></programlisting>
-    
+
     <para>
         Your final configuration file should look like the following:
     </para>
@@ -163,7 +163,7 @@ bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
 bootstrap.class = "Bootstrap"
 resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
 resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts"
-resources.view[] = 
+resources.view[] =
 resources.db.adapter = "PDO_SQLITE"
 resources.db.params.dbname = APPLICATION_PATH "/../data/db/guestbook.db"
 
@@ -226,13 +226,13 @@ CREATE INDEX "id" ON "guestbook" ("id");
 --
 -- You can begin populating the database with the following SQL statements.
 
-INSERT INTO guestbook (email, comment, created) VALUES 
-    ('ralph.schindler@zend.com', 
-    'Hello! Hope you enjoy this sample zf application!', 
+INSERT INTO guestbook (email, comment, created) VALUES
+    ('ralph.schindler@zend.com',
+    'Hello! Hope you enjoy this sample zf application!',
     DATETIME('NOW'));
-INSERT INTO guestbook (email, comment, created) VALUES 
-    ('foo@bar.com', 
-    'Baz baz baz, baz baz Baz baz baz - baz baz baz.', 
+INSERT INTO guestbook (email, comment, created) VALUES
+    ('foo@bar.com',
+    'Baz baz baz, baz baz Baz baz baz - baz baz baz.',
     DATETIME('NOW'));
 ]]></programlisting>
 
@@ -298,7 +298,7 @@ $bootstrap = $application->getBootstrap();
 $bootstrap->bootstrap('db');
 $dbAdapter = $bootstrap->getResource('db');
 
-// let the user know whats going on (we are actually creating a 
+// let the user know whats going on (we are actually creating a
 // database here)
 if ('testing' != APPLICATION_ENV) {
     echo 'Writing Database Guestbook in (control-c to cancel): ' . PHP_EOL;
@@ -314,7 +314,7 @@ if (file_exists($dbFile)) {
     unlink($dbFile);
 }
 
-// this block executes the actual statements that were loaded from 
+// this block executes the actual statements that were loaded from
 // the schema file.
 try {
     $schemaSql = file_get_contents(dirname(__FILE__) . '/schema.sqlite.sql');
@@ -327,7 +327,7 @@ try {
         echo 'Database Created';
         echo PHP_EOL;
     }
-    
+
     if ($withData) {
         $dataSql = file_get_contents(dirname(__FILE__) . '/data.sqlite.sql');
         // use the connection directly to load sql in batches
@@ -337,7 +337,7 @@ try {
             echo PHP_EOL;
         }
     }
-    
+
 } catch (Exception $e) {
     echo 'AN ERROR HAS OCCURED:' . PHP_EOL;
     echo $e->getMessage() . PHP_EOL;
@@ -362,7 +362,7 @@ return true;
 
     <programlisting language="text"><![CDATA[
 path/to/ZendFrameworkQuickstart/scripts$ php load.sqlite.php --withdata
-Writing Database Guestbook in (control-c to cancel): 
+Writing Database Guestbook in (control-c to cancel):
 1
 Database Created
 Data Loaded.
@@ -681,7 +681,7 @@ C:> zf.bat create controller guestbook
     <programlisting language="php"><![CDATA[
 // application/controllers/GuestbookController.php
 
-class GuestbookController extends Zend_Controller_Action 
+class GuestbookController extends Zend_Controller_Action
 {
     public function indexAction()
     {
@@ -703,8 +703,8 @@ class GuestbookController extends Zend_Controller_Action
     array(
         'controller' => 'guestbook',
         'action'     => 'sign'
-    ), 
-    'default', 
+    ),
+    'default',
     true) ?>">Sign Our Guestbook</a></p>
 
 Guestbook Entries: <br />
@@ -745,7 +745,7 @@ Guestbook Entries: <br />
         <programlisting language="php"><![CDATA[
 Usage: load.sqlite.php [ options ]
 --withdata|-w         Load database with sample data
---env|-e [  ]         Application environment for which to create database 
+--env|-e [  ]         Application environment for which to create database
                       (defaults to development)
 --help|-h             Help -- usage message)]]
 ]]></programlisting>

+ 36 - 36
documentation/manual/en/tutorials/quickstart-create-project.xml

@@ -17,7 +17,7 @@
             as a universal installation package compatible with most Linux distributions.
         </para>
 
-        <para> 
+        <para>
             After you have installed Zend Server, the Framework files may be found
             under <filename>/Applications/ZendServer/share/ZendFramework</filename> on Mac
             OSX, <filename>C:\Program Files\Zend\ZendServer\share\ZendFramework</filename> on
@@ -271,22 +271,22 @@ class ErrorController extends Zend_Controller_Action
     public function errorAction()
     {
         $errors = $this->_getParam('error_handler');
-        
-        switch ($errors->type) { 
+
+        switch ($errors->type) {
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION:
-        
+
                 // 404 error -- controller or action not found
                 $this->getResponse()->setHttpResponseCode(404);
                 $this->view->message = 'Page not found';
                 break;
             default:
-                // application error 
+                // application error
                 $this->getResponse()->setHttpResponseCode(500);
                 $this->view->message = 'Application error';
                 break;
         }
-        
+
         $this->view->exception = $errors->exception;
         $this->view->request   = $errors->request;
     }
@@ -328,7 +328,7 @@ class ErrorController extends Zend_Controller_Action
         <programlisting language="php"><![CDATA[
 <!-- application/views/scripts/index/index.phtml -->
 <style>
-    
+
     a:link,
     a:visited
     {
@@ -350,7 +350,7 @@ class ErrorController extends Zend_Controller_Action
         overflow: hidden;
         text-align: center;
     }
-    
+
     div#more-information
     {
         background-image: url(http://framework.zend.com/images/bkg_body-bottom.gif);
@@ -369,7 +369,7 @@ class ErrorController extends Zend_Controller_Action
         <p>
             Helpful Links: <br />
             <a href="http://framework.zend.com/">Zend Framework Website</a> |
-            <a href="http://framework.zend.com/manual/en/">Zend Framework 
+            <a href="http://framework.zend.com/manual/en/">Zend Framework
                 Manual</a>
         </p>
     </div>
@@ -383,34 +383,34 @@ class ErrorController extends Zend_Controller_Action
 
         <programlisting language="php"><![CDATA[
 <!-- application/views/scripts/error/error.phtml -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"; 
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd> 
-<html xmlns="http://www.w3.org/1999/xhtml"> 
-<head>  
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
-  <title>Zend Framework Default Application</title> 
-</head> 
-<body> 
-  <h1>An error occurred</h1> 
-  <h2><?php echo $this->message ?></h2> 
-
-  <?php if ('development' == $this->env): ?> 
-  
-  <h3>Exception information:</h3> 
-  <p> 
-      <b>Message:</b> <?php echo $this->exception->getMessage() ?> 
-  </p> 
-
-  <h3>Stack trace:</h3> 
-  <pre><?php echo $this->exception->getTraceAsString() ?> 
-  </pre> 
-
-  <h3>Request Parameters:</h3> 
-  <pre><?php echo var_export($this->request->getParams(), 1) ?> 
-  </pre> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN";
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>Zend Framework Default Application</title>
+</head>
+<body>
+  <h1>An error occurred</h1>
+  <h2><?php echo $this->message ?></h2>
+
+  <?php if ('development' == $this->env): ?>
+
+  <h3>Exception information:</h3>
+  <p>
+      <b>Message:</b> <?php echo $this->exception->getMessage() ?>
+  </p>
+
+  <h3>Stack trace:</h3>
+  <pre><?php echo $this->exception->getTraceAsString() ?>
+  </pre>
+
+  <h3>Request Parameters:</h3>
+  <pre><?php echo var_export($this->request->getParams(), 1) ?>
+  </pre>
   <?php endif ?>
-  
-</body> 
+
+</body>
 </html>
 ]]></programlisting>
     </sect2>

+ 2 - 2
documentation/manual/en/tutorials/view-placeholders-basics.xml

@@ -91,7 +91,7 @@
             <li><a href="/some/target">Link</a></li>
         </ul>
     </div>
-</div>        
+</div>
 ]]></programlisting>
 
     <para>
@@ -242,7 +242,7 @@ $this->placeholder('sidebar')
     <div class="block">
         <p>User: matthew</p>
     </div>
-</div>        
+</div>
 ]]></programlisting>
 
     <para>

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

@@ -141,7 +141,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 ]]></programlisting>
 
         <para>
-            This will ensure that your DocType-aware view helpers render the appropriate markup, 
+            This will ensure that your DocType-aware view helpers render the appropriate markup,
             ensure that the type is set well before the layout is rendered, and provide a single
             location to change the DocType.
         </para>
@@ -210,7 +210,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         <programlisting language="php"><![CDATA[
 <?php echo $this->doctype() ?>
 <html>
-    <?php echo $this->headTitle() ?> 
+    <?php echo $this->headTitle() ?>
     <!-- ... -->
 ]]></programlisting>
 
@@ -296,8 +296,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         <programlisting language="php"><![CDATA[
 <?php echo $this->doctype() ?>
 <html>
-    <?php echo $this->headTitle() ?> 
-    <?php echo $this->headLink() ?> 
+    <?php echo $this->headTitle() ?>
+    <?php echo $this->headLink() ?>
     <!-- ... -->
 ]]></programlisting>
 
@@ -397,9 +397,9 @@ site = {
         <programlisting language="php"><![CDATA[
 <?php echo $this->doctype() ?>
 <html>
-    <?php echo $this->headTitle() ?> 
-    <?php echo $this->headLink() ?> 
-    <?php echo $this->headScript() ?> 
+    <?php echo $this->headTitle() ?>
+    <?php echo $this->headLink() ?>
+    <?php echo $this->headScript() ?>
     <!-- ... -->
 ]]></programlisting>
 

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません