[DOCUMENTATION] English: programlisting's attribute 'role' exchange with attribute 'language'

(used by java xslt processor with XSL param highlight.source http://docbook.xml-doc.org/snapshots/xsl/doc/html/highlight.source.html)

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

documentation/manual/en/module_specs/Zend_Acl-Advanced.xml

@@ -49,7 +49,7 @@
             <methodname>assert()</methodname> method of the interface:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class CleanIPAssertion implements Zend_Acl_Assert_Interface
 {
     public function assert(Zend_Acl $acl,
@@ -73,7 +73,7 @@ class CleanIPAssertion implements Zend_Acl_Assert_Interface
             assertion only applies when the assertion method returns <constant>TRUE</constant>.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $acl = new Zend_Acl();
 $acl->allow(null, null, null, new CleanIPAssertion());
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Acl-Refining.xml

@@ -38,7 +38,7 @@
             in such a way that it inherits permissions from 'staff':
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // The new marketing group inherits permissions from staff
 $acl->addRole(new Zend_Acl_Role('marketing'), 'staff');
 ]]></programlisting>
@@ -48,7 +48,7 @@ $acl->addRole(new Zend_Acl_Role('marketing'), 'staff');
             "newsletter", "latest news", "announcement news"). Now we add these resources:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Create Resources for the rules
 
 // newsletter
@@ -69,7 +69,7 @@ $acl->add(new Zend_Acl_Resource('announcement'), 'news');
             the ACL:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Marketing must be able to publish and archive newsletters and the
 // latest news
 $acl->allow('marketing',
@@ -89,7 +89,7 @@ $acl->deny(null, 'announcement', 'archive');
             We can now query the ACL with respect to the latest changes:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 echo $acl->isAllowed('staff', 'newsletter', 'publish') ?
      "allowed" : "denied";
 // denied
@@ -137,7 +137,7 @@ echo $acl->isAllowed('administrator', 'announcement', 'archive') ?
             resources, and/or privileges:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Remove the denial of revising latest news to staff (and marketing,
 // by inheritance)
 $acl->removeDeny('staff', 'latest', 'revise');
@@ -166,7 +166,7 @@ echo $acl->isAllowed('marketing', 'newsletter', 'archive') ?
             <constant>NULL</constant> value for the privileges overrides such incremental changes:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Allow marketing all permissions upon the latest news
 $acl->allow('marketing', 'latest');
 

documentation/manual/en/module_specs/Zend_Acl.xml

@@ -106,7 +106,7 @@
                 the queried role inherits (herein, "guest", "member", and
                 "admin"):
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $acl = new Zend_Acl();
 
 $acl->addRole(new Zend_Acl_Role('guest'))
@@ -163,7 +163,7 @@ echo $acl->isAllowed('someUser', 'someResource') ? 'allowed' : 'denied';
             of areas. To create a new ACL object, we instantiate the ACL with no parameters:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $acl = new Zend_Acl();
 ]]></programlisting>
 
@@ -232,7 +232,7 @@ $acl = new Zend_Acl();
             can be added to the role registry as follows:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $acl = new Zend_Acl();
 
 // Add groups to the Role registry using Zend_Acl_Role
@@ -282,7 +282,7 @@ $acl->addRole(new Zend_Acl_Role('administrator'));
             code. To apply the base permissions as defined above:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $acl = new Zend_Acl();
 
 $roleGuest = new Zend_Acl_Role('guest');
@@ -327,7 +327,7 @@ $acl->allow('administrator');
             quite simple using the <methodname>isAllowed()</methodname> method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 echo $acl->isAllowed('guest', null, 'view') ?
      "allowed" : "denied";
 // allowed

documentation/manual/en/module_specs/Zend_Amf-Server.xml

@@ -19,7 +19,7 @@
             following code:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $server = new Zend_Amf_Server();
 $server->setClass('Foo');
 $response = $server->handle();
@@ -31,7 +31,7 @@ echo $response;
             callback instead:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $server = new Zend_Amf_Server();
 $server->addFunction('myUberCoolFunction');
 $response = $server->handle();
@@ -46,7 +46,7 @@ echo $response;
             <code>setClass()</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $server = new Zend_Amf_Server();
 $server->addFunction('myUberCoolFunction', 'my')
        ->setClass('Foo', 'foo')
@@ -63,7 +63,7 @@ echo $response;
             Adding directories is completed with the <code>addDirectory()</code> method.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $server->addDirectory(dirname(__FILE__) .'/../services/');
 $server->addDirectory(dirname(__FILE__) .'/../package/');
 ]]></programlisting>
