merge r25096 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25097 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/de/module_specs/Zend_View-Helpers-Navigation.xml

@@ -920,103 +920,103 @@ Produkte, Foo Server, FAQ
         <itemizedlist>
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_ALTERNATE</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_ALTERNATE</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_STYLESHEET</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_STYLESHEET</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_START</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_START</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_NEXT</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_NEXT</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_PREV</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_PREV</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_CONTENTS</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_CONTENTS</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_INDEX</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_INDEX</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_GLOSSARY</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_GLOSSARY</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_COPYRIGHT</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_COPYRIGHT</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_CHAPTER</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_CHAPTER</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_SECTION</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_SECTION</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_SUBSECTION</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_SUBSECTION</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_APPENDIX</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_APPENDIX</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_HELP</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_HELP</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_BOOKMARK</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_BOOKMARK</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_CUSTOM</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_CUSTOM</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_ALL</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_ALL</constant>
                 </para>
             </listitem>
         </itemizedlist>

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

@@ -938,103 +938,103 @@ Products, Foo Server, FAQ
         <itemizedlist>
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_ALTERNATE</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_ALTERNATE</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_STYLESHEET</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_STYLESHEET</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_START</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_START</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_NEXT</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_NEXT</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_PREV</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_PREV</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_CONTENTS</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_CONTENTS</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_INDEX</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_INDEX</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_GLOSSARY</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_GLOSSARY</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_COPYRIGHT</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_COPYRIGHT</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_CHAPTER</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_CHAPTER</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_SECTION</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_SECTION</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_SUBSECTION</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_SUBSECTION</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_APPENDIX</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_APPENDIX</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_HELP</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_HELP</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_BOOKMARK</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_BOOKMARK</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_CUSTOM</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_CUSTOM</constant>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <constant>Zend_View_Helper_Navigation_Link::RENDER_ALL</constant>
+                    <constant>Zend_View_Helper_Navigation_Links::RENDER_ALL</constant>
                 </para>
             </listitem>
         </itemizedlist>