[DOCUMENTATION] English:

 - remove empty lines
 - erase <?php in programlisting

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

documentation/manual/en/module_specs/Zend_Db_Select.xml

@@ -440,7 +440,8 @@ $select = $db->select()
 $select = $db->select()
              ->from(array('p' => 'products'), 'p.product_id')
              ->columns('product_name', 'p');
-             // Alternatively use columns('p.product_name')]]></programlisting>
+             // Alternatively use columns('p.product_name')
+]]></programlisting>
 
             </example>
 

documentation/manual/en/module_specs/Zend_Db_Table.xml

@@ -1322,7 +1322,7 @@ echo "The table name is " . $info['name'] . "\n";
                 all table objects:
             </para>
 
-            <programlisting role="php"><![CDATA[<
+            <programlisting role="php"><![CDATA[
 // First, set up the Cache
 $frontendOptions = array(
     'automatic_serialization' => true

documentation/manual/en/module_specs/Zend_Debug.xml

@@ -14,7 +14,6 @@
     <example id="zend.debug.dumping.example">
         <title>Example of dump() method</title>
         <programlisting role="php"><![CDATA[
-
 Zend_Debug::dump($var, $label=null, $echo=true);
 ]]></programlisting>
     </example>

documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml

@@ -640,7 +640,8 @@ $form->addElement('editor', 'content', array(
     'height'             => '250px',
     'inheritWidth'       => true,
     'styleSheets'        => array('/js/custom/editor.css'),
-));]]></programlisting>
+));
+]]></programlisting>
         </example>
     </sect3>
 

documentation/manual/en/module_specs/Zend_Form-Elements.xml

@@ -207,7 +207,6 @@ $form->addElementPrefixPath('My_Decorator', 'My/Decorator/', 'decorator');
 
         <programlisting role="php"><![CDATA[
 $filtered = $element->getValue();
-
 ]]></programlisting>
 
         <para>

documentation/manual/en/module_specs/Zend_Gdata_Calendar.xml