@@ -94,7 +94,7 @@ $server->addDirectory(dirname(__FILE__) .'/../package/');
             the return value. As examples:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Function to attach:
 
 /**
@@ -108,7 +108,7 @@ function helloWorld($name, $greeting = 'Hello')
 }
 ]]></programlisting>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Attached class
 
 class World
@@ -176,7 +176,7 @@ class World
             match that of your testing server. Make sure you save the file.
         </para>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <services-config>
     <services>
@@ -209,7 +209,7 @@ class World
             URL to our <classname>Zend_Amf_Server</classname>:
         </para>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <channel-definition id="zend-endpoint"
     <endpoint uri="http://example.com/server.php"
         class="flex.messaging.endpoints.AMFEndpoint"/>
@@ -227,7 +227,7 @@ class World
             service. In MXML, this might be done as follows:
         </para>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <mx:RemoteObject id="myservice"
     fault="faultHandler(event)"
     showBusyCursor="true"
@@ -242,7 +242,7 @@ class World
             As an example:
         </para>
 
-        <programlisting role="ActionScript"><![CDATA[
+        <programlisting language="ActionScript"><![CDATA[
 myservice.hello("Wade");
 ]]></programlisting>
 
@@ -251,7 +251,7 @@ myservice.hello("Wade");
             "myservice.&lt;namespace&gt;.&lt;method&gt;":
         </para>
 
-        <programlisting role="ActionScript"><![CDATA[
+        <programlisting language="ActionScript"><![CDATA[
 myservice.world.hello("Wade");
 ]]></programlisting>
 
@@ -283,7 +283,7 @@ myservice.world.hello("Wade");
             To disable production mode, do the following:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $server->setProduction(false);
 ]]></programlisting>
 
@@ -291,7 +291,7 @@ $server->setProduction(false);
             To re-enable it, pass a true boolean value instead:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $server->setProduction(true);
 ]]></programlisting>
 
@@ -335,7 +335,7 @@ $server->setProduction(true);
                 'bar' to the response prior to returning it.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $response = $server->handle();
 $response->addAmfHeader(new Zend_Amf_Value_MessageHeader('foo', true, 'bar'))
 echo $response;
@@ -366,7 +366,7 @@ echo $response;
                     class name it maps to:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Map the ActionScript class 'ContactVO' to the PHP class 'Contact':
 $server->setClassMap('ContactVO', 'Contact');
 ]]></programlisting>
@@ -379,7 +379,7 @@ $server->setClassMap('ContactVO', 'Contact');
                     value representing the ActionScript class to map to:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Contact
 {
     public $_explicitType = 'ContactVO';
@@ -394,7 +394,7 @@ class Contact
                     should return the appropriate ActionScript class:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Contact
 {
     public function getASClassName()
@@ -415,7 +415,7 @@ class Contact
             File. Name the file ContactVO and press finish to see the new file. Copy the
             following code into the file to finish creating the class.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 package
 {
     [Bindable]
@@ -442,7 +442,7 @@ package
             It is mandatory that this tag the value that was set is the PHP class are strictly
             equivalent.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 [Bindable]
 private var myContact:ContactVO;
 
@@ -483,7 +483,7 @@ private function getContactHandler(event:ResultEvent):void {
             display the result. Copy the following code into your Main.as file and then we will
             walk through the code to describe what each element's role is.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 package {
   import flash.display.MovieClip;
   import flash.events.*;
@@ -523,7 +523,7 @@ package {
             the server. The second is a Responder object which handles the return values from the
             server related to the success or failure of the call.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 import flash.net.NetConnection;
 import flash.net.Responder;
 ]]></programlisting>
@@ -531,7 +531,7 @@ import flash.net.Responder;
             In the class we need three variables to represent the NetConnection, Responder, and
             the gateway URL to our <classname>Zend_Amf_Server</classname> installation.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 private var gateway:String = "http://example.com/server.php";
 private var connection:NetConnection;
 private var responder:Responder;
@@ -542,7 +542,7 @@ private var responder:Responder;
             methods for handling the response from the server. For simplicity I have called these
             onResult and onFault.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 responder = new Responder(onResult, onFault);
 connection = new NetConnection;
 connection.connect(gateway);
@@ -552,7 +552,7 @@ connection.connect(gateway);
             the data to the server. We need to add one more line that makes a call to the
             <classname>Zend_Amf_Server</classname> World->hello function.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 connection.call("World.hello", responder, params);
 ]]></programlisting>
         <para>
@@ -561,7 +561,7 @@ connection.call("World.hello", responder, params);
             from the server. A successful event handler is run every time the connection is handled
             properly to the server.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 private function onResult(result:Object):void {
     // Display the returned data
     trace(String(result));
@@ -572,7 +572,7 @@ private function onResult(result:Object):void {
             happens when there is an error on the server, the URL to the server is invalid, the
             remote service or method does not exist, and any other connection related issues.
         </para>
-        <programlisting role="as"><![CDATA[
+        <programlisting language="as"><![CDATA[
 private function onFault(fault:Object):void {
     trace(String(fault.description));
 }

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Db.xml

@@ -38,7 +38,7 @@
             the DB resource.
         </para>
 
-        <programlisting role="ini"><![CDATA[
+        <programlisting language="ini"><![CDATA[
 [production]
 resources.db.adapter = "pdo_mysql"
 resources.db.params.host = "localhost"
@@ -63,7 +63,7 @@ resources.db.isDefaultTableAdapter = true
             from your bootstrap:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $resource = $bootstrap->getPluginResource('db');
 ]]></programlisting>
 
@@ -72,7 +72,7 @@ $resource = $bootstrap->getPluginResource('db');
             using the <code>getDbAdapter()</code> method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $db = $resource->getDbAdapter();
 ]]></programlisting>
     </note>

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Frontcontroller.xml

@@ -86,7 +86,7 @@
             controller resource.
         </para>
 
-        <programlisting role="ini"><![CDATA[
+        <programlisting language="ini"><![CDATA[
 [production]
 resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
 resources.frontController.moduleControllerDirectoryName = "actions"
@@ -110,7 +110,7 @@ resources.frontController.env = APPLICATION_ENV
             <code>frontController</code> property of your bootstrap.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $bootstrap->bootstrap('frontController');
 $front = $bootstrap->frontController;
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Modules.xml

@@ -44,7 +44,7 @@
             resources in that module.
         </para>
 
-        <programlisting role="ini"><![CDATA[
+        <programlisting language="ini"><![CDATA[
 [production]
 news.resources.db.adapter = "pdo_mysql"
 news.resources.db.params.host = "localhost"
@@ -54,7 +54,7 @@ news.resources.db.params.dbname = "news"
 news.resources.layout.layout = "news"
 ]]></programlisting>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <?xml version="1.0"?>
 <config>
     <production>
@@ -88,7 +88,7 @@ news.resources.layout.layout = "news"
             method.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $resource = $bootstrap->getPluginResource('modules');
 $moduleBootstraps = $resource->getExecutedBootstraps();
 $newsBootstrap = $moduleBootstraps['news'];

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Session.xml

@@ -50,7 +50,7 @@
             as configures a <classname>Zend_Session_SaveHandler_DbTable</classname> instance.
         </para>
 
-        <programlisting role="ini"><![CDATA[
+        <programlisting language="ini"><![CDATA[
 resources.session.save_path = APPLICATION_PATH "/../data/session"
 resources.session.use_only_cookies = true
 resources.session.remember_me_seconds = 864000

documentation/manual/en/module_specs/Zend_Application-AvailableResources-View.xml

@@ -25,7 +25,7 @@
             resource.
         </para>
 
-        <programlisting role="ini"><![CDATA[
+        <programlisting language="ini"><![CDATA[
 resources.view.encoding = "UTF-8"
 resources.view.basePath = APPLICATION_PATH "/views/scripts"
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Resource_ResourceAbstract.xml

@@ -116,7 +116,7 @@
             short name:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $app = new Zend_Application(APPLICATION_ENV, array(
     'pluginPaths' => array(
         'My_Resource' => 'My/Resource/',
@@ -136,7 +136,7 @@ $app = new Zend_Application(APPLICATION_ENV, array(
             later using the short name:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $bootstrap->bootstrap('view');
 $view = $bootstrap->getResource('view');
 ]]></programlisting>
@@ -147,7 +147,7 @@ $view = $bootstrap->getResource('view');
             using the resource's full class name:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $app = new Zend_Application(APPLICATION_ENV, array(
     'resources' => array(
         // This will load the standard 'View' resource:
@@ -163,7 +163,7 @@ $app = new Zend_Application(APPLICATION_ENV, array(
             Obviously, this makes referencing the resource much more verbose:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $bootstrap->bootstrap('My_Resource_View');
 $view = $bootstrap->getResource('My_Resource_View');
 ]]></programlisting>
@@ -177,7 +177,7 @@ $view = $bootstrap->getResource('My_Resource_View');
             bootstrap. As an example, let's define our own view class:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class My_Resource_View extends Zend_Application_Resource_ResourceAbstract
 {
     public $_explicitType = 'My_View';
@@ -194,7 +194,7 @@ class My_Resource_View extends Zend_Application_Resource_ResourceAbstract
             "My_View":
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $bootstrap->bootstrap('My_View');
 $view = $bootstrap->getResource('My_View');
 ]]></programlisting>

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

@@ -8,7 +8,7 @@
         it will simply be an empty stub extending the base bootstrap class:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
 }
@@ -18,7 +18,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         With a corresponding configuration file:
     </para>
 
-    <programlisting role="ini"><![CDATA[
+    <programlisting language="ini"><![CDATA[
 ; APPLICATION_PATH/configs/application.ini
 [production]
 bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
@@ -53,7 +53,7 @@ resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
         returning a value to store in the bootstrap.
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
     protected function _initRequest(array $options = array())
@@ -114,7 +114,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         following:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 class My_Bootstrap_Resource_View
     extends Zend_Application_Resource_ResourceAbstract
 {
@@ -151,7 +151,7 @@ class My_Bootstrap_Resource_View
         path and the short name of the resource (e.g, "view"):
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $application = new Zend_Application(
     APPLICATION_ENV,
     array(
@@ -177,7 +177,7 @@ $application = new Zend_Application(
         parent bootstrap:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 class My_Bootstrap_Resource_Layout
     extends Zend_Application_Resource_ResourceAbstract
 {
@@ -199,7 +199,7 @@ class My_Bootstrap_Resource_Layout
         and run it:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $application = new Zend_Application(...);
 $application->bootstrap()
             ->run();
@@ -210,7 +210,7 @@ $application->bootstrap()
         resources:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $application = new Zend_Application(...);
 $application->getBootstrap()->bootstrap('db');
 
@@ -224,7 +224,7 @@ echo $service->handle();
         internal methods or resources, you may also use overloading:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $application = new Zend_Application(...);
 $application->getBootstrap()->bootstrapDb();
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Application-QuickStart.xml

@@ -30,7 +30,7 @@
             To create a project, execute the <code>zf</code> command (on *nix systems):
         </para>
 
-        <programlisting role="sh"><![CDATA[
+        <programlisting language="sh"><![CDATA[
 % zf create project newproject
 ]]></programlisting>
 
@@ -38,7 +38,7 @@
             Or the Windows <code>zf.bat</code> command:
         </para>
 
-        <programlisting role="dos"><![CDATA[
+        <programlisting language="dos"><![CDATA[
 C:> zf.bat create project newproject
 ]]></programlisting>
 
@@ -46,7 +46,7 @@ C:> zf.bat create project newproject
             Both will create a project structure that looks like the following:
         </para>
 
-        <programlisting role="text"><![CDATA[
+        <programlisting language="text"><![CDATA[
 newproject
 |-- application
 |   |-- Bootstrap.php
@@ -80,7 +80,7 @@ newproject
             the following at first:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
 }
@@ -92,7 +92,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             created. It has the following contents:
         </para>
 
-        <programlisting role="dosini"><![CDATA[
+        <programlisting language="dosini"><![CDATA[
 [production]
 phpSettings.display_startup_errors = 0
 phpSettings.display_errors = 0
@@ -123,7 +123,7 @@ phpSettings.display_errors = 1
             <classname>Zend_Application</classname> and dispatches it.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Define path to application directory
 defined('APPLICATION_PATH')
     || define('APPLICATION_PATH',
@@ -184,7 +184,7 @@ $application->bootstrap()
             <filename>application/Bootstrap.php</filename>, with the following contents:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
 }
@@ -198,7 +198,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             following contents:
         </para>
 
-        <programlisting role="dosini"><![CDATA[
+        <programlisting language="dosini"><![CDATA[
 [production]
 phpSettings.display_startup_errors = 0
 phpSettings.display_errors = 0
@@ -224,7 +224,7 @@ phpSettings.display_errors = 1
             it; otherwise, replace it with the following contents:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Define path to application directory
 defined('APPLICATION_PATH')
     || define('APPLICATION_PATH',
@@ -264,7 +264,7 @@ $application->bootstrap()
             <filename>public/.htacces</filename> file:
         </para>
 
-        <programlisting role="conf"><![CDATA[
+        <programlisting language="conf"><![CDATA[
 SetEnv APPLICATION_ENV development
 
 RewriteEngine On
@@ -321,7 +321,7 @@ RewriteRule ^.*$ index.php [NC,L]
             To use it, all we need to do is update the configuration file.
         </para>
 
-        <programlisting role="dosini"><![CDATA[
+        <programlisting language="dosini"><![CDATA[
 [production]
 phpSettings.display_startup_errors = 0
 phpSettings.display_errors = 0
@@ -351,7 +351,7 @@ phpSettings.display_errors = 1
             next):
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <?php echo $this->doctype() ?>
 <html>
 <head>
@@ -377,7 +377,7 @@ phpSettings.display_errors = 1
             <code>Bootstrap</code> class to add a method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
     protected function _initView()

documentation/manual/en/module_specs/Zend_Application-TheoryOfOperation.xml

@@ -140,7 +140,7 @@
             which defines the following API:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 interface Zend_Application_Bootstrap_Bootstrapper
 {
     public function __construct($application);
@@ -199,7 +199,7 @@ interface Zend_Application_Bootstrap_Bootstrapper
                 Take the following bootstrap class:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
     protected function _initFoo()
@@ -224,7 +224,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
                 following:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bootstrap->bootstrap('foo');
 ]]></programlisting>
 
@@ -233,7 +233,7 @@ $bootstrap->bootstrap('foo');
                 <code>_initBar()</code> methods, do the following:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bootstrap->bootstrap(array('foo', 'bar));
 ]]></programlisting>
 
@@ -242,7 +242,7 @@ $bootstrap->bootstrap(array('foo', 'bar));
                 with no arguments:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bootstrap->bootstrap();
 ]]></programlisting>
         </sect3>
@@ -268,7 +268,7 @@ $bootstrap->bootstrap();
                 loading resource plugins:
             </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 interface Zend_Application_Bootstrap_ResourceBootstrapper
 {
     public function registerPluginResource($resource, $options = null);
@@ -309,7 +309,7 @@ interface Zend_Application_Bootstrap_ResourceBootstrapper
                 the name of the resource. As an example,
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $application = new Zend_Application(APPLICATION_ENV, array(
     'resources' => array(
         'FrontController' => array(
@@ -339,7 +339,7 @@ $application = new Zend_Application(APPLICATION_ENV, array(
                 pass that information to the application object as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $application = new Zend_Application(APPLICATION_ENV, array(
     'pluginPaths' => array(
         'My_Resource' => APPLICATION_PATH . '/resources/',
@@ -364,7 +364,7 @@ $application = new Zend_Application(APPLICATION_ENV, array(
                 you can mix and match to execute resource methods as well.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Execute one:
 $bootstrap->bootstrap('FrontController');
 
@@ -409,7 +409,7 @@ $bootstrap->bootstrap();
                 As an example, consider a basic view resource:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
     protected function _initView()
@@ -426,7 +426,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
                 You can then check for it and/or fetch it as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Using the has/getResource() pair:
 if ($bootstrap->hasResource('view')) {
     $view = $bootstrap->getResource('view');
@@ -454,7 +454,7 @@ if (isset($container->view)) {
                 above within your action controller, you could do the following:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function init()
@@ -503,7 +503,7 @@ class FooController extends Zend_Controller_Action
                 In a resource method, such a call would look like this:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
     protected function _initRequest()
@@ -546,7 +546,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             interface is simply this:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 interface Zend_Application_Resource_Resource
 {
     public function __construct($options = null);
@@ -574,7 +574,7 @@ interface Zend_Application_Resource_Resource
             via configuration. Such a resource might look like this:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class My_Resource_View extends Zend_Application_Resource_ResourceAbstract
 {
     protected $_view;

documentation/manual/en/module_specs/Zend_Auth.xml

@@ -53,7 +53,7 @@
             for authentication. Other details, such as how the authentication service is queried, have been
             omitted for brevity:
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class MyAuthAdapter implements Zend_Auth_Adapter_Interface
 {
     /**
@@ -137,7 +137,7 @@ class MyAuthAdapter implements Zend_Auth_Adapter_Interface
             attempted, and providing specific, customized authentication result messages to the user. The following
             result codes are available:
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 Zend_Auth_Result::SUCCESS
 Zend_Auth_Result::FAILURE
 Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND
@@ -151,7 +151,7 @@ Zend_Auth_Result::FAILURE_UNCATEGORIZED
         <para>
             The following example illustrates how a developer may branch on the result code:
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // inside of AuthController / loginAction
 $result = $this->_auth->authenticate($adapter);
 
@@ -229,7 +229,7 @@ switch ($result->getCode()) {
                     of <classname>Zend_Session_Namespace</classname>. This should occur before authentication is attempted, since
                     <classname>Zend_Auth::authenticate()</classname> performs the automatic storage of the identity.
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Save a reference to the Singleton instance of Zend_Auth
 $auth = Zend_Auth::getInstance();
 
@@ -271,7 +271,7 @@ $result = $auth->authenticate($authAdapter);
                     <classname>Zend_Auth_Storage_Session</classname>, a developer implements
                     <classname>Zend_Auth_Storage_Interface</classname>:
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 class MyStorage implements Zend_Auth_Storage_Interface
 {
     /**
@@ -342,7 +342,7 @@ class MyStorage implements Zend_Auth_Storage_Interface
                     In order to use this custom storage class, <classname>Zend_Auth::setStorage()</classname> is invoked before an
                     authentication query is attempted:
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Instruct Zend_Auth to use the custom storage class
 Zend_Auth::getInstance()->setStorage(new MyStorage());
 
@@ -387,7 +387,7 @@ $result = Zend_Auth::getInstance()->authenticate($authAdapter);
             The following example illustrates how to use a <classname>Zend_Auth</classname> adapter indirectly, through the use of
             the <classname>Zend_Auth</classname> class:
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Get a reference to the singleton instance of Zend_Auth
 $auth = Zend_Auth::getInstance();
 
@@ -414,7 +414,7 @@ if (!$result->isValid()) {
         <para>
             Once authentication has been attempted in a request, as in the above example, it is a simple
             matter to check whether a successfully authenticated identity exists:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $auth = Zend_Auth::getInstance();
 if ($auth->hasIdentity()) {
     // Identity exists; get it
@@ -426,7 +426,7 @@ if ($auth->hasIdentity()) {
         <para>
             To remove an identity from persistent storage, simply use the <code>clearIdentity()</code> method.
             This typically would be used for implementing an application "logout" operation:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 Zend_Auth::getInstance()->clearIdentity();
 ]]></programlisting>
         </para>
@@ -439,7 +439,7 @@ Zend_Auth::getInstance()->clearIdentity();
             documentation for each adapter. The following example directly utilizes
             <code>MyAuthAdapter</code>:
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Set up the authentication adapter
 $authAdapter = new MyAuthAdapter($username, $password);
 

documentation/manual/en/module_specs/Zend_Auth_Adapter_DbTable.xml

@@ -74,7 +74,7 @@
                 which we can perform an authentication query later. This example
                  requires the PDO SQLite extension to be available:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Create an in-memory SQLite database connection
 $dbAdapter = new Zend_Db_Adapter_Pdo_Sqlite(array('dbname' =>
                                                   ':memory:'));
@@ -103,7 +103,7 @@ $dbAdapter->query($sqlInsert);
                 constructor or deferred as parameters to setter methods after
                 instantiation:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Configure the instance with constructor parameters...
 $authAdapter = new Zend_Auth_Adapter_DbTable(
     $dbAdapter,
@@ -128,7 +128,7 @@ $authAdapter
                 the adapter prior to calling the <code>authenticate()</code>
                 method:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Set the input credential values (e.g., from a login form)
 $authAdapter
     ->setIdentity('my_username')
@@ -143,7 +143,7 @@ $authAdapter
                 object, <classname>Zend_Auth_Adapter_DbTable</classname> also supports
                 retrieving the table row upon authentication success:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Print the identity
 echo $result->getIdentity() . "\n\n";
 
@@ -179,7 +179,7 @@ Array
             <code>stdClass</code> object. The following code snippet illustrates
             its use:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // authenticate with Zend_Auth_Adapter_DbTable
 $result = $this->_auth->authenticate($adapter);
 
@@ -226,7 +226,7 @@ if ($result->isValid()) {
             leveraged for additional checks at authentication time to solve
             some common user problems.
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // The status field value of an account is not equal to "compromised"
 $adapter = new Zend_Auth_Adapter_DbTable(
     $db,
@@ -255,7 +255,7 @@ $adapter = new Zend_Auth_Adapter_DbTable(
         <para>
             Therefore, we need to modify our table to store our salt string:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $sqlAlter = "ALTER TABLE [users] "
           . "ADD COLUMN [password_salt] "
           . "AFTER [password]";
@@ -264,14 +264,14 @@ $sqlAlter = "ALTER TABLE [users] "
             Here’s a simple way to generate a salt string for every user at
             registration:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 for ($i = 0; $i < 50; $i++) {
     $dynamicSalt .= chr(rand(33, 126));
 ]]></programlisting>
         <para>
             And now let’s build the adapter:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $adapter = new Zend_Auth_Adapter_DbTable(
     $db,
     'users',
@@ -305,7 +305,7 @@ $adapter = new Zend_Auth_Adapter_DbTable(
             method would check the status of a user, in other words to see if that
             user's account is enabled.
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Continuing with the example from above
 $adapter = new Zend_Auth_Adapter_DbTable(
     $db,

documentation/manual/en/module_specs/Zend_Auth_Adapter_Digest.xml

@@ -90,7 +90,7 @@ someUser:Some Realm:fde17b91c3a510ecbaf7dbd37f59d4f8
             values set before <code>authenticate()</code> is called.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $adapter = new Zend_Auth_Adapter_Digest($filename,
                                         $realm,
                                         $username,

documentation/manual/en/module_specs/Zend_Auth_Adapter_Http.xml

@@ -191,12 +191,12 @@
 
             <para>
                 There are two equally easy ways to create a File resolver:
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $path     = 'files/passwd.txt';
 $resolver = new Zend_Auth_Adapter_Http_Resolver_File($path);
 ]]></programlisting>
                 or
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $path     = 'files/passwd.txt';
 $resolver = new Zend_Auth_Adapter_Http_Resolver_File();
 $resolver->setFile($path);
@@ -214,7 +214,7 @@ $resolver->setFile($path);
 
         <para>
             First, set up an array with the required configuration values:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $config = array(
     'accept_schemes' => 'basic digest',
     'realm'          => 'My Web Site',
@@ -230,7 +230,7 @@ $config = array(
 
         <para>
             Next, create the Zend_Auth_Adapter_Http object:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $adapter = new Zend_Auth_Adapter_Http($config);
 ]]></programlisting>
         </para>
@@ -238,7 +238,7 @@ $adapter = new Zend_Auth_Adapter_Http($config);
         <para>
             Since we're supporting both Basic and Digest authentication, we need two different resolver objects. Note
             that this could just as easily be two different classes:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $basicResolver = new Zend_Auth_Adapter_Http_Resolver_File();
 $basicResolver->setFile('files/basicPasswd.txt');
 
@@ -253,7 +253,7 @@ $adapter->setDigestResolver($digestResolver);
         <para>
             Finally, we perform the authentication. The adapter needs a reference to both the Request and Response
             objects in order to do its job:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 assert($request instanceof Zend_Controller_Request_Http);
 assert($response instanceof Zend_Controller_Response_Http);
 

documentation/manual/en/module_specs/Zend_Auth_Adapter_Ldap.xml

@@ -33,7 +33,7 @@
             To incorporate <classname>Zend_Auth_Adapter_Ldap</classname> authentication into your application quickly, even if
             you're not using <classname>Zend_Controller</classname>, the meat of your code should look something like the
             following:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $username = $this->_request->getParam('username');
 $password = $this->_request->getParam('password');
 
@@ -81,7 +81,7 @@ if ($log_path) {
             arbitrary. For details regarding the options array, see the <emphasis>Server Options</emphasis> section
             below. Note that <classname>Zend_Config_Ini</classname> requires that any values with "equals" characters
             (<code>=</code>) will need to be quoted (like the DNs shown below).
-            <programlisting role="ini"><![CDATA[
+            <programlisting language="ini"><![CDATA[
 [production]
 
 ldap.log_path = /tmp/ldap.log
@@ -141,7 +141,7 @@ ldap.server2.baseDn = "CN=Users,DC=w,DC=net"
             Below is <ulink url="http://php.net/print_r"><code>print_r()</code></ulink> output of an example options
             parameter containing two sets of server options for LDAP servers <code>s0.foo.net</code> and
             <code>dc1.w.net</code> (the same options as the above INI representation):
-            <programlisting role="output"><![CDATA[
+            <programlisting language="output"><![CDATA[
 Array
 (
     [server2] => Array

documentation/manual/en/module_specs/Zend_Auth_Adapter_OpenId.xml

@@ -71,7 +71,7 @@
             set.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <?php
 $status = "";
 $auth = Zend_Auth::getInstance();

documentation/manual/en/module_specs/Zend_Cache-Backends.xml

@@ -302,7 +302,7 @@
             -- between the words 'Zend' and 'Platform' when using the
             <classname>Zend_Cache::factory()</classname> method:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $cache = Zend_Cache::factory('Core', 'Zend Platform');
 ]]></programlisting>
         <para>

documentation/manual/en/module_specs/Zend_Cache-Frontends.xml

@@ -126,7 +126,7 @@
                 If you store only strings into cache (because with "automatic_serialization" option, it's possible
                 to store some booleans), you can use a more compact construction like:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // we assume you already have $cache
 
 $id = 'myBigLoop'; // cache id of "what we want to cache"
@@ -148,7 +148,7 @@ if (!($data = $cache->load($id))) {
             <para>
                 If you want to cache multiple blocks or data instances, the idea is the same:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // make sure you use unique identifiers:
 $id1 = 'foo';
 $id2 = 'bar';
@@ -189,7 +189,7 @@ echo($data);
                 strings you can't use the compact construction given above. You have to test formally the
                 cache record.
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // the compact construction
 // (not good if you cache empty strings and/or booleans)
 if (!($data = $cache->load($id))) {
@@ -251,7 +251,7 @@ if (!($cache->test($id))) {
             <para>
                 An example is given in the manual at the very beginning. Here it is with minor changes:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // if it is a cache miss, output buffering is triggered
 if (!($cache->start('mypage'))) {
 
@@ -331,7 +331,7 @@ echo 'This is never cached ('.time().').';
                 Using the <code>call()</code> function is the same as using
                 <code>call_user_func_array()</code> in PHP:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $cache->call('veryExpensiveFunc', $params);
 
 // $params is an array
@@ -418,7 +418,7 @@ $cache->call('veryExpensiveFunc', $params);
             <para>
                 For example, to cache static calls :
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Test {
 
     // Static method
@@ -441,7 +441,7 @@ $result = $cache->foobar('1', '2');
             <para>
                 To cache classic method calls :
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Test {
 
     private $_string = 'hello !';
@@ -732,7 +732,7 @@ $result = $cache->foobar2('1', '2');
             <para>
                 Use of <classname>Zend_Cache_Frontend_Page</classname> is really trivial:
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // [...] // require, configuration and factory
 
 $cache->start();
@@ -745,7 +745,7 @@ $cache->start();
                 a more complex example which shows a way to get a centralized cache management in a bootstrap file
                 (for using with <classname>Zend_Controller</classname> for example)
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 /*
  * You should avoid putting too many lines before the cache section.
  * For example, for optimal performances, "require_once" or
@@ -803,7 +803,7 @@ $cache->start();
                 you could need to cancel the current cache process. So we introduce for this
                 particular frontend, the cancel() method.
             </para>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // [...] // require, configuration and factory
 
 $cache->start();

documentation/manual/en/module_specs/Zend_Cache-Introduction.xml

@@ -24,7 +24,7 @@
             backend.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $frontendOptions = array(
    'lifetime' => 7200, // cache lifetime of 2 hours
    'automatic_serialization' => true
@@ -61,7 +61,7 @@ $cache = Zend_Cache::factory('Core',
             is no need to even connect to the database; records are fetched from cache and unserialized.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // $cache initialized in previous example
 
 // see if a cache already exists:
@@ -97,7 +97,7 @@ print_r($result);
             method. On the next run, the whole section will be skipped in favor of fetching data from cache
             (as long as the cache record is valid).
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $frontendOptions = array(
    'lifetime' => 30,                   // cache lifetime of 30 seconds
    'automatic_serialization' => false  // this is the default anyways

documentation/manual/en/module_specs/Zend_Cache-Theory.xml

@@ -29,7 +29,7 @@
             A good way to build a usable instance of a <classname>Zend_Cache</classname> Frontend is given
             in the following example :
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // We choose a backend (for example 'File' or 'Sqlite'...)
 $backendName = '[...]';
 
@@ -67,7 +67,7 @@ $cache = Zend_Cache::factory($frontendName,
             method, you can set an array of tags to apply for this record. Then you will be
             able to clean all cache records tagged with a given tag (or tags):
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $cache->save($huge_data, 'myUniqueID', array('tagA', 'tagB', 'tagC'));
 ]]></programlisting>
         <note><para>
@@ -81,14 +81,14 @@ $cache->save($huge_data, 'myUniqueID', array('tagA', 'tagB', 'tagC'));
             To remove/invalidate in particular cache id, you can use the <code>remove()</code>
             method :
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $cache->remove('idToRemove');
 ]]></programlisting>
         <para>
             To remove/invalidate several cache ids in one operation, you can use the <code>clean()</code>
             method. For example to remove all cache records :
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // clean all records
 $cache->clean(Zend_Cache::CLEANING_MODE_ALL);
 
@@ -98,7 +98,7 @@ $cache->clean(Zend_Cache::CLEANING_MODE_OLD);
         <para>
             If you want to remove cache entries matching the tags 'tagA' and 'tagC':
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $cache->clean(
     Zend_Cache::CLEANING_MODE_MATCHING_TAG,
     array('tagA', 'tagC')
@@ -107,7 +107,7 @@ $cache->clean(
         <para>
             If you want to remove cache entries not matching the tags 'tagA' or 'tagC':
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $cache->clean(
     Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG,
     array('tagA', 'tagC')
@@ -116,7 +116,7 @@ $cache->clean(
         <para>
             If you want to remove cache entries matching the tags 'tagA' or 'tagC':
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $cache->clean(
     Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG,
     array('tagA', 'tagC')

documentation/manual/en/module_specs/Zend_Captcha-Operation.xml

@@ -8,7 +8,7 @@
         <classname>Zend_Captcha_Adapter</classname>, which looks like the following:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 interface Zend_Captcha_Adapter extends Zend_Validate_Interface
 {
     public function generate();
@@ -46,7 +46,7 @@ interface Zend_Captcha_Adapter extends Zend_Validate_Interface
         A typical use case might look like the following:
     </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Creating a Zend_View instance
 $view = new Zend_View();
 

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

@@ -11,7 +11,7 @@
             DocBlock.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $foo      = new Zend_CodeGenerator_Php_Class();
 $docblock = new Zend_CodeGenerator_Php_Docblock(array(
     'shortDescription' => 'Sample generated class',
@@ -36,7 +36,7 @@ echo $foo->generate();
             The above code will result in the following:
         </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 /**
  * Sample generated class
  *
@@ -61,7 +61,7 @@ class Foo
             generated class.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $foo      = new Zend_CodeGenerator_Php_Class();
 $docblock = new Zend_CodeGenerator_Php_Docblock(array(
     'shortDescription' => 'Sample generated class',
@@ -103,7 +103,7 @@ echo $foo->generate();
             The above results in the following class definition:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 /**
  * Sample generated class
  *
@@ -136,7 +136,7 @@ class Foo
             <classname>Zend_CodeGenerator_Php_Method</classname> instances.
         </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $foo      = new Zend_CodeGenerator_Php_Class();
 $docblock = new Zend_CodeGenerator_Php_Docblock(array(
     'shortDescription' => 'Sample generated class',
@@ -214,7 +214,7 @@ echo $foo->generate();
             The above generates the following output:
         </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 /**
  * Sample generated class
  *
@@ -275,7 +275,7 @@ class Foo
             example.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $file = new Zend_CodeGenerator_Php_File(array(
     'classes'  => array($foo);
     'docblock' => new Zend_CodeGenerator_Php_Docblock(array(
@@ -297,7 +297,7 @@ $file = new Zend_CodeGenerator_Php_File(array(
             them to a file yourself. As an example:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $code = $file->generate();
 file_put_contents('Foo.php', $code);
 ]]></programlisting>
@@ -306,7 +306,7 @@ file_put_contents('Foo.php', $code);
             The above will generate the following file:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <?php
 /**
  * Foo class file
@@ -369,7 +369,7 @@ define('APPLICATION_ENV', 'testing');
             this.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $generator = Zend_CodeGenerator_Php_File::fromReflectedFileName($path);
 $body = $generator->getBody();
 $body .= "\n\$foo->bar();";
@@ -386,7 +386,7 @@ file_put_contents($path, $generator->generate());
             methods, and then regenerate the class.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $generator = Zend_CodeGenerator_Php_Class::fromReflection(
     new Zend_Reflection_Class($class)
 );

documentation/manual/en/module_specs/Zend_CodeGenerator-Introduction.xml

@@ -22,7 +22,7 @@
             simply echo the object or call its <code>generate()</code> method.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Passing configuration to the constructor:
 $file = new Zend_CodeGenerator_Php_File(array(
     'classes' => array(
@@ -61,7 +61,7 @@ file_put_contents('World.php', $file->generate());
             Both of the above samples will render the same result:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <?php
 
 class World
@@ -89,7 +89,7 @@ class World
             following:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $class = Zend_CodeGenerator_Php_Class::fromReflection(
     new Zend_Reflection_Class('World')
 );
@@ -113,7 +113,7 @@ file_put_contents('World.php', $file->generate());
             The resulting class file will now look like this:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <?php
 
 class World

documentation/manual/en/module_specs/Zend_CodeGenerator-Reference.xml

@@ -15,7 +15,7 @@
                 follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 abstract class Zend_CodeGenerator_Abstract
 {
     final public function __construct(Array $options = array())
@@ -68,7 +68,7 @@ abstract class Zend_CodeGenerator_Abstract
                 content. Its API is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 abstract class Zend_CodeGenerator_Php_Abstract
     extends Zend_CodeGenerator_Abstract
 {
@@ -91,7 +91,7 @@ abstract class Zend_CodeGenerator_Php_Abstract
                 name of the member. Its API is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 abstract class Zend_CodeGenerator_Php_Member_Abstract
     extends Zend_CodeGenerator_Php_Abstract
 {
@@ -125,7 +125,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract
                 The API of the class is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Php_Abstract
 {
     public function setContent($content)
@@ -152,7 +152,7 @@ class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Php_Abstract
                 The API is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
 {
     public static function fromReflection(
@@ -222,7 +222,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
                 The API is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
 {
     public static function fromReflection(
@@ -255,7 +255,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
                 The class API is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Docblock_Tag
     extends Zend_CodeGenerator_Php_Abstract
 {
@@ -288,7 +288,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag
                 The class API is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Docblock_Tag_Param
     extends Zend_CodeGenerator_Php_Docblock_Tag
 {
@@ -319,7 +319,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param
                 The class API is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Docblock_Tag_Param
     extends Zend_CodeGenerator_Php_Docblock_Tag
 {
@@ -357,7 +357,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param
                 The API of the class is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
 {
     public static function fromReflectedFilePath(
@@ -398,7 +398,7 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
                 The API of the class is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Member_Container extends ArrayObject
 {
     public function __construct($type = self::TYPE_PROPERTY)
@@ -430,7 +430,7 @@ class Zend_CodeGenerator_Php_Member_Container extends ArrayObject
                 The API of the class is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Method
     extends Zend_CodeGenerator_Php_Member_Abstract
 {
@@ -465,7 +465,7 @@ class Zend_CodeGenerator_Php_Method
                 The API of the class is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
 {
     public static function fromReflection(
@@ -500,7 +500,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
                 The API of the class is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class Zend_CodeGenerator_Php_Property
     extends Zend_CodeGenerator_Php_Member_Abstract
 {

documentation/manual/en/module_specs/Zend_Config-Introduction.xml

@@ -19,7 +19,7 @@
             available in a PHP array, one may simply pass the data to the <classname>Zend_Config</classname> constructor in order
             to utilize a simple object-oriented interface:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Given an array of configuration data
 $configArray = array(
     'webhost'  => 'www.example.com',
@@ -57,7 +57,7 @@ $db = Zend_Db::factory($config->database);
         Along with the object oriented access to the data values, <classname>Zend_Config</classname> also has <code>get()</code>
         which will return the supplied default value if the data element doesn't exist. For example:
     </para>
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $host = $config->database->get('host', 'localhost');
 ]]></programlisting>
     <example id="zend.config.introduction.example.file.php">
@@ -66,7 +66,7 @@ $host = $config->database->get('host', 'localhost');
             It is often desirable to use a pure PHP-based configuration file. The following code illustrates how easily
             this can be accomplished:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // config.php
 return array(
     'webhost'  => 'www.example.com',
@@ -81,7 +81,7 @@ return array(
     )
 );
 ]]></programlisting>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Configuration consumption
 $config = new Zend_Config(require 'config.php');
 

documentation/manual/en/module_specs/Zend_Config_Ini.xml

@@ -27,7 +27,7 @@
             By default, the key separator character is the period character (<code>.</code>). This can be changed,
             however, by changing the <code>$options</code> key <code>'nestSeparator'</code> when constructing the
             <classname>Zend_Config_Ini</classname> object. For example:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $options['nestSeparator'] = ':';
 $config = new Zend_Config_Ini('/path/to/config.ini',
                               'staging',
@@ -46,7 +46,7 @@ $config = new Zend_Config_Ini('/path/to/config.ini',
             the case for more complex situations. Suppose, then, that the following configuration data are contained in
             <code>/path/to/config.ini</code>:
         </para>
-        <programlisting role="ini"><![CDATA[
+        <programlisting language="ini"><![CDATA[
 ; Production site configuration data
 [production]
 webhost                  = www.example.com
@@ -67,7 +67,7 @@ database.params.password = devsecret
             Next, assume that the application developer needs the staging configuration data from the INI file. It is a
             simple matter to load these data by specifying the INI file and the staging section:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $config = new Zend_Config_Ini('/path/to/config.ini', 'staging');
 
 echo $config->database->params->host;   // prints "dev.example.com"

documentation/manual/en/module_specs/Zend_Config_Writer.xml

@@ -58,7 +58,7 @@
             This example illustrates the basic use of
             <classname>Zend_Config_Writer_Xml</classname> to create a new config file:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Create the config object
 $config = new Zend_Config(array(), true);
 $config->production = array();
@@ -100,7 +100,7 @@ $writer->write('config.xml', $config);
         <para>
             This example demonstrates how to edit an existing config file.
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Load all sections from an existing config file, while skipping the extends.
 $config = new Zend_Config_Ini('config.ini',
                               null,

documentation/manual/en/module_specs/Zend_Config_Xml.xml

@@ -29,7 +29,7 @@
             the case for more complex situations. Suppose, then, that the following configuration data are contained in
             <code>/path/to/config.xml</code>:
         </para>
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <?xml version="1.0"?>
 <configdata>
     <production>
@@ -59,7 +59,7 @@
             Next, assume that the application developer needs the staging configuration data from the XML file. It is a
             simple matter to load these data by specifying the XML file and the staging section:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $config = new Zend_Config_Xml('/path/to/config.xml', 'staging');
 
 echo $config->database->params->host;   // prints "dev.example.com"
@@ -75,7 +75,7 @@ echo $config->database->params->dbname; // prints "dbname"
             making usage of attributes is to add attributes in a parent node, which then will be translated into
             children of that node:
         </para>
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <?xml version="1.0"?>
 <configdata>
     <production webhost="www.example.com">
@@ -95,7 +95,7 @@ echo $config->database->params->dbname; // prints "dbname"
             the tag name twice. You simply create an empty tag with the value in the <code>value</code>
             attribute:
         </para>
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <?xml version="1.0"?>
 <configdata>
     <production>
@@ -130,7 +130,7 @@ echo $config->database->params->dbname; // prints "dbname"
             as the first parameter to the constructor and must start with the
             characters <code>'&lt;?xml'</code>:
         </para>
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 $string = <<<EOT
 <?xml version="1.0"?>
 <config>

documentation/manual/en/module_specs/Zend_Console_Getopt-Configuration.xml

@@ -18,7 +18,7 @@
         </para>
         <example id="zend.console.getopt.configuration.addrules.example">
             <title>Using addRules()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 $opts->addRules(
   array(
@@ -48,7 +48,7 @@ $opts->addRules(
         </para>
         <example id="zend.console.getopt.configuration.addhelp.example">
             <title>Using setHelp()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 $opts->setHelp(
     array(
@@ -85,7 +85,7 @@ $opts->setHelp(
         </para>
         <example id="zend.console.getopt.configuration.addaliases.example">
             <title>Using setAliases()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 $opts->setAliases(
     array(
@@ -126,7 +126,7 @@ $opts->setAliases(
         </para>
         <example id="zend.console.getopt.configuration.addargs.example">
             <title>Using addArguments() and setArguments()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // By default, the constructor uses $_SERVER['argv']
 $opts = new Zend_Console_Getopt('abp:');
 
@@ -211,7 +211,7 @@ $opts->setArguments(array('-a', '-p', 'p_parameter', 'non_option_arg'));
         </para>
         <example id="zend.console.getopt.configuration.config.example.setoption">
             <title>Using setOption()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 $opts->setOption('ignoreCase', true);
 ]]></programlisting>
@@ -226,7 +226,7 @@ $opts->setOption('ignoreCase', true);
         </para>
         <example id="zend.console.getopt.configuration.config.example.setoptions">
             <title>Using setOptions()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 $opts->setOptions(
     array(

documentation/manual/en/module_specs/Zend_Console_Getopt-Fetching.xml

@@ -34,7 +34,7 @@
         </para>
         <example id="zend.console.getopt.fetching.exceptions.example">
             <title>Catching Getopt Exceptions</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 try {
     $opts = new Zend_Console_Getopt('abp:');
     $opts->parse();
@@ -79,7 +79,7 @@ try {
         </para>
         <example id="zend.console.getopt.fetching.byname.example.setoption">
             <title>Using getOption()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 $b = $opts->getOption('b');
 $p_parameter = $opts->getOption('p');
@@ -93,7 +93,7 @@ $p_parameter = $opts->getOption('p');
         </para>
         <example id="zend.console.getopt.fetching.byname.example.magic">
             <title>Using __get() and __isset() Magic Methods</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 if (isset($opts->b)) {
     echo "I got the b option.\n";
@@ -161,7 +161,7 @@ $p_parameter = $opts->p; // null if not set
         </para>
         <example id="zend.console.getopt.fetching.remainingargs.example">
             <title>Using getRemainingArgs()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 $opts->setArguments(array('-p', 'p_parameter', 'filename'));
 $args = $opts->getRemainingArgs(); // returns array('filename')

documentation/manual/en/module_specs/Zend_Console_Getopt-Rules.xml

@@ -36,7 +36,7 @@
         </para>
         <example id="zend.console.getopt.rules.short.example">
             <title>Using the Short Syntax</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt('abp:');
 ]]></programlisting>
         </example>
@@ -99,7 +99,7 @@ $opts = new Zend_Console_Getopt('abp:');
         </para>
         <example id="zend.console.getopt.rules.long.example">
             <title>Using the Long Syntax</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $opts = new Zend_Console_Getopt(
   array(
     'apple|a'    => 'apple option, with no parameter',

documentation/manual/en/module_specs/Zend_Controller-ActionController.xml

@@ -27,7 +27,7 @@
             For example, let's say your class is defined as follows:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function barAction()
@@ -69,7 +69,7 @@ class FooController extends Zend_Controller_Action
                 of the following methods:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function init()
@@ -103,7 +103,7 @@ class FooController extends Zend_Controller_Action
                 flag:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function barAction()
@@ -146,7 +146,7 @@ class FooController extends Zend_Controller_Action
             a database at instantiation:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function init()
@@ -199,7 +199,7 @@ class FooController extends Zend_Controller_Action
                     calls might look like:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $this->getResponse()->setHeader('Content-Type', 'text/xml');
 $this->getResponse()->appendBody($content);
 ]]></programlisting>
@@ -241,7 +241,7 @@ $this->getResponse()->appendBody($content);
                         retrieving a value:
                     </para>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Use default value of 1 if id is not set
 $id = $this->_getParam('id', 1);
 
@@ -298,7 +298,7 @@ if ($this->_hasParam('id') {
                 the directory structure:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 applicationOrModule/
     controllers/
         IndexController.php
@@ -328,7 +328,7 @@ applicationOrModule/
                 <code>render()</code> has the following signature:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 string render(string $action = null,
               string $name = null,
               bool $noController = false);
@@ -367,7 +367,7 @@ string render(string $action = null,
                 Some examples:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class MyController extends Zend_Controller_Action
 {
     public function fooAction()
@@ -526,7 +526,7 @@ class MyController extends Zend_Controller_Action
                 message, you might write something like this:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class MyController extends Zend_Controller_Action
 {
     public function __call($method, $args)
@@ -551,7 +551,7 @@ class MyController extends Zend_Controller_Action
                 default controller page:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class MyController extends Zend_Controller_Action
 {
     public function indexAction()
@@ -586,7 +586,7 @@ class MyController extends Zend_Controller_Action
             <code>initView()</code> method with code resembling the following:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 abstract class My_Base_Controller extends Zend_Controller_Action
 {
     public function initView()

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-ActionStack.xml

@@ -32,7 +32,7 @@
             calling <classname>Zend_Controller_Action::_forward()</classname>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function barAction()
@@ -63,7 +63,7 @@ class FooController extends Zend_Controller_Action
             well.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function barAction()

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-AutoComplete.xml

@@ -23,7 +23,7 @@
         Basic usage for each implementation is the same:
     </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function barAction()
@@ -131,7 +131,7 @@ class FooController extends Zend_Controller_Action
             for use with such a store:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // within a controller action:
 $this->_helper->autoCompleteDojo($data);
 ]]></programlisting>
@@ -159,7 +159,7 @@ $this->_helper->autoCompleteDojo($data);
                 following contents:
             </para>
 
-            <programlisting role="javascript"><![CDATA[
+            <programlisting language="javascript"><![CDATA[
 dojo.provide("custom.TestNameReadStore");
 dojo.declare("custom.TestNameReadStore", dojox.data.QueryReadStore, {
     fetch:function (request) {
@@ -180,7 +180,7 @@ dojo.declare("custom.TestNameReadStore", dojox.data.QueryReadStore, {
                 AutoCompletion:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class TestController extends Zend_Controller_Action
 {
     protected $_form;
@@ -228,7 +228,7 @@ class TestController extends Zend_Controller_Action
                 for processing AutoCompletion:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class TestController extends Zend_Controller_Action
 {
     // ...
@@ -284,7 +284,7 @@ class TestController extends Zend_Controller_Action
                 view script, which comments the steps:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 <?php // setup our data store: ?>
 <div dojoType="custom.TestNameReadStore" jsId="testStore"
     url="<?php echo $this->baseUrl() ?>/unit-test/autocomplete/format/ajax"

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-ContextSwitch.xml

@@ -41,7 +41,7 @@
         As an example, let's consider the following controller:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 class NewsController extends Zend_Controller_Action
 {
     /**
@@ -74,7 +74,7 @@ class NewsController extends Zend_Controller_Action
         can hint that it can return an XML response:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 class NewsController extends Zend_Controller_Action
 {
     public function init()
@@ -162,7 +162,7 @@ class NewsController extends Zend_Controller_Action
                     serialization:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $this->_helper->contextSwitch()->setAutoJsonSerialization(false);
 ]]></programlisting>
             </listitem>
@@ -299,7 +299,7 @@ $this->_helper->contextSwitch()->setAutoJsonSerialization(false);
             following controller class:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function listAction()
@@ -326,7 +326,7 @@ class FooController extends Zend_Controller_Action
             the <code>init()</code> method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function init()
@@ -344,7 +344,7 @@ class FooController extends Zend_Controller_Action
             <code>$contexts</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public $contexts = array(
@@ -444,7 +444,7 @@ class FooController extends Zend_Controller_Action
             <code>initContext()</code> in your action controller:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class NewsController extends Zend_Controller_Action
 {
     public function init()
@@ -461,7 +461,7 @@ class NewsController extends Zend_Controller_Action
             <code>initContext()</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $contextSwitch->initContext('xml');
 ]]></programlisting>
     </sect4>
@@ -485,7 +485,7 @@ $contextSwitch->initContext('xml');
                     <code>initContext()</code>.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $contextSwitch->setAutoJsonSerialization(false);
 $contextSwitch->initContext();
 ]]></programlisting>
@@ -720,7 +720,7 @@ $contextSwitch->initContext();
                 latter, we'll return JSON.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class CommentController extends Zend_Controller_Action
 {
     public function init()

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-FlashMessenger.xml

@@ -30,7 +30,7 @@
             it as well).
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class SomeController extends Zend_Controller_Action
 {
     /**

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-Json.xml

@@ -26,7 +26,7 @@
                 <classname>Zend_Json_Expr</classname>.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $this->_helper->json($data, array('enableJsonExprFinder' => true));
 ]]></programlisting>
         </listitem>
@@ -51,7 +51,7 @@ $this->_helper->json($data, array('enableJsonExprFinder' => true));
         <code>sendJson()</code>:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 class FooController extends Zend_Controller_Action
 {
     public function barAction()
@@ -80,7 +80,7 @@ class FooController extends Zend_Controller_Action
             layouts enabled:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $this->_helper->json($data, true);
 ]]></programlisting>
 
@@ -90,7 +90,7 @@ $this->_helper->json($data, true);
             <code>keepLayouts</code> option:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $this->_helper->json($data, array('keepLayouts' => true);
 ]]></programlisting>
     </note>
@@ -106,7 +106,7 @@ $this->_helper->json($data, array('keepLayouts' => true);
             option:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $this->_helper->json($data, array('enableJsonExprFinder' => true);
 ]]></programlisting>
 
@@ -117,7 +117,7 @@ $this->_helper->json($data, array('enableJsonExprFinder' => true);
             options are then passed to <classname>Zend_Json::encode()</classname>.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $this->_helper->json($data, array(
     'enableJsonExprFinder' => true,
     'keepLayouts'          => true,

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-Redirector.xml

@@ -137,7 +137,7 @@
                 redirecting.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class SomeController extends Zend_Controller_Action
 {
     /**
@@ -182,7 +182,7 @@ class SomeController extends Zend_Controller_Action
                 <code>exit()</code>.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // ALTERNATIVE EXAMPLE
 class AlternativeController extends Zend_Controller_Action
 {
@@ -222,7 +222,7 @@ class AlternativeController extends Zend_Controller_Action
                 chaining the action.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class ForwardController extends Zend_Controller_Action
 {
     /**
@@ -266,7 +266,7 @@ class ForwardController extends Zend_Controller_Action
                 route has been registered:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route(
     'blog/:year/:month/:day/:id',
     array('controller' => 'archive',
@@ -282,7 +282,7 @@ $router->addRoute('blogArchive', $route);
                 <code>/blog/2006/4/24/42</code>.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class BlogAdminController extends Zend_Controller_Action
 {
     /**

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-ViewRenderer.xml

@@ -91,7 +91,7 @@
                         helper broker:
                     </para>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $viewRenderer = new Zend_Controller_Action_Helper_ViewRenderer();
 $viewRenderer->setView($view)
              ->setViewSuffix('php');
@@ -105,7 +105,7 @@ Zend_Controller_Action_HelperBroker::addHelper($viewRenderer);
                         object on demand via the helper broker:
                     </para>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $viewRenderer =
     Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
 $viewRenderer->setView($view)
@@ -126,7 +126,7 @@ $viewRenderer->setView($view)
             the helper broker's <code>getStaticHelper()</code> method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
 ]]></programlisting>
 
@@ -151,7 +151,7 @@ Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
             As an example, consider the following class:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // A controller class, foo module:
 class Foo_BarController extends Zend_Controller_Action
 {
@@ -277,7 +277,7 @@ $this->foo(); // call Foo_View_Helper_Foo::foo()
                     easily from your controller:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Render 'foo' instead of current action script
 $this->_helper->viewRenderer('foo');
 
@@ -301,7 +301,7 @@ $this->_helper->viewRenderer('form', 'html', true);
             <code>initView()</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $view    = new Zend_View(array('encoding' => 'UTF-8'));
 $options = array('noController' => true, 'neverRender' => true);
 $viewRenderer =
@@ -616,7 +616,7 @@ $viewRenderer =
                 bootstrap, and then set variables in your action methods.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // In your bootstrap:
 Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
 
@@ -695,7 +695,7 @@ class Foo_BarController extends Zend_Controller_Action
                 off for the current action (<code>setNoRender()</code>).
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Baz controller class, bar module:
 class Bar_BazController extends Zend_Controller_Action
 {
@@ -741,7 +741,7 @@ class Bar_BatController extends Zend_Controller_Action
                 <code>setRender()</code>.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Bar controller class, foo module:
 class Foo_BarController extends Zend_Controller_Action
 {
@@ -784,7 +784,7 @@ class Foo_BarController extends Zend_Controller_Action
                 both are references to the same object.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Bar controller class, foo module:
 class Foo_BarController extends Zend_Controller_Action
 {
@@ -832,7 +832,7 @@ class Foo_BarController extends Zend_Controller_Action
                 want to use 'tpl' as the view script filename suffix.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 /**
  * In your bootstrap:
  */
@@ -858,7 +858,7 @@ Zend_Controller_Action_HelperBroker::addHelper($viewRenderer);
                 multiple calls to <code>render()</code>:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class SearchController extends Zend_Controller_Action
 {
     public function resultsAction()

documentation/manual/en/module_specs/Zend_Controller-ActionHelpers.xml

@@ -49,7 +49,7 @@
                     name, and a helper object is returned:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $flashMessenger = $this->_helper->getHelper('FlashMessenger');
 $flashMessenger->addMessage('We did something in the last request');
 ]]></programlisting>
@@ -62,7 +62,7 @@ $flashMessenger->addMessage('We did something in the last request');
                     the broker:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $flashMessenger = $this->_helper->FlashMessenger;
 $flashMessenger->addMessage('We did something in the last request');
 ]]></programlisting>
@@ -77,7 +77,7 @@ $flashMessenger->addMessage('We did something in the last request');
                     <code>addMessage()</code>:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $this->_helper->FlashMessenger('We did something in the last request');
 ]]></programlisting>
             </listitem>
@@ -108,7 +108,7 @@ $this->_helper->FlashMessenger('We did something in the last request');
             To register a helper with the broker, use <code>addHelper</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 Zend_Controller_Action_HelperBroker::addHelper($helper);
 ]]></programlisting>
 
@@ -128,7 +128,7 @@ Zend_Controller_Action_HelperBroker::addHelper($helper);
                     conventions.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Add helpers prefixed with My_Action_Helpers in My/Action/Helpers/
 Zend_Controller_Action_HelperBroker::addPrefix('My_Action_Helpers');
 ]]></programlisting>
@@ -142,7 +142,7 @@ Zend_Controller_Action_HelperBroker::addPrefix('My_Action_Helpers');
                     you to map your own class prefixes to specific directories.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Add helpers prefixed with Helper in Plugins/Helpers/
 Zend_Controller_Action_HelperBroker::addPath('./Plugins/Helpers',
                                              'Helper');