@@ -120,7 +120,6 @@ $service = new Zend_Gdata_Calendar($client);
                 lengthy fashion:
             </para>
             <programlisting role="php"><![CDATA[
-
 /*
  * Retrieve the current URL so that the AuthSub server knows where to
  * redirect the user after authentication is complete.

documentation/manual/en/module_specs/Zend_Gdata_Gbase.xml

@@ -92,7 +92,6 @@ $service = new Zend_Gdata_Gbase($client);
 ]]></programlisting>
 <para>A Base service using AuthSub can be created in a similar, though slightly more lengthy fashion:</para>
 <programlisting role="php"><![CDATA[
-
 /*
  * Retrieve the current URL so that the AuthSub server knows where to
  * redirect the user after authentication is complete.

documentation/manual/en/module_specs/Zend_Layout-Options.xml

@@ -146,7 +146,6 @@ $layout = Zend_Layout::startMvc($options);
             </para>
 
             <programlisting role="php"><![CDATA[
-
 $config = new Zend_Config_Ini('/path/to/layout.ini', 'layout');
 
 // Using constructor:

documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml

@@ -457,7 +457,6 @@ $pdfPage->setFont($font, 36)
         <example id="zend.pdf.drawing.extracting-fonts.example-1">
             <title>Extracting fonts from a loaded document.</title>
             <programlisting role="php"><![CDATA[
-
 ...
 $pdf = Zend_Pdf::load($documentPath);
 ...
@@ -486,7 +485,6 @@ $firstPageFonts = $firstPage->extractFonts();
         <example id="zend.pdf.drawing.extracting-fonts.example-2">
             <title>Extracting font from a loaded document by specifying font name.</title>
             <programlisting role="php"><![CDATA[
-
 ...
 $pdf = new Zend_Pdf();
 ...
@@ -505,7 +503,6 @@ $pdf->save($docPath);
 ...
 ]]></programlisting>
             <programlisting role="php"><![CDATA[
-
 ...
 $pdf = Zend_Pdf::load($docPath);
 ...
@@ -531,7 +528,6 @@ $pdf->save($docPath, true /* incremental update mode */);
                         Possibly embedded font program is actually not extracted. So extracted font can't provide
                         correct font metrics and original font has to be used for text width calculations:
             <programlisting role="php"><![CDATA[
-
 ...
 $font = $pdf->extractFont($fontName);
 $originalFont = Zend_Pdf_Font::fontWithPath($fontPath);
@@ -1048,7 +1044,6 @@ public function getFontSize();
         <para>
         Transparency may be set using <classname>Zend_Pdf_Page::setAlpha()</classname> method:
         <programlisting role="php"><![CDATA[
-
 /**
  * Set the transparency
  *

documentation/manual/en/module_specs/Zend_Reflection-Examples.xml

@@ -26,7 +26,6 @@ echo "     It has " . count($functions) . ":\n";
 foreach ($functions as $function) {
     echo "         " . $function->getName() . "\n";
 }
-
 ]]></programlisting>
     </example>
 

documentation/manual/en/module_specs/Zend_Search_Lucene-Charset.xml

@@ -100,7 +100,6 @@ Zend_Search_Lucene_Analysis_Analyzer::setDefault(
              Use the following code to check, if PCRE UTF-8 support is enabled:
 
             <programlisting role="php"><![CDATA[
-
 if (@preg_match('/\pL/u', 'a') == 1) {
     echo "PCRE unicode support is turned on.\n";
 } else {
@@ -118,7 +117,6 @@ if (@preg_match('/\pL/u', 'a') == 1) {
             and query string before searching by converting them to lowercase:
 
             <programlisting role="php"><![CDATA[
-
 // Indexing
 setlocale(LC_CTYPE, 'de_DE.iso-8859-1');
 

documentation/manual/en/module_specs/Zend_Search_Lucene-Queries.xml

@@ -181,7 +181,6 @@ $hits  = $index->find($query);
         <para>
             It's also possible to specify terms list within MultiTerm query constructor:
             <programlisting role="php"><![CDATA[
-
 $terms = array(new Zend_Search_Lucene_Index_Term('word1'),
                new Zend_Search_Lucene_Index_Term('word2', 'author'),
                new Zend_Search_Lucene_Index_Term('word3'));
@@ -289,7 +288,6 @@ $hits  = $index->find($query);
         Query construction by API:
         </para>
         <programlisting role="php"><![CDATA[
-
 $query = new Zend_Search_Lucene_Search_Query_Boolean();
 
 $subquery1 = new Zend_Search_Lucene_Search_Query_MultiTerm();
@@ -314,7 +312,6 @@ $hits  = $index->find($query);
         <para>
             It's also possible to specify subqueries list within Boolean query constructor:
             <programlisting role="php"><![CDATA[
-
 ...
 $subqueries = array($subquery1, $subquery2, $subquery3);
 $signs = array(true, null, false);
@@ -419,7 +416,6 @@ field1:test~
         <para>
             Query construction by API:
             <programlisting role="php"><![CDATA[
-
 $term = new Zend_Search_Lucene_Index_Term('test', 'field1');
 $query = new Zend_Search_Lucene_Search_Query_Fuzzy($term);
 $hits  = $index->find($query);
@@ -442,7 +438,6 @@ field1:test~0.4
         <para>
             Query construction by API:
             <programlisting role="php"><![CDATA[
-
 $term = new Zend_Search_Lucene_Index_Term('test', 'field1');
 $query = new Zend_Search_Lucene_Search_Query_Fuzzy($term, 0.4);
 $hits  = $index->find($query);
@@ -452,7 +447,6 @@ $hits  = $index->find($query);
         <para>
             The term field is optional. <classname>Zend_Search_Lucene</classname> searches through all fields on each document if a field is not specified:
             <programlisting role="php"><![CDATA[
-
 $term = new Zend_Search_Lucene_Index_Term('test');
 $query = new Zend_Search_Lucene_Search_Query_Fuzzy($term);
 $hits  = $index->find($query);

documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Elasticip.xml

@@ -97,7 +97,6 @@ $ec2_eip->release('ipaddress');
         <programlisting role="php"><![CDATA[
 $ec2_eip = new Zend_Service_Amazon_Ec2_Elasticip('aws_key','aws_secret_key');
 $ec2_eip->associate('instance_id', 'ipaddress');
-
 ]]></programlisting>
     </example>
 

documentation/manual/en/module_specs/Zend_Service_Amazon_S3.xml

@@ -101,7 +101,7 @@
 
         <example id="zend.service.amazon.s3.storing-your-first.example">
             <title>Zend_Service_Amazon_S3 Usage Example</title>
-             <programlisting role="php"><![CDATA[<?php
+             <programlisting role="php"><![CDATA[
 require_once 'Zend/Service/Amazon/S3.php';
 
 $s3 = new Zend_Service_Amazon_S3($my_aws_key, $my_aws_secret_key);
@@ -121,7 +121,7 @@ echo $s3->getObject("my-own-bucket/myobject");
             If you only use one account, you can set default credentials for the service:
         </para>
 
-        <programlisting role="php"><![CDATA[<?php
+        <programlisting role="php"><![CDATA[
 require_once 'Zend/Service/Amazon/S3.php';
 
 Zend_Service_Amazon_S3::setKeys($my_aws_key, $my_aws_secret_key);
@@ -162,7 +162,7 @@ $s3 = new Zend_Service_Amazon_S3();
                 </para>
         <example id="zend.service.amazon.s3.buckets.remove.example">
             <title>Zend_Service_Amazon_S3 Bucket Removal Example</title>
-             <programlisting role="php"><![CDATA[<?php
+             <programlisting role="php"><![CDATA[
 require_once 'Zend/Service/Amazon/S3.php';
 
 $s3 = new Zend_Service_Amazon_S3($my_aws_key, $my_aws_secret_key);
@@ -179,7 +179,7 @@ $s3->removeBucket("my-own-bucket");
                 </para>
         <example id="zend.service.amazon.s3.buckets.list.example">
             <title>Zend_Service_Amazon_S3 Bucket Listing Example</title>
-             <programlisting role="php"><![CDATA[<?php
+             <programlisting role="php"><![CDATA[
 require_once 'Zend/Service/Amazon/S3.php';
 
 $s3 = new Zend_Service_Amazon_S3($my_aws_key, $my_aws_secret_key);
@@ -276,7 +276,7 @@ foreach($list as $bucket) {
                     </para>
         <example id="zend.service.amazon.s3.objects.public.example">
             <title>Zend_Service_Amazon_S3 Public Object Example</title>
-             <programlisting role="php"><![CDATA[<?php
+             <programlisting role="php"><![CDATA[
 require_once 'Zend/Service/Amazon/S3.php';
 
 $s3 = new Zend_Service_Amazon_S3($my_aws_key, $my_aws_secret_key);
@@ -341,7 +341,7 @@ echo "Go to http://s3.amazonaws.com/my-own-bucket/Pictures/Me.png to see me!\n";
                 </para>
         <example id="zend.service.amazon.s3.objects.list.example">
             <title>Zend_Service_Amazon_S3 Object Listing Example</title>
-             <programlisting role="php"><![CDATA[<?php
+             <programlisting role="php"><![CDATA[
 require_once 'Zend/Service/Amazon/S3.php';
 
 $s3 = new Zend_Service_Amazon_S3($my_aws_key, $my_aws_secret_key);
@@ -380,7 +380,7 @@ foreach($list as $name) {
         </para>
         <example id="zend.service.amazon.s3.streams.example">
             <title>Zend_Service_Amazon_S3 Streams Example</title>
-             <programlisting role="php"><![CDATA[<?php
+             <programlisting role="php"><![CDATA[
 require_once 'Zend/Service/Amazon/S3.php';
 
 $s3 = new Zend_Service_Amazon_S3($my_aws_key, $my_aws_secret_key);

documentation/manual/en/module_specs/Zend_Soap_AutoDiscovery.xml

@@ -119,7 +119,8 @@ if(isset($_GET['wsdl'])) {
     $soap = new Zend_Soap_Server("http://example.com/soap.php?wsdl");
     $soap->setClass('HelloWorldService');
     $soap->handle();
-}]]></programlisting>
+}
+]]></programlisting>
             </para>
         </note>
     </sect2>

documentation/manual/en/module_specs/Zend_Validate-Sitemap.xml

@@ -51,7 +51,8 @@ $validator->isValid('1999-11-11t22:23:52-02:00'); // false
 $validator->isValid('2008-05-12T00:42:60+02:00'); // false
 $validator->isValid('1999-13-11'); // false
 $validator->isValid('2008-05-32'); // false
-$validator->isValid('yesterday'); // false]]></programlisting>
+$validator->isValid('yesterday'); // false
+]]></programlisting>
         </example>
     </sect3>
 

documentation/manual/en/module_specs/Zend_View-Helpers-Partial.xml

@@ -36,7 +36,6 @@
         </para>
 
         <programlisting role="php"><![CDATA[
-
 <?php // partial.phtml ?>
 <ul>
     <li>From: <?php echo $this->escape($this->from) ?></li>
@@ -49,7 +48,6 @@
         </para>
 
         <programlisting role="php"><![CDATA[
-
 <?php echo $this->partial('partial.phtml', array(
     'from' => 'Team Framework',
     'subject' => 'view partials')); ?>