@@ -170,7 +170,7 @@ Zend_Controller_Action_HelperBroker::addPath('./Plugins/Helpers',
             name of the helper (minus the prefix):
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Check if 'redirector' helper is registered with the broker:
 if (Zend_Controller_Action_HelperBroker::hasHelper('redirector')) {
     echo 'Redirector helper registered';
@@ -195,7 +195,7 @@ if (Zend_Controller_Action_HelperBroker::hasHelper('redirector')) {
             the short name of the helper (minus the prefix).
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Check if 'redirector' helper is registered with the broker, and fetch:
 if (Zend_Controller_Action_HelperBroker::hasHelper('redirector')) {
     $redirector =
@@ -215,7 +215,7 @@ $redirector =
             short name of the helper (minus the prefix):
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Conditionally remove the 'redirector' helper from the broker:
 if (Zend_Controller_Action_HelperBroker::hasHelper('redirector')) {
     Zend_Controller_Action_HelperBroker::removeHelper('redirector')
@@ -328,7 +328,7 @@ if (Zend_Controller_Action_HelperBroker::hasHelper('redirector')) {
             allowing use of the helper like this:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Redirect to /blog/view/item/id/42
 $this->_helper->redirector('item', 'view', 'blog', array('id' => 42));
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Controller-Dispatcher.xml

@@ -34,7 +34,7 @@
                 in either the front controller or your dispatcher:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // In your front controller:
 $front->setParam('prefixDefaultModule', true);
 
@@ -72,7 +72,7 @@ $dispatcher->setParam('prefixDefaultModule', true);
             send to the new action:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 public function fooAction()
 {
     // forward to another action in the current controller and module:
@@ -118,7 +118,7 @@ public function bazAction()
             following methods as required for any dispatcher implementation:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 interface Zend_Controller_Dispatcher_Interface
 {
     /**

documentation/manual/en/module_specs/Zend_Controller-Exceptions.xml

@@ -70,7 +70,7 @@
                     you'd rather handle them yourself. As an example:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $front->throwExceptions(true);
 try {
     $front->dispatch();
@@ -114,7 +114,7 @@ try {
                     the <code>getException()</code> method. As an example:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $front->returnResponse(true);
 $response = $front->dispatch();
 if ($response->isException()) {
@@ -168,7 +168,7 @@ if ($response->isException()) {
                             the following directive:
                         </para>
 
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 $front->setParam('useDefaultControllerAlways', true);
 
 // or
@@ -218,7 +218,7 @@ $dispatcher->setParam('useDefaultControllerAlways', true);
                             example:
                         </para>
 
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 class My_Controller_Action extends Zend_Controller_Action
 {
     public function __call($method, $args)
@@ -247,7 +247,7 @@ class My_Controller_Action extends Zend_Controller_Action
                             verify the action exists. As an example:
                         </para>
 
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 class My_Controller_Dispatcher extends Zend_Controller_Dispatcher
 {
     public function getAction($request)
@@ -320,7 +320,7 @@ class My_Controller_Dispatcher extends Zend_Controller_Dispatcher
                             As an example:
                         </para>
 
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 class My_Controller_PreDispatchPlugin extends Zend_Controller_Plugin_Abstract
 {
     public function preDispatch(Zend_Controller_Request_Abstract $request)

documentation/manual/en/module_specs/Zend_Controller-FrontController.xml

@@ -58,7 +58,7 @@
                 at any point prior to calling <code>dispatch()</code>:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Disable the ErrorHandler plugin:
 $front->setParam('noErrorHandler', true);
 ]]></programlisting>
@@ -68,7 +68,7 @@ $front->setParam('noErrorHandler', true);
                 to calling <code>dispatch()</code>:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Disable the ViewRenderer helper:
 $front->setParam('noViewRenderer', true);
 ]]></programlisting>
@@ -94,7 +94,7 @@ $front->setParam('noViewRenderer', true);
                 instantiating a front controller object.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $front = Zend_Controller_Front::getInstance();
 ]]></programlisting>
         </sect3>
@@ -115,7 +115,7 @@ $front = Zend_Controller_Front::getInstance();
                 As some examples:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Set the default controller directory:
 $front->setControllerDirectory('../application/controllers');
 
@@ -249,7 +249,7 @@ $front->addControllerDirectory('../modules/foo/controllers', 'foo');
                 front controller environment.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Instantiate front controller, set controller directory, and dispatch in one
 // easy step:
 Zend_Controller_Front::run('../application/controllers');
@@ -537,7 +537,7 @@ Zend_Controller_Front::run('../application/controllers');
             to override the <code>getInstance()</code> method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class My_Controller_Front extends Zend_Controller_Front
 {
     public static function getInstance()

documentation/manual/en/module_specs/Zend_Controller-Migration.xml

@@ -155,7 +155,7 @@
                     the words of an action with a dash:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $viewRenderer =
     Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
 $inflector = $viewRenderer->getInflector();
@@ -189,7 +189,7 @@ $inflector->setFilterRule(':action', array(
                     flag, 'useCaseSensitiveActions':
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $front->setParam('useCaseSensitiveActions', true);
 ]]></programlisting>
 
@@ -233,7 +233,7 @@ $front->setParam('useCaseSensitiveActions', true);
             front controller parameter <code>noErrorHandler</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $front->setParam('noErrorHandler', true);
 ]]></programlisting>
 
@@ -253,7 +253,7 @@ $front->setParam('noErrorHandler', true);
             to dispatching:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Assuming $front is an instance of Zend_Controller_Front
 $front->setParam('noViewRenderer', true);
 ]]></programlisting>
@@ -282,7 +282,7 @@ $front->setParam('noViewRenderer', true);
             The easiest change is to disable auto-rendering for that method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $this->_helper->viewRenderer->setNoRender();
 ]]></programlisting>
 
@@ -293,7 +293,7 @@ $this->_helper->viewRenderer->setNoRender();
             methods:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 public function preDispatch()
 {
     // disable view script autorendering
@@ -354,7 +354,7 @@ public function preDispatch()
                     Prior to dispatching a front controller instance:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Assuming $view has already been defined
 $viewRenderer = new Zend_Controller_Action_Helper_ViewRenderer($view);
 Zend_Controller_Action_HelperBroker::addHelper($viewRenderer);
@@ -366,7 +366,7 @@ Zend_Controller_Action_HelperBroker::addHelper($viewRenderer);
                     Any time during the bootstrap process:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $viewRenderer =
     Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
 $viewRenderer->setView($view);
@@ -442,7 +442,7 @@ $viewRenderer->setView($view);
             remains the same:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 Zend_Controller_Front::run('/path/to/controllers');
 ]]></programlisting>
 
@@ -501,7 +501,7 @@ Zend_Controller_Front::run('/path/to/controllers');
                     have changed. The signature is now:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 final protected function _forward($action,
                                   $controller = null,
                                   $module = null,
@@ -530,11 +530,11 @@ final protected function _forward($action,
             still do each of the following:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 Zend_Controller_Front::run('/path/to/controllers');
 ]]></programlisting>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 /* -- create a router -- */
 $router = new Zend_Controller_RewriteRouter();
 $router->addRoute('user',
@@ -588,7 +588,7 @@ $ctrl->dispatch();
                             Set <code>throwExceptions()</code> in the front
                             controller:
                         </para>
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 $front->throwExceptions(true);
 ]]></programlisting>
                     </listitem>
@@ -598,7 +598,7 @@ $front->throwExceptions(true);
                             Set <code>renderExceptions()</code> in the response
                             object:
                         </para>
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 $response->renderExceptions(true);
 $front->setResponse($response);
 $front->dispatch();
@@ -684,7 +684,7 @@ echo $response;
                             as follows:
                         </para>
 
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 // Retrieve the requested controller name
 // Access used to be via: $this->_action->getControllerName().
 // The example below uses getRequest(), though you may also directly
@@ -713,7 +713,7 @@ $foo = $this->_getParam('foo', 'default');
                             action is using <code>__call()</code>:
                         </para>
 
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 public function __call($method, $args)
 {
     // If an unmatched 'Action' method was requested, pass on to the

documentation/manual/en/module_specs/Zend_Controller-Modular.xml

@@ -98,7 +98,7 @@ application/
             and the <code>default</code> key must be present. As an example:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $front->setControllerDirectory(array(
     'default' => '/path/to/application/controllers',
     'blog'    => '/path/to/application/blog/controllers'
@@ -112,7 +112,7 @@ $front->setControllerDirectory(array(
             <code>default</code> namespace. As an example:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $front->addControllerDirectory('/path/to/application/news/controllers',
                                'news');
 ]]></programlisting>
@@ -124,7 +124,7 @@ $front->addControllerDirectory('/path/to/application/news/controllers',
             <code>addModuleDirectory()</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 /**
  * Assuming the following directory structure:
  * application/
@@ -150,7 +150,7 @@ $front->addModuleDirectory('/path/to/application/modules');
             modules by using <code>setModuleControllerDirectoryName()</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 /**
  * Change the controllers subdirectory to be 'con'
  * application/
@@ -213,7 +213,7 @@ $front->addModuleDirectory('/path/to/application/modules');
             <code>useDefaultControllerAlways</code> parameter in the front controller:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $front->setParam('useDefaultControllerAlways', true);
 ]]></programlisting>
     </sect2>

documentation/manual/en/module_specs/Zend_Controller-Plugins-ErrorHandler.xml

@@ -107,7 +107,7 @@
             <classname>Zend_Controller_Action::_getParam('error_handler')</classname>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class ErrorController extends Zend_Controller_Action
 {
     public function errorAction()
@@ -150,7 +150,7 @@ class ErrorController extends Zend_Controller_Action
             indicate a 404 page:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class ErrorController extends Zend_Controller_Action
 {
     public function errorAction()
@@ -181,7 +181,7 @@ class ErrorController extends Zend_Controller_Action
             <code>error_handler</code> object:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 public function errorAction()
 {
         $errors = $this->_getParam('error_handler');
@@ -232,7 +232,7 @@ public function errorAction()
             clear the response body prior to rendering any views:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $this->getResponse()->clearBody();
 ]]></programlisting>
     </sect4>
@@ -242,7 +242,7 @@ $this->getResponse()->clearBody();
 
         <example id="zend.controller.plugins.standard.errorhandler.examples.example-1">
             <title>Standard Usage</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $front = Zend_Controller_Front::getInstance();
 $front->registerPlugin(new Zend_Controller_Plugin_ErrorHandler());
 ]]></programlisting>
@@ -250,7 +250,7 @@ $front->registerPlugin(new Zend_Controller_Plugin_ErrorHandler());
 
         <example id="zend.controller.plugins.standard.errorhandler.examples.example-2">
             <title>Setting a Different Error Handler</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $front = Zend_Controller_Front::getInstance();
 $front->registerPlugin(new Zend_Controller_Plugin_ErrorHandler(array(
     'module'     => 'mystuff',
@@ -262,7 +262,7 @@ $front->registerPlugin(new Zend_Controller_Plugin_ErrorHandler(array(
 
         <example id="zend.controller.plugins.standard.errorhandler.examples.example-3">
             <title>Using Accessors</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $plugin = new Zend_Controller_Plugin_ErrorHandler();
 $plugin->setErrorHandlerModule('mystuff')
        ->setErrorHandlerController('static')
@@ -282,7 +282,7 @@ $front->registerPlugin($plugin);
             controller. Below is a simple example.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class ErrorController extends Zend_Controller_Action
 {
     public function errorAction()

documentation/manual/en/module_specs/Zend_Controller-Plugins.xml

@@ -87,7 +87,7 @@
             abstract class <classname>Zend_Controller_Plugin_Abstract</classname>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class MyPlugin extends Zend_Controller_Plugin_Abstract
 {
     // ...
@@ -120,7 +120,7 @@ class MyPlugin extends Zend_Controller_Plugin_Abstract
             plugin may be used in the controller chain:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class MyPlugin extends Zend_Controller_Plugin_Abstract
 {
     public function routeStartup(Zend_Controller_Request_Abstract $request)
@@ -174,7 +174,7 @@ $front->dispatch();
             the following output:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <p>routeStartup() called</p>
 <p>routeShutdown() called</p>
 <p>dispatchLoopStartup() called</p>

documentation/manual/en/module_specs/Zend_Controller-QuickStart.xml

@@ -43,7 +43,7 @@
                 layout is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 application/
     controllers/
         IndexController.php
@@ -78,7 +78,7 @@ html/
                 follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} -s [OR]
 RewriteCond %{REQUEST_FILENAME} -l [OR]
@@ -106,7 +106,7 @@ RewriteRule ^.*$ index.php [NC,L]
                 configuration:
             </para>
 
-            <programlisting role="xml"><![CDATA[
+            <programlisting language="xml"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
      <system.webServer>
@@ -160,7 +160,7 @@ RewriteRule ^.*$ index.php [NC,L]
                 the following:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 Zend_Controller_Front::run('/path/to/app/controllers');
 ]]></programlisting>
 
@@ -214,7 +214,7 @@ Zend_Controller_Front::run('/path/to/app/controllers');
                 enter the following:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 /** Zend_Controller_Action */
 class IndexController extends Zend_Controller_Action
 {
@@ -260,7 +260,7 @@ class IndexController extends Zend_Controller_Action
                 this file, and type in some HTML:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 <!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -288,7 +288,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                 with an <code>errorAction</code> method:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class ErrorController extends Zend_Controller_Action
 {
     public function errorAction()
@@ -305,7 +305,7 @@ class ErrorController extends Zend_Controller_Action
                 content might look like:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 <!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

documentation/manual/en/module_specs/Zend_Controller-Request.xml

@@ -179,7 +179,7 @@
                     of the default Http class for your request object:
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $request = new Zend_Controller_Request_Apache404();
 $front->setRequest($request);
 ]]></programlisting>
@@ -236,7 +236,7 @@ $front->setRequest($request);
                 set a custom base URL:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 /**
  * Dispatch Request with custom base URL with Zend_Controller_Front.
  */
@@ -318,7 +318,7 @@ $response   = $controller->dispatch();
             basic, it defines the following methods:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 abstract class Zend_Controller_Request_Abstract
 {
     /**

documentation/manual/en/module_specs/Zend_Controller-Response.xml

@@ -17,7 +17,7 @@
             <classname>Zend_Controller_Front::throwExceptions(true)</classname>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $front->throwExceptions(true);
 ]]></programlisting>
 
@@ -26,7 +26,7 @@ $front->throwExceptions(true);
             <code>sendResponse()</code>.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $response->sendResponse();
 ]]></programlisting>
 
@@ -40,7 +40,7 @@ $response->sendResponse();
                 <classname>Zend_Controller_Front::returnResponse(true)</classname>:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $front->returnResponse(true);
 $response = $front->dispatch();
 
@@ -56,7 +56,7 @@ $response->sendResponse();
             headers, push them to the response object:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Within an action controller action:
 // Set a header
 $this->getResponse()
@@ -94,7 +94,7 @@ $this->getResponse()
             object instead of rendering output.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // retrieve post-dispatch:
 $front->dispatch();
 $response = $front->getResponse();
@@ -118,7 +118,7 @@ $response->sendResponse();
             front controller to throwExceptions(), as shown above:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $response->renderExceptions(true);
 $front->dispatch($request, $response);
 
@@ -256,7 +256,7 @@ $front->dispatch();
             footer:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Assume that this plugin class is registered with the front controller
 class MyPlugin extends Zend_Controller_Plugin_Abstract
 {
@@ -295,7 +295,7 @@ class MyController extends Zend_Controller_Action
             structure:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 array(
     'header'  => ..., // header content
     'default' => ..., // body content from MyController::fooAction()

documentation/manual/en/module_specs/Zend_Controller-Router-Route-Chain.xml

@@ -34,7 +34,7 @@
         routes chained together:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 // Create two routes
 $hostnameRoute = new Zend_Controller_Router_Route_Hostname(...);
 $pathRoute     = new Zend_Controller_Router_Route(...);
@@ -54,7 +54,7 @@ $chainedRoute = $hostnameRoute->chain($pathRoute);
         separator:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 // Create two routes
 $firstRoute  = new Zend_Controller_Router_Route('foo');
 $secondRoute = new Zend_Controller_Router_Route('bar');
@@ -81,7 +81,7 @@ echo $chainedRoute->assemble();
             like this:
         </para>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <routes>
     <www type="Zend_Controller_Router_Route_Hostname">
         <route>www.example.com</route>
@@ -131,7 +131,7 @@ echo $chainedRoute->assemble();
             chain-route type directly, and also just works in the root level:
         </para>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <routes>
     <www type="Zend_Controller_Router_Route_Chain">
         <route>www.example.com</route>
@@ -163,7 +163,7 @@ echo $chainedRoute->assemble();
             of separating the routes with a comma:
         </para>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <routes>
     <www-index type="Zend_Controller_Router_Route_Chain">
         <chain>www</chain>

documentation/manual/en/module_specs/Zend_Controller-Router-Route-Hostname.xml

@@ -17,7 +17,7 @@
         about the user "martel":
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $hostnameRoute = new Zend_Controller_Router_Route_Hostname(
     ':username.users.example.com',
     array(

documentation/manual/en/module_specs/Zend_Controller-Router-Route-Regex.xml

@@ -17,7 +17,7 @@
         route this time:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Regex(
     'archive/(\d+)',
     array(
@@ -35,7 +35,7 @@ $router->addRoute('archive', $route);
         array may look like:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $values = array(
     1            => '2006',
     'controller' => 'archive',
@@ -75,7 +75,7 @@ $values = array(
         You can get the contents of the defined subpatterns the usual way:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 public function showAction()
 {
     $request = $this->getRequest();
@@ -96,7 +96,7 @@ public function showAction()
         with the slash but catch only the numeric part:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Regex(
     'archive(?:/(\d+))?',
     array(
@@ -117,7 +117,7 @@ $router->addRoute('archive', $route);
         keys. Let's work on our easier example:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Regex(
     'archive/(\d+)',
     array(
@@ -135,7 +135,7 @@ $router->addRoute('archive', $route);
         This will result in following values injected into Request:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $values = array(
     'year'       => '2006',
     'controller' => 'archive',
@@ -148,7 +148,7 @@ $values = array(
         environment. Keys may contain variable names or subpattern indexes:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Regex(
     'archive/(\d+)',
     array( ... ),
@@ -176,7 +176,7 @@ $route = new Zend_Controller_Router_Route_Regex(
         variables if you wish:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Regex(
     'archive/(\d+)/page/(\d+)',
     array( ... ),
@@ -190,7 +190,7 @@ $route = new Zend_Controller_Router_Route_Regex(
         will result in following values:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $values = array(
     'year'       => '2006',
     2            => 10,
@@ -206,7 +206,7 @@ $values = array(
         sprintf() and is defined as a fourth construct parameter:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Regex(
     'archive/(\d+)',
     array( ... ),
@@ -227,7 +227,7 @@ $route = new Zend_Controller_Router_Route_Regex(
         With the Regex route, you can do something like the following solution:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Regex(
     'blog/archive/(\d+)-(.+)\.html',
     array(

documentation/manual/en/module_specs/Zend_Controller-Router-Route-Static.xml

@@ -10,7 +10,7 @@
         an overkill. The answer to this situation is to use static routes:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route_Static(
     'login',
     array('controller' => 'auth', 'action' => 'login')
@@ -51,7 +51,7 @@ $router->addRoute('login', $route);
             parameter to the front controller during bootstrapping:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $front->setParam('useDefaultControllerAlways', true);
 ]]></programlisting>
 

documentation/manual/en/module_specs/Zend_Controller-Router-Route.xml

@@ -19,7 +19,7 @@
         functionality could look like:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route(
     'author/:username',
     array(
@@ -60,7 +60,7 @@ $router->addRoute('user', $route);
         the following key and value pairs:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $values = array(
     'username'   => 'martel',
     'controller' => 'profile',
@@ -77,7 +77,7 @@ $values = array(
         <classname>Zend_Controller_Request::getParam()</classname> methods:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 public function userinfoAction()
 {
     $request = $this->getRequest();
@@ -94,7 +94,7 @@ public function userinfoAction()
         following route more-or-less mimics the Module route behavior:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route(
     ':module/:controller/:action/*',
     array('module' => 'default')
@@ -112,7 +112,7 @@ $router->addRoute('default', $route);
             representing variable names and with values as desired defaults:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route(
     'archive/:year',
     array('year' => 2006)
@@ -137,7 +137,7 @@ $router->addRoute('archive', $route);
             action as the route's defaults:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route(
     'archive/:year',
     array(
@@ -167,7 +167,7 @@ $router->addRoute('archive', $route);
             expression:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $route = new Zend_Controller_Router_Route(
     'archive/:year',
     array(
@@ -275,7 +275,7 @@ $router->addRoute('archive', $route);
             translated segment usage:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Prepare the translator
 $translator = new Zend_Translate('array', array(), 'en');
 $translator->addTranslation(array('archive' => 'archiv',
@@ -295,7 +295,7 @@ Zend_Controller_Router_Route::setDefaultTranslator($translator);
             This example demonstrates the usage of static segments:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Create the route
 $route = new Zend_Controller_Router_Route(
     '@archive',
@@ -318,7 +318,7 @@ $route->assemble(array());
             translated version:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Create the route
 $route = new Zend_Controller_Router_Route(
     ':@controller/:@action/*',
@@ -340,7 +340,7 @@ $route->assemble(array('controller' => 'archive', 'foo' => 'bar'));
             You can also mix static and dynamic segments:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Create the route
 $route = new Zend_Controller_Router_Route(
     '@archive/:@mode/:value',

documentation/manual/en/module_specs/Zend_Controller-Router.xml

@@ -26,7 +26,7 @@
             with a single Apache mod_rewrite rule (one of):
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 RewriteEngine on
 RewriteRule !\.(js|ico|gif|jpg|png|css|html)$ index.php
 ]]></programlisting>
@@ -35,7 +35,7 @@ RewriteRule !\.(js|ico|gif|jpg|png|css|html)$ index.php
             or (preferred):
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} -s [OR]
 RewriteCond %{REQUEST_FILENAME} -l [OR]
@@ -50,7 +50,7 @@ RewriteRule ^.*$ index.php [NC,L]
             installed as an Isapi extension with the following rewrite rule:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 RewriteRule ^[\w/\%]*(?:\.(?!(?:js|ico|gif|jpg|png|css|html)$)[\w\%]*$)? /index.php [I]
 ]]></programlisting>
 
@@ -70,7 +70,7 @@ RewriteRule ^[\w/\%]*(?:\.(?!(?:js|ico|gif|jpg|png|css|html)$)[\w\%]*$)? /index.
             configured as follows:
         </para>
 
-        <programlisting role="xml"><![CDATA[
+        <programlisting language="xml"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
      <system.webServer>
@@ -102,7 +102,7 @@ RewriteRule ^[\w/\%]*(?:\.(?!(?:js|ico|gif|jpg|png|css|html)$)[\w\%]*$)? /index.
             If using Lighttpd, the following rewrite rule is valid:
         </para>
 
-        <programlisting role="lighttpd"><![CDATA[
+        <programlisting language="lighttpd"><![CDATA[
 url.rewrite-once = (
     ".*\?(.*)$" => "/index.php?$1",
     ".*\.(js|ico|gif|jpg|png|css|html)$" => "$0",
@@ -120,7 +120,7 @@ url.rewrite-once = (
             following code illustrates the procedure:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Create a router
 
 $router = $ctrl->getRouter(); // returns a rewrite router by default
@@ -143,7 +143,7 @@ $router->addRoute(
             <classname>Zend_Controller_Router_Route_Interface</classname>. Eg.:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $router->addRoute('user',
                   new Zend_Controller_Router_Route('user/:username'));
 ]]></programlisting>
@@ -182,7 +182,7 @@ $router->addRoute('user',
                 <classname>Zend_View</classname> url helper:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 <a href=
 "<?php echo $this->url(array('username' => 'martel'), 'user') ?>">Martel</a>
 ]]></programlisting>
@@ -265,7 +265,7 @@ $router->addRoute('user',
             Some examples of how such routes are matched:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Assuming the following:
 $ctrl->setControllerDirectory(
     array(
@@ -310,7 +310,7 @@ http://example/blog/archive/list/sort/alpha/date/desc
             more-or-less like below:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $compat = new Zend_Controller_Router_Route_Module(array(),
                                                   $dispatcher,
                                                   $request);
@@ -324,7 +324,7 @@ $this->addRoute('default', $compat);
             altogether by using <code>removeDefaultRoutes()</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Remove any default routes
 $router->removeDefaultRoutes();
 ]]></programlisting>
@@ -351,7 +351,7 @@ $router->removeDefaultRoutes();
                 linkend="zend.controller.request.http.baseurl" />):
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $request->setBaseUrl('/~user/application-root/');
 ]]></programlisting>
 
@@ -369,7 +369,7 @@ $request->setBaseUrl('/~user/application-root/');
             way:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $router->setGlobalParam('lang', 'en');
 ]]></programlisting>
     </sect2>
@@ -398,7 +398,7 @@ $router->setGlobalParam('lang', 'en');
             As an example, consider the following INI file:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 [production]
 routes.archive.route = "archive/:year/*"
 routes.archive.defaults.controller = archive
@@ -424,7 +424,7 @@ routes.archive.map.1 = "year"
             object as follows:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $config = new Zend_Config_Ini('/path/to/config.ini', 'production');
 $router = new Zend_Controller_Router_Rewrite();
 $router->addConfig($config, 'routes');
@@ -465,7 +465,7 @@ $router->addConfig($config, 'routes');
             method.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 interface Zend_Controller_Router_Interface
 {
   /**

documentation/manual/en/module_specs/Zend_Currency-Migrating.xml

@@ -22,7 +22,7 @@
             <code>setFormat()</code> method.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $currency = new Zend_Currency($currency, $locale);
 ]]></programlisting>
 
@@ -86,7 +86,7 @@ $currency = new Zend_Currency($currency, $locale);
 
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $currency->setFormat(array $options);
 ]]></programlisting>
 
@@ -96,7 +96,7 @@ $currency->setFormat(array $options);
             can contain the same keys as for the <code>setFormat</code> method.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $currency->toCurrency($value, array $options);
 ]]></programlisting>
 

documentation/manual/en/module_specs/Zend_Currency-Usage.xml

@@ -21,7 +21,7 @@
             formatting rules from 'en_US'.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $currency = new Zend_Currency();
 ]]></programlisting>
 
@@ -33,7 +33,7 @@ $currency = new Zend_Currency();
         you want to use the same locale throughout the application.
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 // in your bootstrap file
 $locale = new Zend_Locale('de_AT');
 Zend_Registry::set('Zend_Locale', $locale);
@@ -92,7 +92,7 @@ $currency = new Zend_Currency();
 
         <title>Other Ways to Create Instances of Zend_Currency</title>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // expect standard locale 'de_AT'
 
 // creates an instance from 'en_US' using 'USD' which is default
@@ -151,7 +151,7 @@ $currency = new Zend_Currency('en_US', 'EUR');
 
             <title>Creating an Output String for a Currency</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // creates an instance with 'en_US' using 'USD', which is the default
 // values for 'en_US'
 $currency = new Zend_Currency('en_US');
@@ -358,7 +358,7 @@ echo $currency->toCurrency(1000, array('script' => 'Arab'));
 
             <title>Changing the displayed format of a currency</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // creates an instance with 'en_US' using 'USD', 'Latin' and 'en_US' as
 // these are the default values from 'en_US'
 $currency = new Zend_Currency('en_US');
@@ -457,7 +457,7 @@ echo $currency->toCurrency(1000);
 
             <title>Getting Information about Currencies</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // creates an instance with 'en_US' using 'USD', 'Latin' and 'en_US'
 // as these are the default values from 'en_US'
 $currency = new Zend_Currency('en_US');
@@ -498,7 +498,7 @@ print_r($currency->getCurrencyList('de_AT');
 
             <title>Setting a New Locale</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // get the currency for US
 $currency = new Zend_Currency('en_US');
 print $currency->toCurrency(1000);
@@ -528,7 +528,7 @@ print $currency->toCurrency(1000);
 
             <title>Caching currencies</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // creating a cache object
 $cache = Zend_Cache::factory('Core',
                              'File',

documentation/manual/en/module_specs/Zend_Date-Additional.xml

@@ -50,7 +50,7 @@
 
         <example id="zend.date.additional.checking.example-1">
             <title>Checking Dates</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Checking dates
 $date = '01.03.2000';
 if (Zend_Date::isDate($date)) {
@@ -104,7 +104,7 @@ if (Zend_Date::isDate($date,'dd MMMM yyyy', 'en')) {
 
         <example id="zend.date.additional.sunrise-sunset.example-1">
             <title>Getting all Available Cities</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Output the complete list of available cities
 print_r (Zend_Date_Cities::getCityList());
 ]]></programlisting>
@@ -164,7 +164,7 @@ print_r (Zend_Date_Cities::getCityList());
 
         <example id="zend.date.additional.sunrise-sunset.example-2">
             <title>Getting the Location for a City</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Get the location for a defined city
 // uses the effective horizon as no horizon is defined
 print_r (Zend_Date_Cities::City('Vienna'));
@@ -187,7 +187,7 @@ $mylocation = array('latitude' => 41.5, 'longitude' => 13.2446);
 
         <example id="zend.date.additional.sunrise-sunset.example-3">
             <title>Calculating Sun Information</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Get the location for a defined city
 $city = Zend_Date_Cities::City('Vienna');
 
@@ -240,7 +240,7 @@ foreach ($info as $sun) {
 
         <example id="zend.date.additional.timezones.example-1">
             <title>Working with Time Zones</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Set a default timezone... this has to be done within the bootstrap
 // file or php.ini.
 // We do this here just for having a complete example.
@@ -282,7 +282,7 @@ print $date->getIso();
 
         <example id="zend.date.additional.timezones.example-2">
             <title>Multiple Time Zones</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Set a default timezone... this has to be done within the bootstrap
 // file or php.ini.
 // We do this here just for having a complete example.

documentation/manual/en/module_specs/Zend_Date-Basic.xml

@@ -35,7 +35,7 @@
 
         <example id="zend.date.basic.creation.example-1">
             <title>Creating the Current Date</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 
 // Output of the current timestamp
@@ -65,7 +65,7 @@ print $date;
 
             <example id="zend.date.simple.functions.get.example-1">
                 <title>get() - Output a Date</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 
 // Output of the desired date
@@ -86,7 +86,7 @@ print $date->get();
 
             <example id="zend.date.simple.functions.set.example-1">
                 <title>set() - Set a Date</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 
 // Setting of a new time
@@ -110,7 +110,7 @@ print $date->get(Zend_Date::W3C);
 
             <example id="zend.date.simple.functions.add.example-1">
                 <title>add() - Adding Dates</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 
 // changes $date by adding 12 hours
@@ -138,7 +138,7 @@ echo "Date via toString() = ", $date, "\n";
 
             <example id="zend.date.simple.functions.compare.example-1">
                 <title>compare() - Compare Dates</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 
 // Comparation of both times
@@ -156,7 +156,7 @@ if ($date->compare(10, Zend_Date::MINUTE) == -1) {
 
             <example id="zend.date.simple.functions.compare.example-2">
                 <title>equals() - Identify a Date or Date Part</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 
 // Comparation of the two dates

documentation/manual/en/module_specs/Zend_Date-Constants.xml

@@ -683,7 +683,7 @@
 
         <example id="zend.date.constants.selfdefinedformats.example-1">
             <title>Self-Defined ISO Formats</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de_AT');
 $date = new Zend_Date(1234567890, false, $locale);
 print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
@@ -1127,7 +1127,7 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
 
         <example id="zend.date.constants.phpformats.example-1">
             <title>Self-Defined Formats with PHP Specifier</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de_AT');
 Zend_Date::setOptions(array('format_type' => 'php'));
 $date = new Zend_Date(1234567890, false, $locale);

documentation/manual/en/module_specs/Zend_Date-Creation.xml

@@ -31,7 +31,7 @@
                 most used way to get the actual date as <classname>Zend_Date</classname> instance.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 ]]></programlisting>
 
@@ -48,7 +48,7 @@ $date = new Zend_Date();
                 always return the actual date and can not be changed by giving optional parameters.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $date = Zend_Date::now();
 ]]></programlisting>
 
@@ -89,7 +89,7 @@ $date = Zend_Date::now();
                 for creating a timestamp through a query is much smaller than converting it to a specified format.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // SELECT UNIX_TIMESTAMP(my_datetime_column) FROM my_table
 $date = new Zend_Date($unixtimestamp, Zend_Date::TIMESTAMP);
 ]]></programlisting>
@@ -112,7 +112,7 @@ $date = new Zend_Date($unixtimestamp, Zend_Date::TIMESTAMP);
                 for dates after 1 January 1970.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // SELECT datecolumn FROM my_table
 $date = new Zend_Date($datecolumn, Zend_Date::ISO_8601);
 ]]></programlisting>
@@ -175,7 +175,7 @@ $date = new Zend_Date($datecolumn, Zend_Date::ISO_8601);
                 given the hour <emphasis>0</emphasis> is used.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $datearray = array('year' => 2006,
                    'month' => 4,
                    'day' => 18,
@@ -185,7 +185,7 @@ $datearray = array('year' => 2006,
 $date = new Zend_Date($datearray);
 ]]></programlisting>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $datearray = array('year' => 2006, 'month' => 4, 'day' => 18);
 $date = new Zend_Date($datearray);
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Date-Introduction.xml

@@ -45,7 +45,7 @@
             .
             <example id="zend.date.setdefaulttimezone.example-1">
                 <title>Setting a Default Timezone</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // timezone for an American in California
 date_default_timezone_set('America/Los_Angeles');
 // timezone for a German in Germany

documentation/manual/en/module_specs/Zend_Date-Overview.xml

@@ -153,7 +153,7 @@
 
         <example id="zend.date.values.example-1">
             <title>User-Specified Input Date Format</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $date1 = new Zend_Date('Feb 31, 2007', null, 'en_US');
 echo $date1, "\n"; // outputs "Mar 3, 2007 12:00:00 AM"
 
@@ -190,7 +190,7 @@ echo $date3, "\n"; // outputs "Mar 3, 2007 12:00:00 AM"
             you want to use the same locale multiple times.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // in your bootstrap file
 $locale = new Zend_Locale('de_AT');
 Zend_Registry::set('Zend_Locale', $locale);
@@ -218,7 +218,7 @@ $date = new Zend_Date('31.Feb.2007');
 
         <example id="zend.date.basic.example-1">
             <title>Operating on Parts of Dates</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $date = new Zend_Date(); // $date's timestamp === time()
 
 // changes $date by adding 12 hours

documentation/manual/en/module_specs/Zend_Db_Adapter.xml

@@ -120,7 +120,7 @@
 
             <example id="zend.db.adapter.connecting.constructor.example">
                 <title>Using an Adapter Constructor</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db = new Zend_Db_Adapter_Pdo_Mysql(array(
     'host'     => '127.0.0.1',
     'username' => 'webuser',
@@ -154,7 +154,7 @@ $db = new Zend_Db_Adapter_Pdo_Mysql(array(
 
             <example id="zend.db.adapter.connecting.factory.example">
                 <title>Using the Adapter Factory Method</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // We don't need the following statement because the
 // Zend_Db_Adapter_Pdo_Mysql file will be loaded for us by the Zend_Db
 // factory method.
@@ -183,7 +183,7 @@ $db = Zend_Db::factory('Pdo_Mysql', array(
 
             <example id="zend.db.adapter.connecting.factory.example2">
                 <title>Using the Adapter Factory Method for a Custom Adapter Class</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // We don't need to load the adapter class file
 // because it will be loaded for us by the Zend_Db factory method.
 
@@ -229,7 +229,7 @@ $db = Zend_Db::factory('Pdo_Mysql', array(
                     <link linkend="zend.config.adapters.ini">Zend_Config_Ini</link>
                     and <link linkend="zend.config.adapters.xml">Zend_Config_Xml</link>.
                 </para>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $config = new Zend_Config(
     array(
         'database' => array(
@@ -345,7 +345,7 @@ $db = Zend_Db::factory($config->database);
                     <classname>Zend_Db::CASE_UPPER</classname>, and
                     <classname>Zend_Db::CASE_LOWER</classname>.
                 </para>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $options = array(
     Zend_Db::CASE_FOLDING => Zend_Db::CASE_UPPER
 );
@@ -376,7 +376,7 @@ $db = Zend_Db::factory('Db2', $params);
                     to delimit identifiers, you must do so yourself using the
                     <code>quoteIdentifier()</code> method.
                 </para>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $options = array(
     Zend_Db::AUTO_QUOTE_IDENTIFIERS => false
 );
@@ -395,7 +395,7 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
 
             <example id="zend.db.adapter.connecting.parameters.example3">
                 <title>Passing PDO Driver Options to the Factory</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $pdoParams = array(
     PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true
 );
@@ -417,7 +417,7 @@ echo $db->getConnection()
 
             <example id="zend.db.adapter.connecting.parameters.example4">
                 <title>Passing Serialization Options to the Factory</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $options = array(
     Zend_Db::ALLOW_SERIALIZATION => false
 );
@@ -486,7 +486,7 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
 
             <example id="zend.db.adapter.connecting.getconnection.example">
                 <title>Handling Connection Exceptions</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 try {
     $db = Zend_Db::factory('Pdo_Mysql', $parameters);
     $db->getConnection();
@@ -553,7 +553,7 @@ try {
             extensively by the automated unit tests for <classname>Zend_Db</classname>.
         </para>
 
-        <programlisting role="sql"><![CDATA[
+        <programlisting language="sql"><![CDATA[
 CREATE TABLE accounts (
   account_name      VARCHAR(100) NOT NULL PRIMARY KEY
 );
@@ -632,7 +632,7 @@ CREATE TABLE bugs_products (
 
             <example id="zend.db.adapter.select.fetchall.example">
                 <title>Using fetchAll()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $sql = 'SELECT * FROM bugs WHERE bug_id = ?';
 
 $result = $db->fetchAll($sql, 2);
@@ -725,7 +725,7 @@ $result = $db->fetchAll($sql, 2);
 
             <example id="zend.db.adapter.select.fetch-mode.example">
                 <title>Using setFetchMode()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->setFetchMode(Zend_Db::FETCH_OBJ);
 
 $result = $db->fetchAll('SELECT * FROM bugs WHERE bug_id = ?', 2);
@@ -749,7 +749,7 @@ echo $result[0]->bug_description;
 
             <example id="zend.db.adapter.select.fetchassoc.example">
                 <title>Using fetchAssoc()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->setFetchMode(Zend_Db::FETCH_OBJ);
 
 $result = $db->fetchAssoc('SELECT * FROM bugs WHERE bug_id = ?', 2);
@@ -775,7 +775,7 @@ echo $result[0]['bug_description'];
 
             <example id="zend.db.adapter.select.fetchcol.example">
                 <title>Using fetchCol()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->setFetchMode(Zend_Db::FETCH_OBJ);
 
 $result = $db->fetchCol(
@@ -810,7 +810,7 @@ echo $result[0];
 
             <example id="zend.db.adapter.select.fetchpairs.example">
                 <title>Using fetchPairs()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->setFetchMode(Zend_Db::FETCH_OBJ);
 
 $result = $db->fetchPairs('SELECT bug_id, bug_status FROM bugs');
@@ -832,7 +832,7 @@ echo $result[2];
 
             <example id="zend.db.adapter.select.fetchrow.example">
                 <title>Using fetchRow()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->setFetchMode(Zend_Db::FETCH_OBJ);
 
 $result = $db->fetchRow('SELECT * FROM bugs WHERE bug_id = 2');
@@ -858,7 +858,7 @@ echo $result->bug_description;
 
             <example id="zend.db.adapter.select.fetchone.example">
                 <title>Using fetchOne()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $result = $db->fetchOne('SELECT bug_status FROM bugs WHERE bug_id = 2');
 
 // this is a single string value
@@ -892,7 +892,7 @@ echo $result;
 
             <example id="zend.db.adapter.write.insert.example">
                 <title>Inserting in a Table</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $data = array(
     'created_on'      => '2007-03-22',
     'bug_description' => 'Something wrong',
@@ -930,7 +930,7 @@ $db->insert('bugs', $data);
 
             <example id="zend.db.adapter.write.insert.example2">
                 <title>Inserting Expressions in a Table</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $data = array(
     'created_on'      => new Zend_Db_Expr('CURDATE()'),
     'bug_description' => 'Something wrong',
@@ -966,7 +966,7 @@ $db->insert('bugs', $data);
 
             <example id="zend.db.adapter.write.lastinsertid.example-1">
                 <title>Using lastInsertId() for an Auto-Increment Key</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->insert('bugs', $data);
 
 // return the last value generated by an auto-increment column
@@ -990,7 +990,7 @@ $id = $db->lastInsertId();
 
             <example id="zend.db.adapter.write.lastinsertid.example-2">
                 <title>Using lastInsertId() for a Sequence</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->insert('bugs', $data);
 
 // return the last value generated by sequence 'bugs_bug_id_seq'.
@@ -1010,7 +1010,7 @@ $id = $db->lastInsertId('bugs');
 
             <example id="zend.db.adapter.write.lastinsertid.example-3">
                 <title>Using lastSequenceId()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db->insert('bugs', $data);
 
 // return the last value generated by sequence 'bugs_id_gen'.
@@ -1102,7 +1102,7 @@ $id = $db->lastSequenceId('bugs_id_gen');
 
             <example id="zend.db.adapter.write.update.example">
                 <title>Updating Rows</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $data = array(
     'updated_on'      => '2007-03-23',
     'bug_status'      => 'FIXED'
@@ -1125,7 +1125,7 @@ $n = $db->update('bugs', $data, 'bug_id = 2');
 
             <example id="zend.db.adapter.write.update.example-array">
                 <title>Updating Rows Using an Array of Expressions</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $data = array(
     'updated_on'      => '2007-03-23',
     'bug_status'      => 'FIXED'
@@ -1169,7 +1169,7 @@ $n = $db->update('bugs', $data, $where);
 
             <example id="zend.db.adapter.write.delete.example">
                 <title>Deleting Rows</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $n = $db->delete('bugs', 'bug_id = 3');
 ]]></programlisting>
             </example>
@@ -1200,7 +1200,7 @@ $n = $db->delete('bugs', 'bug_id = 3');
             symbols, such as the quote symbol, it could result in invalid SQL.
             For example, notice the imbalanced quote characters in the
             following query:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $name = "O'Reilly";
 $sql = "SELECT * FROM bugs WHERE reported_by = '$name'";
 
@@ -1245,7 +1245,7 @@ echo $sql;
 
             <example id="zend.db.adapter.quoting.quote.example">
                 <title>Using quote()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $name = $db->quote("O'Reilly");
 echo $name;
 // 'O\'Reilly'
@@ -1274,7 +1274,7 @@ echo $sql;
                 implementations, assuming <code>intColumn</code> has a SQL
                 datatype of <code>INTEGER</code>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 SELECT * FROM atable WHERE intColumn = '123'
 ]]></programlisting>
             </para>
@@ -1287,7 +1287,7 @@ SELECT * FROM atable WHERE intColumn = '123'
 
             <example id="zend.db.adapter.quoting.quote.example-2">
                 <title>Using quote() with a SQL Type</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $value = '1234';
 $sql = 'SELECT * FROM atable WHERE intColumn = '
      . $db->quote($value, 'INTEGER');
@@ -1338,7 +1338,7 @@ $sql = 'SELECT * FROM atable WHERE intColumn = '
 
             <example id="zend.db.adapter.quoting.quote-into.example">
                 <title>Using quoteInto()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $sql = $db->quoteInto("SELECT * FROM bugs WHERE reported_by = ?", "O'Reilly");
 
 echo $sql;
@@ -1354,7 +1354,7 @@ echo $sql;
 
             <example id="zend.db.adapter.quoting.quote-into.example-2">
                 <title>Using quoteInto() with a SQL Type</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $sql = $db
     ->quoteInto("SELECT * FROM bugs WHERE bug_id = ?", '1234', 'INTEGER');
 
@@ -1404,7 +1404,7 @@ echo $sql;
 
             <example id="zend.db.adapter.quoting.quote-identifier.example">
                 <title>Using quoteIdentifier()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // we might have a table name that is an SQL reserved word
 $tableName = $db->quoteIdentifier("order");
 
@@ -1486,7 +1486,7 @@ echo $sql
 
         <example id="zend.db.adapter.transactions.example">
             <title>Managing a Transaction to Ensure Consistency</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Start a transaction explicitly.
 $db->beginTransaction();
 
@@ -1690,7 +1690,7 @@ try {
 
         <example id="zend.db.adapter.closing.example">
             <title>Closing a Database Connection</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $db->closeConnection();
 ]]></programlisting>
         </example>
@@ -1749,7 +1749,7 @@ $db->closeConnection();
 
         <example id="zend.db.adapter.other-statements.example">
             <title>Running a Non-Prepared Statement in a PDO Adapter</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $result = $db->getConnection()->exec('DROP TABLE bugs');
 ]]></programlisting>
         </example>
@@ -1781,7 +1781,7 @@ $result = $db->getConnection()->exec('DROP TABLE bugs');
 
         <example id="zend.db.adapter.server-version.example">
             <title>Verifying server version before running a query</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $version = $db->getServerVersion();
 if (!is_null($version)) {
     if (version_compare($version, '5.0.0', '>=')) {

documentation/manual/en/module_specs/Zend_Db_Profiler-Firebug.xml

@@ -39,7 +39,7 @@
     <example id="zend.db.profiler.profilers.firebug.example.with_front_controller">
         <title>DB Profiling with Zend_Controller_Front</title>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // In your bootstrap file
 
 $profiler = new Zend_Db_Profiler_Firebug('All DB Queries');
@@ -58,7 +58,7 @@ $db->setProfiler($profiler)
     <example id="zend.db.profiler.profilers.firebug.example.without_front_controller">
         <title>DB Profiling without Zend_Controller_Front</title>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $profiler = new Zend_Db_Profiler_Firebug('All DB Queries');
 $profiler->setEnabled(true);
 

documentation/manual/en/module_specs/Zend_Db_Profiler.xml

@@ -22,7 +22,7 @@
             constructor, or by asking the adapter to enable it later.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $params = array(
     'host'     => '127.0.0.1',
     'username' => 'webuser',
@@ -51,7 +51,7 @@ $db->getProfiler()->setEnabled(true);
             A boolean argument sets the profiler to enabled if it is a <code>true</code> value, or disabled if
             <code>false</code>. The profiler class is the adapter's default profiler class,
             <classname>Zend_Db_Profiler</classname>.
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $params['profiler'] = true;
 $db = Zend_Db::factory('PDO_MYSQL', $params);
 ]]></programlisting>
@@ -60,7 +60,7 @@ $db = Zend_Db::factory('PDO_MYSQL', $params);
         <para>
             An instance of a profiler object makes the adapter use that object. The object type must be
             <classname>Zend_Db_Profiler</classname> or a subclass thereof. Enabling the profiler is done separately.
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $profiler = MyProject_Db_Profiler();
 $profiler->setEnabled(true);
 $params['profiler'] = $profiler;
@@ -75,7 +75,7 @@ $db = Zend_Db::factory('PDO_MYSQL', $params);
             to name a class to use for a custom profiler. The class must be <classname>Zend_Db_Profiler</classname> or a
             subclass. The class is instantiated with no constructor arguments. The '<code>class</code>' option is
             ignored when the '<code>instance</code>' option is supplied.
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $params['profiler'] = array(
     'enabled' => true,
     'class'   => 'MyProject_Db_Profiler'
@@ -86,7 +86,7 @@ $db = Zend_Db::factory('PDO_MYSQL', $params);
 
         <para>
             Finally, the argument can be an object of type <classname>Zend_Config</classname> containing properties, which are treated as the array keys described above. For example, a file "config.ini" might contain the following data:
-            <programlisting role="ini"><![CDATA[
+            <programlisting language="ini"><![CDATA[
 [main]
 db.profiler.class   = "MyProject_Db_Profiler"
 db.profiler.enabled = true
@@ -94,14 +94,14 @@ db.profiler.enabled = true
 
             This configuration can be applied by the following PHP code:
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $config = new Zend_Config_Ini('config.ini', 'main');
 $params['profiler'] = $config->db->profiler;
 $db = Zend_Db::factory('PDO_MYSQL', $params);
 ]]></programlisting>
 
             The '<code>instance</code>' property may be used as in the following:
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $profiler = new MyProject_Db_Profiler();
 $profiler->setEnabled(true);
 $configData = array(
@@ -125,7 +125,7 @@ $db = Zend_Db::factory('PDO_MYSQL', $params);
             <code>getProfiler()</code> method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $profiler = $db->getProfiler();
 ]]></programlisting>
 
@@ -211,7 +211,7 @@ $profiler = $db->getProfiler();
             last run:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $query = $profiler->getLastQueryProfile();
 
 echo $query->getQuery();
@@ -223,7 +223,7 @@ echo $query->getQuery();
             through the queries to find the one that ran longest:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $totalTime    = $profiler->getTotalElapsedSecs();
 $queryCount   = $profiler->getTotalNumQueries();
 $longestTime  = 0;
@@ -266,7 +266,7 @@ echo "Longest query: \n" . $longestQuery . "\n";
                 filter, pass the method a null value.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Only profile queries that take at least 5 seconds:
 $profiler->setFilterElapsedSecs(5);
 
@@ -337,7 +337,7 @@ $profiler->setFilterElapsedSecs(null);
                 argument.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // profile only SELECT queries
 $profiler->setFilterQueryType(Zend_Db_Profiler::SELECT);
 
@@ -369,7 +369,7 @@ $profiler->setFilterQueryType(null);
                 for a list of the query type constants.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Retrieve only SELECT query profiles
 $profiles = $profiler->getQueryProfiles(Zend_Db_Profiler::SELECT);
 

documentation/manual/en/module_specs/Zend_Db_Select.xml

@@ -70,7 +70,7 @@
 
             <title>Example of the database adapter's select() method</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $db = Zend_Db::factory( ...options... );
 $select = $db->select();
 ]]></programlisting>
@@ -86,7 +86,7 @@ $select = $db->select();
 
             <title>Example of creating a new Select object</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $db = Zend_Db::factory( ...options... );
 $select = new Zend_Db_Select($db);
 ]]></programlisting>
@@ -108,7 +108,7 @@ $select = new Zend_Db_Select($db);
 
             <title>Example of the using methods to add clauses</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Create the Zend_Db_Select object
 $select = $db->select();
 
@@ -134,7 +134,7 @@ $select->order( ...specify sorting criteria... );
 
             <title>Example of the using the fluent interface</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $select = $db->select()
     ->from( ...specify table and columns... )
     ->where( ...specify search criteria... )
@@ -164,7 +164,7 @@ $select = $db->select()
 
                 <title>Example of the from() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT *
 //   FROM "products"
@@ -188,7 +188,7 @@ $select = $db->select()
 
                 <title>Example of specifying a table correlation name</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p.*
 //   FROM "products" AS p
@@ -211,7 +211,7 @@ $select = $db->select()
 
                 <title>Example of specifying a schema name</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT *
 //   FROM "myschema"."products"
@@ -264,7 +264,7 @@ $select = $db->select()
 
                 <title>Examples of specifying columns</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", p."product_name"
 //   FROM "products" AS p
@@ -326,7 +326,7 @@ $select = $db->select()
 
                 <title>Examples of specifying columns containing expressions</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", LOWER(product_name)
 //   FROM "products" AS p
@@ -389,7 +389,7 @@ $select = $db->select()
 
                 <title>Examples of quoting columns in an expression</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query,
 // quoting the special column name "from" in the expression:
 //   SELECT p."from" + 10 AS origin
@@ -424,7 +424,7 @@ $select = $db->select()
 
                 <title>Examples of adding columns with the columns() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", p."product_name"
 //   FROM "products" AS p
@@ -462,7 +462,7 @@ $select = $db->select()
 
                 <title>Example of the join() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", p."product_name", l.*
 //   FROM "products" AS p JOIN "line_items" AS l
@@ -511,7 +511,7 @@ $select = $db->select()
 
                 <title>Example of specifying no columns</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", p."product_name"
 //   FROM "products" AS p JOIN "line_items" AS l
@@ -664,7 +664,7 @@ $select = $db->select()
 
                 <title>Example of the joinUsing() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT *
 //   FROM "table1"
@@ -728,7 +728,7 @@ $select = $db->select()
 
                 <title>Example of the where() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT product_id, product_name, price
 //   FROM "products"
@@ -769,7 +769,7 @@ $select = $db->select()
 
                 <title>Example of a parameter in the where() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT product_id, product_name, price
 //   FROM "products"
@@ -795,7 +795,7 @@ $select = $db->select()
 
                 <title>Example of multiple where() methods</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT product_id, product_name, price
 //   FROM "products"
@@ -825,7 +825,7 @@ $select = $db->select()
 
                 <title>Example of the orWhere() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT product_id, product_name, price
 //   FROM "products"
@@ -854,7 +854,7 @@ $select = $db->select()
 
                 <title>Example of parenthesizing Boolean expressions</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT product_id, product_name, price
 //   FROM "products"
@@ -904,7 +904,7 @@ $select = $db->select()
 
                 <title>Example of the group() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", COUNT(*) AS line_items_per_product
 //   FROM "products" AS p JOIN "line_items" AS l
@@ -957,7 +957,7 @@ $select = $db->select()
 
                 <title>Example of the having() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", COUNT(*) AS line_items_per_product
 //   FROM "products" AS p JOIN "line_items" AS l
@@ -1021,7 +1021,7 @@ $select = $db->select()
 
                 <title>Example of the order() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", COUNT(*) AS line_items_per_product
 //   FROM "products" AS p JOIN "line_items" AS l
@@ -1066,7 +1066,7 @@ $select = $db->select()
 
                 <title>Example of the limit() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", p."product_name"
 //   FROM "products" AS p
@@ -1105,7 +1105,7 @@ $select = $db->select()
 
                 <title>Example of the limitPage() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p."product_id", p."product_name"
 //   FROM "products" AS p
@@ -1134,7 +1134,7 @@ $select = $db->select()
 
                 <title>Example of the distinct() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT DISTINCT p."product_name"
 //   FROM "products" AS p
@@ -1161,7 +1161,7 @@ $select = $db->select()
 
                 <title>Example of forUpdate() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT FOR UPDATE p.*
 //   FROM "products" AS p
@@ -1204,7 +1204,7 @@ $select = $db->select()
 
                 <title>Example using the Db adapter's query() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $select = $db->select()
              ->from('products');
 
@@ -1231,7 +1231,7 @@ $result = $stmt->fetchAll();
 
                 <title>Example using the Select object's query method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $select = $db->select()
              ->from('products');
 
@@ -1256,7 +1256,7 @@ $result = $stmt->fetchAll();
 
                 <title>Example of the __toString() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $select = $db->select()
              ->from('products');
 
@@ -1384,7 +1384,7 @@ echo "$sql\n";
 
                 <title>Example of the getPart() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $select = $db->select()
              ->from('products')
              ->order('product_id');
@@ -1429,7 +1429,7 @@ print_r( $orderData );
 
                 <title>Example of the reset() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Build this query:
 //   SELECT p.*
 //   FROM "products" AS p

documentation/manual/en/module_specs/Zend_Db_Statement.xml

@@ -32,7 +32,7 @@
 
         <example id="zend.db.statement.creating.example1">
             <title>Creating a SQL statement object with query()</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $stmt = $db->query(
             'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?',
             array('goofy', 'FIXED')
@@ -58,7 +58,7 @@ $stmt = $db->query(
 
         <example id="zend.db.statement.creating.example2">
             <title>Using a SQL statement constructor</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $sql = 'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?';
 
 $stmt = new Zend_Db_Statement_Mysqli($db, $sql);
@@ -87,7 +87,7 @@ $stmt = new Zend_Db_Statement_Mysqli($db, $sql);
 
         <example id="zend.db.statement.executing.example1">
             <title>Executing a statement with positional parameters</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $sql = 'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?';
 
 $stmt = new Zend_Db_Statement_Mysqli($db, $sql);
@@ -105,7 +105,7 @@ $stmt->execute(array('goofy', 'FIXED'));
 
         <example id="zend.db.statement.executing.example2">
             <title>Executing a statement with named parameters</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $sql = 'SELECT * FROM bugs WHERE ' .
        'reported_by = :reporter AND bug_status = :status';
 
@@ -189,7 +189,7 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
 
             <example id="zend.db.statement.fetching.fetch.example">
                 <title>Using fetch() in a loop</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT * FROM bugs');
 
 while ($row = $stmt->fetch()) {
@@ -220,7 +220,7 @@ while ($row = $stmt->fetch()) {
 
             <example id="zend.db.statement.fetching.fetchall.example">
                 <title>Using fetchAll()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT * FROM bugs');
 
 $rows = $stmt->fetchAll();
@@ -256,7 +256,7 @@ echo $rows[0]['bug_description'];
 
             <example id="zend.db.statement.fetching.fetch-mode.example">
                 <title>Setting the fetch mode</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT * FROM bugs');
 
 $stmt->setFetchMode(Zend_Db::FETCH_NUM);
@@ -297,7 +297,7 @@ echo $rows[0][0];
 
             <example id="zend.db.statement.fetching.fetchcolumn.example">
                 <title>Using fetchColumn()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT bug_id, bug_description, bug_status FROM bugs');
 
 $bug_status = $stmt->fetchColumn(2);
@@ -325,7 +325,7 @@ $bug_status = $stmt->fetchColumn(2);
 
             <example id="zend.db.statement.fetching.fetchobject.example">
                 <title>Using fetchObject()</title>
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT bug_id, bug_description, bug_status FROM bugs');
 
 $obj = $stmt->fetchObject();
@@ -354,7 +354,7 @@ echo $obj->bug_description;
 
         <example id="zend.db.statement.binding-param.example">
             <title>Binding parameters from PHP variables</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 ]]></programlisting>
         </example>
 
@@ -376,7 +376,7 @@ echo $obj->bug_description;
 
         <example id="zend.db.statement.binding-column.example">
             <title>Binding results to PHP variables</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 ]]></programlisting>
         </example>
 

documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml

@@ -35,7 +35,7 @@
             Below are the PHP class definitions for these tables:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class Accounts extends Zend_Db_Table_Abstract
 {
     protected $_name            = 'accounts';
@@ -212,7 +212,7 @@ class BugsProducts extends Zend_Db_Table_Abstract
             from dependent tables that reference the current row. Use the method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $row->findDependentRowset($table, [$rule]);
 ]]></programlisting>
 
@@ -237,7 +237,7 @@ $row->findDependentRowset($table, [$rule]);
                 finding the <code>Bugs</code> reported by that account.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $accountsTable = new Accounts();
 $accountsRowset = $accountsTable->find(1234);
 $user1234 = $accountsRowset->current();
@@ -271,7 +271,7 @@ $bugsReportedByUser = $user1234->findDependentRowset('Bugs');
                 <code>'Engineer'</code>.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $accountsTable = new Accounts();
 $accountsRowset = $accountsTable->find(1234);
 $user1234 = $accountsRowset->current();
@@ -298,7 +298,7 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs', 'Engineer');
                     account, limited only to 3 rows and ordered by name.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $accountsTable = new Accounts();
 $accountsRowset = $accountsTable->find(1234);
 $user1234 = $accountsRowset->current();
@@ -360,7 +360,7 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
                 specifying the table and rule as strings.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $accountsTable = new Accounts();
 $accountsRowset = $accountsTable->find(1234);
 $user1234 = $accountsRowset->current();
@@ -385,7 +385,7 @@ $bugsAssignedTo = $user1234->findBugsByEngineer();
             the row in the parent to which the dependent row refers. Use the method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $row->findParentRow($table, [$rule]);
 ]]></programlisting>
 
@@ -410,7 +410,7 @@ $row->findParentRow($table, [$rule]);
                 <code>Accounts</code> table for the user who reported the bug.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugsTable = new Bugs();
 $bugsRowset = $bugsTable->fetchAll(array('bug_status = ?' => 'NEW'));
 $bug1 = $bugsRowset->current();
@@ -443,7 +443,7 @@ $reporter = $bug1->findParentRow('Accounts');
                 <code>'Engineer'</code>.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugsTable = new Bugs();
 $bugsRowset = $bugsTable->fetchAll(array('bug_status = ?', 'NEW'));
 $bug1 = $bugsRowset->current();
@@ -500,7 +500,7 @@ $engineer = $bug1->findParentRow('Accounts', 'Engineer');
                 specifying the table and rule as strings.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugsTable = new Bugs();
 $bugsRowset = $bugsTable->fetchAll(array('bug_status = ?', 'NEW'));
 $bug1 = $bugsRowset->current();
@@ -527,7 +527,7 @@ $engineer = $bug1->findParentAccountsByEngineer();
             intersection table. Use the method:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $row->findManyToManyRowset($table,
                            $intersectionTable,
                            [$rule1,
@@ -567,7 +567,7 @@ $row->findManyToManyRowset($table,
                 <code>Products</code>, representing products related to that bug.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugsTable = new Bugs();
 $bugsRowset = $bugsTable->find(1234);
 $bug1234 = $bugsRowset->current();
@@ -619,7 +619,7 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
                 <code>Products</code>, representing products related to that bug.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugsTable = new Bugs();
 $bugsRowset = $bugsTable->find(1234);
 $bug1234 = $bugsRowset->current();
@@ -689,7 +689,7 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
                 relationship representing products related to a given bug.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugsTable = new Bugs();
 $bugsRowset = $bugsTable->find(1234);
 $bug1234 = $bugsRowset->current();
@@ -754,7 +754,7 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
                 configured to automatically delete dependent rows in the <code>Bugs</code> table.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $productsTable = new Products();
 $productsRowset = $productsTable->find(1234);
 $product1234 = $productsRowset->current();
@@ -806,7 +806,7 @@ $product1234->delete();
                 the <code>'onUpdate'</code> entry.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class BugsProducts extends Zend_Db_Table_Abstract
 {
     ...

documentation/manual/en/module_specs/Zend_Db_Table.xml

@@ -47,7 +47,7 @@
 
                 <title>Declaring a table class with explicit table name</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bugs';
@@ -66,7 +66,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Declaring a table class with implicit table name</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class bugs extends Zend_Db_Table_Abstract
 {
     // table name matches class name
@@ -88,7 +88,7 @@ class bugs extends Zend_Db_Table_Abstract
 
                 <title>Declaring a table class with schema</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // First alternative:
 class Bugs extends Zend_Db_Table_Abstract
 {
@@ -126,7 +126,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Declaring table and schema names upon instantiation</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
 }
@@ -170,7 +170,7 @@ $tableBugs = new Bugs(array('name' => 'bug_db.bugs',
 
                 <title>Example of specifying the primary key</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bugs';
@@ -215,7 +215,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Example of overriding the _setupTableName() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected function _setupTableName()
@@ -287,7 +287,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Example usage of init() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected $_observer;
@@ -331,7 +331,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Example of constructing a Table using an Adapter object</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db = Zend_Db::factory('PDO_MYSQL', $options);
 
 $table = new Bugs(array('db' => $db));
@@ -357,7 +357,7 @@ $table = new Bugs(array('db' => $db));
 
                 <title>Example of constructing a Table using a the Default Adapter</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db = Zend_Db::factory('PDO_MYSQL', $options);
 Zend_Db_Table_Abstract::setDefaultAdapter($db);
 
@@ -393,7 +393,7 @@ $table = new Bugs();
 
                 <title>Example of constructing a Table using a Registry key</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $db = Zend_Db::factory('PDO_MYSQL', $options);
 Zend_Registry::set('my_db', $db);
 
@@ -431,7 +431,7 @@ $table = new Bugs(array('db' => 'my_db'));
 
             <title>Example of inserting to a Table</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $data = array(
@@ -455,7 +455,7 @@ $table->insert($data);
 
             <title>Example of inserting expressions to a Table</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $data = array(
@@ -493,7 +493,7 @@ $data = array(
 
                 <title>Example of declaring a Table with auto-incrementing primary key</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bugs';
@@ -542,7 +542,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Example of declaring a Table with a sequence</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bugs';
@@ -589,7 +589,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Example of declaring a Table with a natural key</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class BugStatus extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bug_status';
@@ -630,7 +630,7 @@ class BugStatus extends Zend_Db_Table_Abstract
 
             <title>Example of updating rows in a Table</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $data = array(
@@ -679,7 +679,7 @@ $table->update($data, $where);
 
             <title>Example of deleting rows from a Table</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $where = $table->getAdapter()->quoteInto('bug_id = ?', 1235);
@@ -723,7 +723,7 @@ $table->delete($where);
 
             <title>Example of finding rows by primary key values</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 // Find a single row
@@ -777,7 +777,7 @@ $rows = $table->find(array(1234, 5678));
                 second row must have primary key value (5678, 'DEF').
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class BugsProducts extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bugs_products';
@@ -826,7 +826,7 @@ $rows = $table->find(array(1234, 5678), array('ABC', 'DEF'));
 
                     <para>
 
-                        <programlisting role="php"><![CDATA[
+                        <programlisting language="php"><![CDATA[
 // Fetching a rowset
 $rows = $table->fetchAll('bug_status = "NEW"', 'bug_id ASC', 10, 0);
 $rows = $table->fetchAll($table->select()->where('bug_status = ?', 'NEW')
@@ -895,7 +895,7 @@ $row = $table->fetchRow($table->select()->where('bug_status = ?', 'NEW')
 
                     <title>Simple usage</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $select = $table->select();
@@ -919,7 +919,7 @@ $rows = $table->fetchAll($select);
 
                     <title>Example of fluent interface</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $rows =
@@ -946,7 +946,7 @@ $rows =
 
                 <title>Example of finding rows by an expression</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $select = $table->select()->where('bug_status = ?', 'NEW');
@@ -967,7 +967,7 @@ $rows = $table->fetchAll($select);
 
                 <title>Example of finding rows by an expression</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $order  = 'bug_id';
@@ -1011,7 +1011,7 @@ $rows = $table->fetchAll($select);
 
                     <title>Retrieving specific columns</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $select = $table->select();
@@ -1050,7 +1050,7 @@ $rows = $table->fetchAll($select);
 
                     <title>Retrieving expressions as columns</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $select = $table->select();
@@ -1075,7 +1075,7 @@ $rows = $table->fetchAll($select);
 
                     <title>Using a lookup table to refine the results of fetchAll()</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $select = $table->select();
@@ -1137,7 +1137,7 @@ $rows = $table->fetchAll($select);
 
             <title>Example of finding a single row by an expression</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $select  = $table->select()->where('bug_status = ?', 'NEW')
@@ -1170,7 +1170,7 @@ $row = $table->fetchRow($select);
 
             <title>Example of getting the table name</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $info = $table->info();
@@ -1322,7 +1322,7 @@ echo "The table name is " . $info['name'] . "\n";
                 all table objects:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // First, set up the Cache
 $frontendOptions = array(
     'automatic_serialization' => true
@@ -1361,7 +1361,7 @@ $bugs = new Bugs();
                 object instance:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // First, set up the Cache
 $frontendOptions = array(
     'automatic_serialization' => true
@@ -1421,7 +1421,7 @@ $bugs = new Bugs(array('metadataCache' => $cache));
                 The metadata structure is as follows:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 protected $_metadata = array(
     '<column_name>' => array(
         'SCHEMA_NAME'      => <string>,
@@ -1453,7 +1453,7 @@ protected $_metadata = array(
                 <code>metadataCacheInClass</code> flag:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // At instantiation:
 $bugs = new Bugs(array('metadataCacheInClass' => false));
 
@@ -1495,7 +1495,7 @@ $bugs->setMetadataCacheInClass(false);
 
                 <title>Example of specifying the Row and Rowset classes</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class My_Row extends Zend_Db_Table_Row_Abstract
 {
     ...
@@ -1533,7 +1533,7 @@ $rows = $table->fetchAll($where);
 
                 <title>Example of changing the Row and Rowset classes</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $table = new Bugs();
 
 $where = $table->getAdapter()->quoteInto('bug_status = ?', 'NEW')
@@ -1576,7 +1576,7 @@ $rowsCustom = $table->fetchAll($where);
 
                 <title>Custom logic to manage timestamps</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bugs';
@@ -1626,7 +1626,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Custom method to find bugs by status</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class Bugs extends Zend_Db_Table_Abstract
 {
     protected $_name = 'bugs';
@@ -1691,7 +1691,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
                 <title>Example of an abstract table class that implements inflection</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 abstract class MyAbstractTable extends Zend_Db_Table_Abstract
 {
     protected function _setupTableName()

documentation/manual/en/module_specs/Zend_Db_Table_Row.xml

@@ -37,7 +37,7 @@
 
             <title>Example of fetching a row</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $row = $bugs->fetchRow($bugs->select()->where('bug_id = ?', 1));
 ]]></programlisting>
@@ -53,7 +53,7 @@ $row = $bugs->fetchRow($bugs->select()->where('bug_id = ?', 1));
 
             <title>Example of reading a row in a rowset</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $rowset = $bugs->fetchAll($bugs->select()->where('bug_status = ?', 1));
 $row = $rowset->current();
@@ -74,7 +74,7 @@ $row = $rowset->current();
 
                 <title>Example of reading a column in a row</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $row = $bugs->fetchRow($bugs->select()->where('bug_id = ?', 1));
 
@@ -116,7 +116,7 @@ echo $row->bug_description;
 
                 <title>Example of using the toArray() method</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $row = $bugs->fetchRow($bugs->select()->where('bug_id = ?', 1));
 
@@ -177,7 +177,7 @@ foreach ($rowArray as $column => $value) {
 
                 <title>Example of changing a column in a row</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $row = $bugs->fetchRow($bugs->select()->where('bug_id = ?', 1));
 
@@ -207,7 +207,7 @@ $row->save();
 
                 <title>Example of creating a new row for a table</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $newRow = $bugs->createRow();
 
@@ -230,7 +230,7 @@ $newRow->save();
 
                 <title>Example of populating a new row for a table</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $data = array(
     'bug_description' => '...description...',
     'bug_status'      => 'NEW'
@@ -273,7 +273,7 @@ $newRow->save();
 
                 <title>Example of using setFromArray() to set values in a new Row</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $newRow = $bugs->createRow();
 
@@ -307,7 +307,7 @@ $newRow->save();
 
                 <title>Example of deleting a row</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $row = $bugs->fetchRow('bug_id = 1');
 
@@ -350,7 +350,7 @@ $row->delete();
 
                 <title>Example of serializing a row</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $row = $bugs->fetchRow('bug_id = 1');
 
@@ -384,7 +384,7 @@ $serializedRow = serialize($row);
 
                 <title>Example of unserializing a serialized row</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $rowClone = unserialize($serializedRow);
 
 // Now you can use object properties, but read-only
@@ -428,7 +428,7 @@ echo $rowClone->bug_description;
 
                 <title>Example of reactivating a row</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $rowClone = unserialize($serializedRow);
 
 $bugs = new Bugs();
@@ -465,7 +465,7 @@ $rowClone->save();
 
             <title>Specifying a custom Row class</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class MyRow extends Zend_Db_Table_Row_Abstract
 {
     // ...customizations
@@ -501,7 +501,7 @@ $bugs = new Bugs(array('rowClass' => 'MyRow'));
 
                     <title>Example usage of init() method</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 class MyApplicationRow extends Zend_Db_Table_Row_Abstract
 {
     protected $_role;
@@ -561,7 +561,7 @@ class MyApplicationRow extends Zend_Db_Table_Row_Abstract
                     behavior.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class MyLoggingRow extends Zend_Db_Table_Row_Abstract
 {
     protected function _insert()
@@ -600,7 +600,7 @@ if ($loggingEnabled) {
                     In this example, the logging code is identical in all table classes.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class MyLoggingRow extends Zend_Db_Table_Row_Abstract
 {
     protected function _insert()
@@ -661,7 +661,7 @@ class Products extends Zend_Db_Table_Abstract
                     change the name you use to the native column name in the database table.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 class MyInflectedRow extends Zend_Db_Table_Row_Abstract
 {
     protected function _transformColumn($columnName)

documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml

@@ -30,7 +30,7 @@
 
             <title>Example of fetching a rowset</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs   = new Bugs();
 $rowset = $bugs->fetchAll("bug_status = 'NEW'");
 ]]></programlisting>
@@ -59,7 +59,7 @@ $rowset = $bugs->fetchAll("bug_status = 'NEW'");
 
             <title>Counting the Rows in a Rowset</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $rowset   = $bugs->fetchAll("bug_status = 'FIXED'");
 
 $rowCount = count($rowset);
@@ -82,7 +82,7 @@ if ($rowCount > 0) {
                 particularly appropriate when the Rowset contains exactly one Row.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs   = new Bugs();
 $rowset = $bugs->fetchAll("bug_id = 1");
 $row    = $rowset->current();
@@ -106,7 +106,7 @@ $row    = $rowset->current();
                 record from the table.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 
 // fetch all records from the table
@@ -142,7 +142,7 @@ foreach ($rowset as $row) {
                 results before seeking to a position.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 
 // fetch all records from the table
@@ -169,7 +169,7 @@ $row9->save();
                 object by default. If the position requested does not exist, an exception will be thrown. Here is an example :
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 
 // fetch all records from the table
@@ -204,7 +204,7 @@ $row9->save();
 
             <title>Using toArray()</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs   = new Bugs();
 $rowset = $bugs->fetchAll();
 
@@ -247,7 +247,7 @@ foreach ($rowsetArray as $rowArray) {
                 representation of the Rowset object argument.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $bugs   = new Bugs();
 $rowset = $bugs->fetchAll();
 
@@ -275,7 +275,7 @@ $serializedRowset = serialize($rowset);
                 tables).
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $rowsetDisconnected = unserialize($serializedRowset);
 
 // Now you can use object methods and properties, but read-only
@@ -308,7 +308,7 @@ echo $row->bug_description;
 
             <title>Reactivating a Rowset as Live Data</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $rowset = unserialize($serializedRowset);
 
 $bugs = new Bugs();
@@ -347,7 +347,7 @@ $row->save();
 
         <example id="zend.db.table.rowset.extending.example">
             <title>Specifying a custom Rowset class</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class MyRowset extends Zend_Db_Table_Rowset_Abstract
 {
     // ...customizations
@@ -377,7 +377,7 @@ $bugs = new Bugs(array('rowsetClass' => 'MyRowset'));
 
         <example id="zend.db.table.rowset.extending.example-aggregate">
             <title>Example of Rowset class with a new method</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class MyBugsRowset extends Zend_Db_Table_Rowset_Abstract
 {
     /**

documentation/manual/en/module_specs/Zend_Debug.xml

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

documentation/manual/en/module_specs/Zend_Dojo-Data.xml

@@ -18,7 +18,7 @@
         server side then returns data in the following JSON format:
     </para>
 
-    <programlisting role="javascript"><![CDATA[
+    <programlisting language="javascript"><![CDATA[
 {
     identifier: '<name>',
     <label: '<label>',>
@@ -47,7 +47,7 @@
         <example id="zend.dojo.data.usage.constructor">
             <title>Zend_Dojo_Data initialization via constructor</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $data = new Zend_Dojo_Data('id', $items);
 ]]></programlisting>
         </example>
@@ -55,7 +55,7 @@ $data = new Zend_Dojo_Data('id', $items);
         <example id="zend.dojo.data.usage.mutators">
             <title>Zend_Dojo_Data initialization via mutators</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $data = new Zend_Dojo_Data();
 $data->setIdentifier('id')
      ->addItems($items);
@@ -70,7 +70,7 @@ $data->setIdentifier('id')
         <example id="zend.dojo.data.usage.append">
             <title>Appending data to Zend_Dojo_Data</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $data = new Zend_Dojo_Data($identifier, $items);
 $data->addItem($someItem);
 
@@ -133,7 +133,7 @@ $data->addItems($someMoreItems);
         <example id="zend.dojo.data.usage.label">
             <title>Specifying a label field in Zend_Dojo_Data</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $data->setLabel('name');
 ]]></programlisting>
         </example>
@@ -146,7 +146,7 @@ $data->setLabel('name');
         <example id="zend.dojo.data.usage.populate">
             <title>Populating Zend_Dojo_Data from JSON</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $data->fromJson($json);
 ]]></programlisting>
         </example>
@@ -174,7 +174,7 @@ $data->fromJson($json);
             to the object. The following illustrates usage:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Set the "numRows" to 100
 $data->setMetadata('numRows', 100);
 
@@ -221,7 +221,7 @@ $data->clearMetadata();
             <code>getItem()</code> method, or via array notation.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Using getItem():
 $item = $data->getItem('foo');
 
@@ -234,7 +234,7 @@ $item = $data['foo'];
             update it, delete it, create it, or test for it:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Update or create an item:
 $data['foo'] = array('title' => 'Foo', 'email' => 'foo@foo.com');
 
@@ -251,7 +251,7 @@ if (isset($data[foo])) {
             stored as arrays.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 foreach ($data as $item) {
     echo $item['title'] . ': ' . $item['description'] . "\n";
 }
@@ -261,7 +261,7 @@ foreach ($data as $item) {
             Or even count to see how many items you have:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 echo count($data), " items found!";
 ]]></programlisting>
 
@@ -270,7 +270,7 @@ echo count($data), " items found!";
             also cast it to JSON simply by echoing it or casting to string:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 echo $data; // echo as JSON string
 
 $json = (string) $data; // cast to string == cast to JSON

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

@@ -48,7 +48,7 @@
         <example id="zend.dojo.form.decorators.dijitElement.usage">
             <title>DijitElement Decorator Usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $element->setDecorators(array(
     'DijitElement',
     'Errors',
@@ -113,7 +113,7 @@ $element->setDecorators(array(
         <example id="zend.dojo.form.decorators.dijitContainer.usage">
             <title>DijitContainer Decorator Usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // Use a TabContainer for your form:
 $form->setDecorators(array(
     'FormElements',

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

@@ -59,7 +59,7 @@
         decorators, corresponding to the following:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $element->addDecorator('DijitElement')
         ->addDecorator('Errors')
         ->addDecorator('HtmlTag', array('tag' => 'dd'))
@@ -121,7 +121,7 @@ $element->addDecorator('DijitElement')
         <example id="zend.dojo.form.elements.button.example">
             <title>Example Button dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'Button',
     'foo',
@@ -178,7 +178,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.checkBox.example">
             <title>Example CheckBox dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'CheckBox',
     'foo',
@@ -291,7 +291,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.comboBox.selectExample">
             <title>ComboBox dijit element usage as select input</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'ComboBox',
     'foo',
@@ -315,7 +315,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.comboBox.datastoreExample">
             <title>ComboBox dijit element usage with datastore</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'ComboBox',
     'foo',
@@ -395,7 +395,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.currencyTextBox.example">
             <title>Example CurrencyTextBox dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'CurrencyTextBox',
     'foo',
@@ -470,7 +470,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.dateTextBox.example">
             <title>Example DateTextBox dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'DateTextBox',
     'foo',
@@ -632,7 +632,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.editor.example">
             <title>Example Editor dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement('editor', 'content', array(
     'plugins'            => array('undo', '|', 'bold', 'italic'),
     'editActionInterval' => 2,
@@ -732,7 +732,7 @@ $form->addElement('editor', 'content', array(
                 element storing the value will be updated.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'HorizontalSlider',
     'horizontal',
@@ -848,7 +848,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.numberSpinner.example">
             <title>Example NumberSpinner dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'NumberSpinner',
     'foo',
@@ -923,7 +923,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.numberTextBox.example">
             <title>Example NumberTextBox dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'NumberTextBox',
     'elevation',
@@ -961,7 +961,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.passwordTextBox.example">
             <title>Example PasswordTextBox dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'PasswordTextBox',
     'password',
@@ -1006,7 +1006,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.radioButton.example">
             <title>Example RadioButton dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'RadioButton',
     'foo',
@@ -1037,7 +1037,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.simpletextarea.example">
             <title>Example SimpleTextarea dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'SimpleTextarea',
     'simpletextarea',
@@ -1128,7 +1128,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.submitButton.example">
             <title>Example SubmitButton dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'SubmitButton',
     'foo',
@@ -1186,7 +1186,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.textBox.example">
             <title>Example TextBox dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'TextBox',
     'foo',
@@ -1215,7 +1215,7 @@ $form->addElement(
         <example id="zend.dojo.form.elements.textarea.example">
             <title>Example Textarea dijit element usage</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'Textarea',
     'textarea',
@@ -1286,7 +1286,7 @@ $form->addElement(
                 at a time, with increments of 10 minutes.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'TimeTextBox',
     'foo',
@@ -1365,7 +1365,7 @@ $form->addElement(
                 spaces, most punctuation is invalid).
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'ValidationTextBox',
     'foo',
@@ -1404,7 +1404,7 @@ $form->addElement(
                 element storing the value will be updated.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $form->addElement(
     'VerticalSlider',
     'foo',

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

@@ -15,7 +15,7 @@
             in its own tab.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class My_Form_Test extends Zend_Dojo_Form
 {
     /**
@@ -363,7 +363,7 @@ class My_Form_Test extends Zend_Dojo_Form
             This first example shows decorating an existing form instance:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $form = new My_Custom_Form();
 Zend_Dojo::enableForm($form);
 $form->addElement(
@@ -390,7 +390,7 @@ array(
             initialization:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class My_Custom_Form extends Zend_Form
 {
     public function init()

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

@@ -72,7 +72,7 @@
             them:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 class My_Form_Custom extends Zend_Form
 {
     public function init()

documentation/manual/en/module_specs/Zend_Dojo-View-Dojo.xml

@@ -45,7 +45,7 @@
             plugin; simply grab your view object and execute the following:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $view->addHelperPath('Zend/Dojo/View/Helper/', 'Zend_Dojo_View_Helper');
 ]]></programlisting>
 
@@ -56,7 +56,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper/', 'Zend_Dojo_View_Helper');
             'PairedStore' and store in our 'custom' module.
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <?php // setup data store for FilteringSelect ?>
 <div dojoType="custom.PairedStore" jsId="stateStore"
     url="/data/autocomplete/type/state/format/ajax"
@@ -80,7 +80,7 @@ $this->dojo()->enable()
             it:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 <?php echo $this->doctype() ?>
 <html>
 <head>
@@ -159,7 +159,7 @@ $this->dojo()->enable()
                 <code>setUseDeclarative()</code> method:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 Zend_Dojo_View_Helper_Dojo::setUseDeclarative();
 ]]></programlisting>
 
@@ -168,7 +168,7 @@ Zend_Dojo_View_Helper_Dojo::setUseDeclarative();
                 <code>setUseProgrammatic()</code> method:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 Zend_Dojo_View_Helper_Dojo::setUseProgrammatic();
 ]]></programlisting>
 
@@ -179,7 +179,7 @@ Zend_Dojo_View_Helper_Dojo::setUseProgrammatic();
                 will be created.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 Zend_Dojo_View_Helper_Dojo::setUseProgrammatic(-1);
 ]]></programlisting>
         </example>
@@ -193,7 +193,7 @@ Zend_Dojo_View_Helper_Dojo::setUseProgrammatic(-1);
             select one by passing in a module path:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $view->dojo()->addStylesheetModule('dijit.themes.tundra');
 ]]></programlisting>
 
@@ -211,7 +211,7 @@ $view->dojo()->addStylesheetModule('dijit.themes.tundra');
             using; the most common use case is to pass it in the body:
         </para>
 
-        <programlisting role="html"><![CDATA[
+        <programlisting language="html"><![CDATA[
 <body class="tundra">
 ]]></programlisting>
     </sect3>
@@ -262,7 +262,7 @@ $view->dojo()->addStylesheetModule('dijit.themes.tundra');
             <code>addLayer()</code> method for adding paths to required layers:
         </para>
 
-        <programlisting role="html"><![CDATA[
+        <programlisting language="html"><![CDATA[
 $view->dojo()->addLayer('/js/foo/foo.js');
 ]]></programlisting>
 

documentation/manual/en/module_specs/Zend_Dojo-View-Helpers.xml

@@ -143,7 +143,7 @@
     <example id="zend.dojo.view.dijit.prefixpath">
         <title>Registering the Dojo View Helper Prefix Path</title>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
 ]]></programlisting>
     </example>
@@ -178,7 +178,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                     display that particular pane.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->accordionContainer(
     'foo',
     $content,
@@ -198,7 +198,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                     For use within AccordionContainer.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->accordionPane(
     'foo',
     $content,
@@ -220,7 +220,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                     traditional application.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->borderContainer(
     'foo',
     $content,
@@ -240,7 +240,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                     inside any container except AccordionContainer.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->contentPane(
     'foo',
     $content,
@@ -262,7 +262,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                     panes; deprecated in Dojo in favor of BorderContainer.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->splitContainer(
     'foo',
     $content,
@@ -286,7 +286,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                     functionality to reveal one at a time.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->stackContainer(
     'foo',
     $content,
@@ -306,7 +306,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                     one side for switching between them.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->tabContainer(
     'foo',
     $content,
@@ -361,7 +361,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                 layout effects.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $view->borderContainer()->captureStart('masterLayout',
                                        array('design' => 'headline'));
 
@@ -423,7 +423,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                     form button.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->button(
     'foo',
     'Show Me!',
@@ -457,7 +457,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                     are assumed.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 <?php echo $view->checkBox(
     'foo',
     'bar',
@@ -550,7 +550,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                     </listitem>
                 </itemizedlist>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // As a select element:
 echo $view->comboBox(
     'foo',
@@ -591,7 +591,7 @@ echo $view->comboBox(
                     ValidationTextBox and TextBox.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->currencyTextBox(
     'foo',
     '$25.00',
@@ -612,7 +612,7 @@ echo $view->currencyTextBox(
                         character set to utf-8, which you can do by calling:
                     </para>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 $view->headMeta()->appendHttpEquiv('Content-Type',
                                    'text/html; charset=utf-8');
 ]]></programlisting>
@@ -635,7 +635,7 @@ $view->headMeta()->appendHttpEquiv('Content-Type',
                     ValidationTextBox or TextBox.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->dateTextBox(
     'foo',
     '2008-07-11',
@@ -654,7 +654,7 @@ echo $view->dateTextBox(
                     dijit.Editor documentation</ulink> for more details.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->editor('foo');
 ]]></programlisting>
             </listitem>
@@ -777,7 +777,7 @@ echo $view->editor('foo');
                     </para></listitem>
                 </itemizedlist>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->horizontalSlider(
     'foo',
     1,
@@ -844,7 +844,7 @@ echo $view->horizontalSlider(
                     decrement.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->numberSpinner(
     'foo',
     5,
@@ -869,7 +869,7 @@ echo $view->numberSpinner(
                     against given constraints.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->numberTextBox(
     'foo',
     5,
@@ -893,7 +893,7 @@ echo $view->numberTextBox(
                     dijit theme, as well as allow for client-side validation.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->passwordTextBox(
     'foo',
     '',
@@ -922,7 +922,7 @@ echo $view->passwordTextBox(
                     the <code>$attribs</code> key <code>options</code>.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->radioButton(
     'foo',
     'bar',
@@ -946,7 +946,7 @@ echo $view->radioButton(
                     percentages for the width and height, instead.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->simpleTextarea(
     'foo',
     'Start writing here...',
@@ -973,7 +973,7 @@ echo $view->simpleTextarea(
                     width should be specified via a style setting.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->textarea(
     'foo',
     'Start writing here...',
@@ -1001,7 +1001,7 @@ echo $view->textarea(
                     may specifiy the parameters 'size' and 'maxLength'.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->textBox(
     'foo',
     'some text',
@@ -1027,7 +1027,7 @@ echo $view->textBox(
                     range of times available.
                 </para>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->timeTextBox(
     'foo',
     '',
@@ -1079,7 +1079,7 @@ echo $view->timeTextBox(
                     </para></listitem>
                 </itemizedlist>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 echo $view->validationTextBox(
     'foo',
     '',
@@ -1143,7 +1143,7 @@ echo $view->validationTextBox(
                 At its most basic, you can do the following:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 <?php echo $this->customDijit(
     'foo',
     $content,
@@ -1161,7 +1161,7 @@ echo $view->validationTextBox(
                 the "params" argument:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 <?php $this->customDijit()->captureStart(
     'foo',
     array(
@@ -1182,7 +1182,7 @@ This is the content of the pane
                 following helper to support it:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 class My_View_Helper_FooContentPane
     extends Zend_Dojo_View_Helper_CustomDijit
 {

documentation/manual/en/module_specs/Zend_Dojo-View.xml

@@ -24,7 +24,7 @@
             <code>addHelperPath()</code>:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $view->addHelperPath('Zend/Dojo/View/Helper/', 'Zend_Dojo_View_Helper');
 ]]></programlisting>
 
@@ -33,7 +33,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper/', 'Zend_Dojo_View_Helper');
             <code>enableView()</code> method to do the work for you:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 Zend_Dojo::enableView($view);
 ]]></programlisting>
     </example>

documentation/manual/en/module_specs/Zend_Dom-Query.xml

@@ -110,7 +110,7 @@
                     the word 'One' in the listing below:
                 </para>
 
-                <programlisting role="html"><![CDATA[
+                <programlisting language="html"><![CDATA[
 <div>
 <table>
     <tr>
@@ -141,7 +141,7 @@
             that selects against the HTML above:
         </para>
 
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $dom = new Zend_Dom_Query($html);
 $results = $dom->query('.foo .bar a');
 

documentation/manual/en/module_specs/Zend_Exception.xml

@@ -13,7 +13,7 @@
         <para>
             The following code listing demonstrates how to catch an exception thrown in a Zend Framework class:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 try {
     // Calling Zend_Loader::loadClass() with a non-existant class will cause
     // an exception to be thrown in Zend_Loader

documentation/manual/en/module_specs/Zend_Feed-ConsumingAtom.xml

@@ -17,7 +17,7 @@
         <para>
             Read an Atom feed and print the <code>title</code> and <code>summary</code> of each entry:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $feed = new Zend_Feed_Atom('http://atom.example.com/feed/');
 echo 'The feed contains ' . $feed->count() . ' entries.' . "\n\n";
 foreach ($feed as $entry) {

documentation/manual/en/module_specs/Zend_Feed-ConsumingAtomSingle.xml

@@ -16,7 +16,7 @@
 
     <example id="zend.feed.consuming-atom-single-entry.example.atom">
         <title>Reading a Single-Entry Atom Feed</title>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $feed = new Zend_Feed_Atom('http://atom.example.com/feed/1');
 echo 'The feed has: ' . $feed->count() . ' entry.';
 
@@ -31,7 +31,7 @@ $entry = $feed->current();
 
     <example id="zend.feed.consuming-atom-single-entry.example.entryatom">
         <title>Using the Entry Object Directly for a Single-Entry Atom Feed</title>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $entry = new Zend_Feed_Entry_Atom('http://atom.example.com/feed/1');
 echo $entry->title();
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Feed-ConsumingRss.xml

@@ -6,7 +6,7 @@
         Reading an RSS feed is as simple as instantiating a <classname>Zend_Feed_Rss</classname> object with the URL
         of the feed:
     </para>
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $channel = new Zend_Feed_Rss('http://rss.example.com/channelName');
 ]]></programlisting>
     <para>
@@ -17,7 +17,7 @@ $channel = new Zend_Feed_Rss('http://rss.example.com/channelName');
         Once you have a feed object, you can access any of the standard RSS "channel" properties directly
         on the object:
     </para>
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 echo $channel->title();
 ]]></programlisting>
     <para>
@@ -30,7 +30,7 @@ echo $channel->title();
     <para>
         If channel properties have attributes, they are accessible using PHP's array syntax:
     </para>
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 echo $channel->category['domain'];
 ]]></programlisting>
     <para>
@@ -43,7 +43,7 @@ echo $channel->category['domain'];
         <classname>Zend_Feed_Abstract</classname> implements PHP's <code>Iterator</code> interface, so printing all
         titles of articles in a channel is just a matter of:
     </para>
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 foreach ($channel as $item) {
     echo $item->title() . "\n";
 }
@@ -129,7 +129,7 @@ foreach ($channel as $item) {
     <para>
         In your code you can always test to see if an element is non-empty with:
     </para>
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 if ($item->propname()) {
     // ... proceed.
 }

documentation/manual/en/module_specs/Zend_Feed-CustomFeed.xml

@@ -16,7 +16,7 @@
 
     <example id="zend.feed.custom-feed.example.extending">
         <title>Extending the Atom Entry Class with Custom Namespaces</title>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 /**
  * The custom entry class automatically knows the feed URI (optional) and
  * can automatically add extra namespaces.
@@ -75,7 +75,7 @@ class MyEntry extends Zend_Feed_Entry_Atom
             Then to use this class, you'd just instantiate it directly and set the <code>myUpdated</code>
             property:
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $entry = new MyEntry();
 $entry->myUpdated = '2005-04-19T15:30';
 

documentation/manual/en/module_specs/Zend_Feed-FindFeeds.xml

@@ -7,7 +7,7 @@
         the particular page. <classname>Zend_Feed</classname> enables you to retrieve all feeds referenced by a web
         page with one simple method call:
     </para>
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $feedArray = Zend_Feed::findFeeds('http://www.example.com/news.html');
 ]]></programlisting>
     <para>

documentation/manual/en/module_specs/Zend_Feed-Importing.xml

@@ -9,7 +9,7 @@
         use the <classname>Zend_Feed::import()</classname> method:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $feed = Zend_Feed::import('http://feeds.example.com/feedName');
 ]]></programlisting>
 
@@ -18,7 +18,7 @@ $feed = Zend_Feed::import('http://feeds.example.com/feedName');
         string variable:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 // importing a feed from a text file
 $feedFromFile = Zend_Feed::importFile('feed.xml');
 
@@ -49,7 +49,7 @@ $feedFromPHP = Zend_Feed::importString($feedString);
 
             <title>Importing a custom array</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // importing a feed from an array
 $atomFeedFromArray = Zend_Feed::importArray($array);
 
@@ -65,7 +65,7 @@ $rssFeedFromArray = Zend_Feed::importArray($array, 'rss');
                 The format of the array must conform to this structure:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 array(
     //required
     'title' => 'title of the feed',
@@ -305,7 +305,7 @@ array(
                 Here is an example of <classname>Zend_Feed::importBuilder()</classname> usage:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 // importing a feed from a custom builder source
 $atomFeedFromArray =
     Zend_Feed::importBuilder(new Zend_Feed_Builder($array));
@@ -331,7 +331,7 @@ $rssFeedFromArray =
                 <code>saveXml()</code> methods.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 assert($feed instanceof Zend_Feed_Abstract);
 
 // dump the feed to standard output

documentation/manual/en/module_specs/Zend_Feed-Introduction.xml

@@ -33,7 +33,7 @@
 
     <example id="zend.feed.introduction.example.rss">
         <title>Putting Zend_Feed to Work on RSS Feed Data</title>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 // Fetch the latest Slashdot headlines
 try {
     $slashdotRss =

documentation/manual/en/module_specs/Zend_Feed-ModifyingFeed.xml

@@ -11,7 +11,7 @@
 
     <example id="zend.feed.modifying-feed.example.modifying">
         <title>Modifying an Existing Feed Entry</title>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $feed = new Zend_Feed_Atom('http://atom.example.com/feed/1');
 $entry = $feed->current();
 
@@ -41,7 +41,7 @@ echo $entry->saveXML();
 
     <example id="zend.feed.modifying-feed.example.creating">
         <title>Creating an Atom Entry with Elements of Custom Namespaces</title>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $entry = new Zend_Feed_Entry_Atom();
 // id is always assigned by the server in Atom
 $entry->title = 'my custom entry';

documentation/manual/en/module_specs/Zend_File_Transfer-Filters.xml

@@ -123,7 +123,7 @@
         <example id="zend.file.transfer.filters.usage.example">
             <title>Add filters to a file transfer</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Set a new destination path
@@ -147,7 +147,7 @@ $upload->addFilter('Rename',
                 given filter.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Set a new destination path and limits it only to 'file2'
@@ -169,7 +169,7 @@ $upload->addFilter('Rename', 'C:\picture\uploads', 'file2');
                 methods provide a fluent interface you can couple the calls as shown below:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Set a filesize with 20000 bytes
@@ -211,7 +211,7 @@ $upload->addFilter('Rename', 'C:\picture\newjpg', 'file1')
         <example id="zend.file.transfer.filters.decrypt.example1">
             <title>Using the Decrypt filter with Mcrypt</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer_Adapter_Http();
 
 // Adds a filter to decrypt the uploaded encrypted file
@@ -225,7 +225,7 @@ $upload->addFilter('Decrypt',
         <example id="zend.file.transfer.filters.decrypt.example2">
             <title>Using the Decrypt filter with OpenSSL</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer_Adapter_Http();
 
 // Adds a filter to decrypt the uploaded encrypted file
@@ -261,7 +261,7 @@ $upload->addFilter('Decrypt',
         <example id="zend.file.transfer.filters.encrypt.example1">
             <title>Using the Encrypt filter with Mcrypt</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer_Adapter_Http();
 
 // Adds a filter to encrypt the uploaded file
@@ -275,7 +275,7 @@ $upload->addFilter('Encrypt',
         <example id="zend.file.transfer.filters.encrypt.example2">
             <title>Using the Encrypt filter with OpenSSL</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer_Adapter_Http();
 
 // Adds a filter to encrypt the uploaded file
@@ -304,7 +304,7 @@ $upload->addFilter('Encrypt',
         <example id="zend.file.transfer.filters.lowercase.example">
             <title>Using the LowerCase filter</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('MimeType', 'text');
 
@@ -368,7 +368,7 @@ $upload->addFilter('LowerCase', 'ISO-8859-1');
         <example id="zend.file.transfer.filters.rename.example">
             <title>Using the Rename filter</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer_Adapter_Http();
 
 // Set a new destination path for all files
@@ -475,7 +475,7 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
         <example id="zend.file.transfer.filters.uppercase.example">
             <title>Using the UpperCase filter</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('MimeType', 'text');
 

documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml

@@ -60,7 +60,7 @@
             <code>/file/upload</code>. So next we will create the <code>file</code> controller
             and the <code>upload</code> action.
         </para>
-        <programlisting role="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 $adapter = new Zend_File_Transfer_Adapter_Http();
 
 $adapter->setDestination('C:\temp');
@@ -157,7 +157,7 @@ if (!$adapter->receive()) {
         <example id="zend.file.transfer.introduction.checking.example">
             <title>Checking Files</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Returns all known internal file information
@@ -244,7 +244,7 @@ $upload->receive();
         <example id="zend.file.transfer.introduction.informations.example1">
             <title>Getting the Filename</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 $upload->receive();
 
@@ -274,7 +274,7 @@ $names = $upload->getFileName('foo');
         <example id="zend.file.transfer.introduction.informations.example.getfilesize">
             <title>Getting the size of a file</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 $upload->receive();
 
@@ -298,7 +298,7 @@ $size = $upload->getFileSize();
         <example id="zend.file.transfer.introduction.informations.example2">
             <title>Getting the hash of a file</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 $upload->receive();
 
@@ -326,7 +326,7 @@ $names = $upload->getHash('crc32', 'foo');
         <example id="zend.file.transfer.introduction.informations.getmimetype">
             <title>Getting the mimetype of a file</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 $upload->receive();
 
@@ -395,7 +395,7 @@ $names = $upload->getMimeType('foo');
 
                 <title>Using the progressbar adapter to retrieve the actual state</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $adapter = new Zend_ProgressBar_Adapter_Console();
 $upload  = Zend_File_Transfer_Adapter_Http::getProgress($adapter);
 
@@ -504,7 +504,7 @@ while (!$upload['done']) {
 
                 <title>Manual usage of the file progress</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 $upload  = Zend_File_Transfer_Adapter_Http::getProgress();
 
 while (!$upload['done']) {

documentation/manual/en/module_specs/Zend_File_Transfer-Migration.xml

@@ -54,7 +54,7 @@
                 <example id="zend.file.transfer.migration.fromonesixonetooneseven.validators.rename.example">
                     <title>Changes for the rename filter from 1.6 to 1.7</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Example for 1.6
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addFilter('Rename',
@@ -89,7 +89,7 @@ $upload->addFilter('Rename',
                 <example id="zend.file.transfer.migration.fromonesixonetooneseven.validators.count.example">
                     <title>Changes for the count validator from 1.6 to 1.7</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Example for 1.6
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('Count',
@@ -124,7 +124,7 @@ $upload->addValidator('Count',
                 <example id="zend.file.transfer.migration.fromonesixonetooneseven.validators.extension.example">
                     <title>Changes for the extension validator from 1.6 to 1.7</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Example for 1.6
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('Extension',
@@ -168,7 +168,7 @@ $upload->addValidator('Extension',
                 <example id="zend.file.transfer.migration.fromonesixonetooneseven.validators.filessize.example">
                     <title>Changes for the filessize validator from 1.6 to 1.7</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Example for 1.6
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('FilesSize',
@@ -210,7 +210,7 @@ $upload->setUseByteSting(true); // set flag
                 <example id="zend.file.transfer.migration.fromonesixonetooneseven.validators.hash.example">
                     <title>Changes for the hash validator from 1.6 to 1.7</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Example for 1.6
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('Hash',
@@ -247,7 +247,7 @@ $upload->addValidator('Hash',
                 <example id="zend.file.transfer.migration.fromonesixonetooneseven.validators.imagesize.example">
                     <title>Changes for the imagesize validator from 1.6 to 1.7</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Example for 1.6
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('ImageSize',
@@ -285,7 +285,7 @@ $upload->addValidator('ImageSize',
                 <example id="zend.file.transfer.migration.fromonesixonetooneseven.validators.size.example">
                     <title>Changes for the size validator from 1.6 to 1.7</title>
 
-                    <programlisting role="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 // Example for 1.6
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('Size',
@@ -340,7 +340,7 @@ $upload->addValidator('Size',
             <example id="zend.file.transfer.migration.fromonesixonetoonesixtwo.example">
                 <title>How to change your file validators from 1.6.1 to 1.6.2</title>
 
-                <programlisting role="php"><![CDATA[
+                <programlisting language="php"><![CDATA[
 // Example for 1.6.1
 $upload = new Zend_File_Transfer_Adapter_Http();
 $upload->addValidator('FilesSize', array('1B', '100kB'));

documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml

@@ -236,7 +236,7 @@
         <example id="zend.file.transfer.validators.usage.example">
             <title>Add Validators to a File Transfer Object</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Set a file size with 20000 bytes
@@ -265,7 +265,7 @@ $upload->setValidators(array(
                 given validator.
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Set a file size with 20000 bytes and limits it only to 'file2'
@@ -287,7 +287,7 @@ $upload->addValidator('Size', false, 20000, 'file2');
                 methods provide a fluent interface, so you can couple the calls as shown below:
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Set a file size with 20000 bytes
@@ -319,7 +319,7 @@ $upload->addValidator('Size', false, 20000)
                 will be validated
             </para>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Set a file size with 20000 bytes
@@ -398,7 +398,7 @@ if ($upload->isValid()) {
         <example id="zend.file.transfer.validators.count.example">
             <title>Using the Count Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Limit the amount of files to maximum 2
@@ -443,7 +443,7 @@ $upload->addValidator('Count', false, array('min' =>1, 'max' => 5));
         <example id="zend.file.transfer.validators.crc32.example">
             <title>Using the Crc32 Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Checks whether the content of the uploaded file has the given hash
@@ -493,7 +493,7 @@ $upload->addValidator('Crc32', false, array('3b3652f', 'e612b69'));
         <example id="zend.file.transfer.validators.excludeextension.example">
             <title>Using the ExcludeExtension Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Do not allow files with extension php or exe
@@ -549,7 +549,7 @@ $upload->addValidator('ExcludeExtension',
         <example id="zend.file.transfer.validators.excludemimetype.example">
             <title>Using the ExcludeMimeType Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Does not allow MIME type of gif images for all files
@@ -606,7 +606,7 @@ $upload->addValidator('ExcludeMimeType', false, 'image');
         <example id="zend.file.transfer.validators.exists.example">
             <title>Using the Exists Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Add the temp directory to check for
@@ -665,7 +665,7 @@ $upload->addValidator('Exists',
         <example id="zend.file.transfer.validators.extension.example">
             <title>Using the Extension Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Limit the extensions to jpg and png files
@@ -746,7 +746,7 @@ if (!$upload->isValid('C:\temp\myfile.MO')) {
         <example id="zend.file.transfer.validators.filessize.example">
             <title>Using the FilesSize Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Limit the size of all files to be uploaded to 40000 bytes
@@ -827,7 +827,7 @@ $upload->addValidator('FilesSize',
         <example id="zend.file.transfer.validators.imagesize.example">
             <title>Using the ImageSize Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Limit the size of a image to a height of 100-200 and a width of
@@ -858,7 +858,7 @@ $upload->setImageWidth(array('minwidth' => 20, 'maxwidth' => 200));
         <example id="zend.file.transfer.validators.iscompressed.example">
             <title>Using the IsCompressed Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Checks is the uploaded file is a compressed archive
@@ -894,7 +894,7 @@ $upload->addValidator('IsCompressed', false, 'zip');
         <example id="zend.file.transfer.validators.isimage.example">
             <title>Using the IsImage Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Checks whether the uploaded file is a image file
@@ -950,7 +950,7 @@ $upload->addValidator('IsImage', false, 'jpeg');
         <example id="zend.file.transfer.validators.hash.example">
             <title>Using the Hash Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Checks if the content of the uploaded file contains the given hash
@@ -1000,7 +1000,7 @@ $upload->addValidator('Hash',
         <example id="zend.file.transfer.validators.md5.example">
             <title>Using the Md5 Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Checks if the content of the uploaded file has the given hash
@@ -1062,7 +1062,7 @@ $upload->addValidator('Md5',
         <example id="zend.file.transfer.validators.mimetype.example">
             <title>Using the MimeType Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Limit the MIME type of all given files to gif images
@@ -1138,7 +1138,7 @@ $upload->addValidator('MimeType',
         <example id="zend.file.transfer.validators.notexists.example">
             <title>Using the NotExists Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Add the temp directory to check
@@ -1184,7 +1184,7 @@ $upload->addValidator('NotExists', false,
         <example id="zend.file.transfer.validators.sha1.example">
             <title>Using the sha1 Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Checks if the content of the uploaded file has the given hash
@@ -1249,7 +1249,7 @@ $upload->addValidator('Sha1',
         <example id="zend.file.transfer.validators.size.example">
             <title>Using the Size Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Limit the size of a file to 40000 bytes
@@ -1299,7 +1299,7 @@ $upload->addValidator('Size',
         <example id="zend.file.transfer.validators.wordcount.example">
             <title>Using the WordCount Validator</title>
 
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $upload = new Zend_File_Transfer();
 
 // Limit the amount of words within files to maximum 2000

documentation/manual/en/module_specs/Zend_Filter-Callback.xml

@@ -12,7 +12,7 @@
         Let's expect we want to create a filter which reverses a string.
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $filter = new Zend_Filter_Callback('strrev');
 
 print $filter->filter('Hello!');
@@ -24,7 +24,7 @@ print $filter->filter('Hello!');
         possible to use a method, which is defined within a class, by giving an array as callback.
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 // Our classdefinition
 class MyClass
 {
@@ -47,7 +47,7 @@ print $filter->filter('Hello!');
         will be filtered.
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $filter = new Zend_Filter_Callback(
     'MyMethod',
     array('key' => 'param1', 'key2' => 'param2')
@@ -59,7 +59,7 @@ $filter->filter(array('value' => 'Hello'));
         When you would call the above method definition manually it would look like this:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 $value = MyMethod('Hello', 'param1', 'param2');
 ]]></programlisting>