[DOCUMENTATION] German:

- sync up to r15072

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

documentation/manual/de/Makefile.in

@@ -24,6 +24,7 @@
 #  check - validate DocBook manual using xmllint.
 #  check1 - validate one DocBook XML file using xmllint.
 #    Requires that you set the XMLFILE variable.
+#  pdf-print - PDF version of manual, in two volumes; requires Apache FOP
 #
 
 # -- parameters you are likely to want to change --
@@ -31,17 +32,15 @@
 # XMLFILE is the name of one DocBook XML file that you want to
 #   test with xmllint, using the 'check1' target.
 
-XEP=@XEP@
-XINC=@XINC@
-FOP=@FOP@
 XSLTPROC=@XSLTPROC@
 XMLLINT=@XMLLINT@
+FOP=@FOP@
 ECSRC=@ECSRC@
 HERE=@HERE@
 
-DOCBOOK_DTD=http://framework.zend.com/docbook/xml/4.5/docbookx.dtd
-DOCBOOK_XSL=http://framework.zend.com/docbook-xsl/htmlhelp/htmlhelp.xsl
-DOCBOOK_FO_XSL=http://framework.zend.com/docbook-xsl/fo/docbook.xsl
+DOCBOOK_DTD?=http://framework.zend.com/docbook/xml/4.5/docbookx.dtd
+DOCBOOK_XSL?=http://framework.zend.com/docbook-xsl/htmlhelp/htmlhelp.xsl
+DOCBOOK_FO_XSL?=http://framework.zend.com/docbook-xsl/fo/docbook.xsl
 HTML_XSL=html.xsl
 MANUAL_XML=manual.xml
 MANUAL_PRINT1_XML=manual-print1.xml
@@ -65,32 +64,36 @@ html/index.html: $(MANUAL_XML) $(HTML_XSL)
 
 $(MANUAL_XML): $(MANUAL_XML).in
 	sed -e 's!@DOCBOOK_DTD@!$(DOCBOOK_DTD)!' $< > $@
-	
-$(MANUAL_PRINT1_XML): $(MANUAL_PRINT1_XML).in
-	sed -e 's!@DOCBOOK_DTD@!$(DOCBOOK_DTD)!' $< > $@
-	
-$(MANUAL_PRINT2_XML): $(MANUAL_PRINT2_XML).in
-	sed -e 's!@DOCBOOK_DTD@!$(DOCBOOK_DTD)!' $< > $@
 
 $(HTML_XSL): $(HTML_XSL).in
 	sed -e 's!@DOCBOOK_XSL@!$(DOCBOOK_XSL)!' $< > $@
 
 # Build the docs in PDF format
 
-pdf-xep: $(MANUAL_XML)
-	$(XSLTPROC) --xinclude --output ZendFramework.fo $(DOCBOOK_FO_XSL) $(MANUAL_XML)
-	"$(XEP)" -fo ZendFramework.fo -pdf ZendFramework.pdf
+pdf-print: pdf-print-volume1 pdf-print-volume2
+
+pdf-dir:
+	@if [ ! -e pdf ]; then \
+		mkdir pdf; \
+	fi
 
-pdf-print-volume1: $(MANUAL_PRINT1_XML)
+pdf-print-volume1: pdf-dir $(MANUAL_PRINT1_XML)
+	@echo "Rendering volume 1 of the PDF manual with $(FOP)..."
 	$(XSLTPROC) --xinclude --output ZendFramework.fo $(DOCBOOK_FO_XSL) $(MANUAL_PRINT1_XML)
-	"$(FOP)" -fo ZendFramework.fo -pdf ZendFrameworkVolume1.pdf
+	"$(FOP)" -fo ZendFramework.fo -pdf pdf/ZendFrameworkVolume1.pdf
 
-pdf-print-volume2: $(MANUAL_PRINT2_XML)
+pdf-print-volume2: pdf-dir $(MANUAL_PRINT2_XML)
+	@echo "Rendering volume 2 of the PDF manual with $(FOP)..."
 	$(XSLTPROC) --xinclude --output ZendFramework.fo $(DOCBOOK_FO_XSL) $(MANUAL_PRINT2_XML)
-	"$(FOP)" -fo ZendFramework.fo -pdf ZendFrameworkVolume2.pdf
+	"$(FOP)" -fo ZendFramework.fo -pdf pdf/ZendFrameworkVolume2.pdf
 
-pdf-print: pdf-print-volume1 pdf-print-volume2
+$(MANUAL_PRINT1_XML): $(MANUAL_PRINT1_XML).in
+	sed -e 's!@DOCBOOK_DTD@!$(DOCBOOK_DTD)!' $< > $@
+	
+$(MANUAL_PRINT2_XML): $(MANUAL_PRINT2_XML).in
+	sed -e 's!@DOCBOOK_DTD@!$(DOCBOOK_DTD)!' $< > $@
 
+# Cleanup
 
 check: $(MANUAL_XML)
 	@echo "Checking the whole manual with $(XMLLINT)..."
@@ -115,9 +118,12 @@ check1: $(MANUAL_LINT_XML)
 
 clean:
 	-rm -f html/*.html html/HTML.manifest
-	-rm -Rf html/figures
+	@if [ -f html/figures ] ; then \
+		rm -Rf html/figures ; \
+	fi
 	-rm -f _temp_*.xml
 	-rm -f ./*.pdf
+	-rm -f ZendFramework.fo
 
 cleanall: clean
 	-rm -f config.* configure

documentation/manual/de/configure.in

@@ -1,68 +1,46 @@
 AC_INIT(Makefile.in)
 AC_COPYRIGHT([Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)])
 
-XINC=xinc
-XEP=xep
 FOP=fop
 XSLTPROC=xsltproc
 XMLLINT=xmllint
 
-AC_ARG_WITH(xep, [  --with-xep   Where to find RenderX XEP],
-	[
-		if test "x$withval" != "xno"; then
-			XEP="$withval"
-		fi
-	]
-)
-AC_PATH_PROG(XEP,  $XEP)
-
-AC_ARG_WITH(xinc, [  --with-xinc  Where to find lunasil XINC],
-	[
-		if test "x$withval" != "xno"; then
-			XINC="$withval"
-		fi
-	]
-)
-AC_PATH_PROG(XINC, $XINC)
-
 AC_ARG_WITH(fop, [  --with-fop  Where to find Apache FOP],
-	[
-		if test "x$withval" != "xno"; then
-			FOP="$withval"
-		fi
-	]
+    [
+        if test "x$withval" != "xno"; then
+            FOP="$withval"
+        fi
+    ]
 )
 AC_PATH_PROG(FOP,  $FOP)
 
 AC_ARG_WITH(xsltproc, [  --with-xsltproc  Where to find xsltproc],
-	[
-		if test "x$withval" != "xno"; then
-			XSLTPROC="$withval"
-		fi
-	]
+    [
+        if test "x$withval" != "xno"; then
+            XSLTPROC="$withval"
+        fi
+    ]
 )
 AC_PATH_PROG(XSLTPROC,  $XSLTPROC)
 
 AC_ARG_WITH(xmllint, [  --with-xmllint  Where to find xmllint],
-	[
-		if test "x$withval" != "xno"; then
-			XMLLINT="$withval"
-		fi
-	]
+    [
+        if test "x$withval" != "xno"; then
+            XMLLINT="$withval"
+        fi
+    ]
 )
 AC_PATH_PROG(XMLLINT,  $XMLLINT)
 
 ECSRC=../trunk
 AC_ARG_WITH(ecsrc, [  --with-ecsrc  Where to find the ecelerity source],
-	[
-		if test "x$withval" != "xno"; then
-			ECSRC="$withval"
-		fi
-	]
+    [
+        if test "x$withval" != "xno"; then
+            ECSRC="$withval"
+        fi
+    ]
 )
 
-AC_SUBST(XINC)
-AC_SUBST(XEP)
 AC_SUBST(FOP)
 AC_SUBST(XSLTPROC)
 AC_SUBST(XMLLINT)
@@ -78,9 +56,7 @@ cat > config.nice <<EOT
     --with-ecsrc='$ECSRC' \
     --with-xsltproc='$XSLTPROC' \
     --with-xmllint='$XMLLINT' \
-    --with-fop='$FOP' \
-    --with-xinc='$XINC' \
-    --with-xep='$XEP'
+    --with-fop='$FOP'
 
 EOT
 chmod +x config.nice

documentation/manual/de/manual-print1.xml.in

@@ -47,6 +47,16 @@
         <xi:include href="module_specs/Zend_Amf-Server.xml" />
     </chapter>
 
+    <chapter id="zend.application">
+        <title>Zend_Application</title>
+        <xi:include href="module_specs/Zend_Application-Introduction.xml" />
+        <xi:include href="module_specs/Zend_Application-QuickStart.xml" />
+        <xi:include href="module_specs/Zend_Application-TheoryOfOperation.xml" />
+        <xi:include href="module_specs/Zend_Application-Examples.xml" />
+        <xi:include href="module_specs/Zend_Application-CoreFunctionality.xml" />
+        <xi:include href="module_specs/Zend_Application-AvailableResources.xml" />
+    </chapter>
+
     <chapter id="zend.auth">
         <title>Zend_Auth</title>
         <xi:include href="module_specs/Zend_Auth.xml" />
@@ -72,6 +82,13 @@
         <xi:include href="module_specs/Zend_Captcha-Adapters.xml" />
     </chapter>
 
+    <chapter id="zend.codegenerator">
+        <title>Zend_CodeGenerator</title>
+        <xi:include href="module_specs/Zend_CodeGenerator-Introduction.xml" />
+        <xi:include href="module_specs/Zend_CodeGenerator-Examples.xml" />
+        <xi:include href="module_specs/Zend_CodeGenerator-Reference.xml" />
+    </chapter>
+
     <chapter id="zend.config">
         <title>Zend_Config</title>
         <xi:include href="module_specs/Zend_Config-Introduction.xml" />
@@ -263,6 +280,8 @@
     <chapter id="zend.loader">
         <title>Zend_Loader</title>
         <xi:include href="module_specs/Zend_Loader.xml" />
+        <xi:include href="module_specs/Zend_Loader-Autoloader.xml" />
+        <xi:include href="module_specs/Zend_Loader-Autoloader-Resource.xml" />
         <xi:include href="module_specs/Zend_Loader-PluginLoader.xml" />
     </chapter>
 

documentation/manual/de/manual-print2.xml.in

@@ -34,12 +34,6 @@
         <xi:include href="ref/installation.xml" />
     </chapter>
 
-    <chapter id="zend.loader">
-        <title>Zend_Loader</title>
-        <xi:include href="module_specs/Zend_Loader.xml" />
-        <xi:include href="module_specs/Zend_Loader-PluginLoader.xml" />
-    </chapter>
-
     <chapter id="zend.locale">
         <title>Zend_Locale</title>
         <xi:include href="module_specs/Zend_Locale-Introduction.xml" />
@@ -99,6 +93,13 @@
         <xi:include href="module_specs/Zend_Mime_Part.xml" />
     </chapter>
 
+    <chapter id="zend.navigation">
+        <title>Zend_Navigation</title>
+        <xi:include href="module_specs/Zend_Navigation-Introduction.xml" />
+        <xi:include href="module_specs/Zend_Navigation-Pages.xml" />
+        <xi:include href="module_specs/Zend_Navigation-Containers.xml" />
+    </chapter>
+
     <chapter id="zend.openid">
         <title>Zend_OpenId</title>
         <xi:include href="module_specs/Zend_OpenId-Introduction.xml" />
@@ -130,6 +131,13 @@
         <xi:include href="module_specs/Zend_ProgressBar.xml" />
     </chapter>
 
+    <chapter id="zend.reflection">
+        <title>Zend_Reflection</title>
+        <xi:include href="module_specs/Zend_Reflection-Introduction.xml" />
+        <xi:include href="module_specs/Zend_Reflection-Examples.xml" />
+        <xi:include href="module_specs/Zend_Reflection-Reference.xml" />
+    </chapter>
+
     <chapter id="zend.registry">
         <title>Zend_Registry</title>
         <xi:include href="module_specs/Zend_Registry.xml" />
@@ -167,6 +175,15 @@
         <xi:include href="module_specs/Zend_Service.xml" />
         <xi:include href="module_specs/Zend_Service_Akismet.xml" />
         <xi:include href="module_specs/Zend_Service_Amazon.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2-Instance.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2-Image.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2-Ebs.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2-Elasticip.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2-Keypair.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2-RegionsAndAvalibilityZones.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_Ec2-Securitygroups.xml" />
+        <xi:include href="module_specs/Zend_Service_Amazon_S3.xml" />
         <xi:include href="module_specs/Zend_Service_Audioscrobbler.xml" />
         <xi:include href="module_specs/Zend_Service_Delicious.xml" />
         <xi:include href="module_specs/Zend_Service_Flickr.xml" />
@@ -199,6 +216,12 @@
         <xi:include href="module_specs/Zend_Soap_AutoDiscovery.xml" />
     </chapter>
 
+    <chapter id="zend.tag">
+        <title>Zend_Tag</title>
+        <xi:include href="module_specs/Zend_Tag-Introduction.xml" />
+        <xi:include href="module_specs/Zend_Tag_Cloud.xml" />
+    </chapter>
+
     <chapter id="zend.test">
         <title>Zend_Test</title>
         <xi:include href="module_specs/Zend_Test.xml" />
@@ -217,6 +240,23 @@
         <xi:include href="module_specs/Zend_TimeSync-Working.xml" />
     </chapter>
 
+    <chapter id="zend.tool.framework">
+        <title>Zend_Tool_Framework</title>
+        <xi:include href="module_specs/Zend_Tool_Framework-Introduction.xml" />
+        <xi:include href="module_specs/Zend_Tool_Framework-CliTool.xml" />
+        <xi:include href="module_specs/Zend_Tool_Framework-Architecture.xml" />
+        <xi:include href="module_specs/Zend_Tool_Framework-WritingProviders.xml" />
+        <xi:include href="module_specs/Zend_Tool_Framework-SystemProviders.xml" />
+    </chapter>
+
+    <chapter id="zend.tool.project">
+        <title>Zend_Tool_Project</title>
+        <xi:include href="module_specs/Zend_Tool_Project.xml" />
+        <xi:include href="module_specs/Zend_Tool_Project-CreateProject.xml" />
+        <xi:include href="module_specs/Zend_Tool_Project-Providers.xml" />
+        <xi:include href="module_specs/Zend_Tool_Project-Internals.xml" />
+    </chapter>
+
     <chapter id="zend.translate">
         <title>Zend_Translate</title>
         <xi:include href="module_specs/Zend_Translate-Introduction.xml" />
@@ -234,6 +274,7 @@
         <xi:include href="module_specs/Zend_Validate-Set.xml" />
         <xi:include href="module_specs/Zend_Validate-ValidatorChains.xml" />
         <xi:include href="module_specs/Zend_Validate-WritingValidators.xml" />
+        <xi:include href="module_specs/Zend_Validate-Messages.xml" />
     </chapter>
     <chapter id="zend.version">
         <title>Zend_Version</title>

documentation/manual/de/manual.xml.in

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!-- EN-Revision: 15048 -->
+<!-- EN-Revision: 15071 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "@DOCBOOK_DTD@"
 [

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 14978 -->
+<!-- EN-Revision: 15052 -->
 <!-- Reviewed: no -->
 <sect3 id="zend.controller.actionhelpers.json">
     <title>JSON</title>
@@ -19,6 +19,19 @@
                 Layouts auschalten wenn sie aktuell aktiviert sind.
         </para></listitem>
 
+        <listitem>
+            <para>
+                Optional ein Array von Optionen als zweites Argument an
+                <code>Zend_Json::encode()</code> übergeben. Dieses Array von Optionen erlaubt es
+                Layouts und Kodierungen einzuschalten indem <code>Zend_Json_Expr</code> verwendet
+                wird.
+            </para>
+
+            <programlisting role="php"><![CDATA[
+$this->_helper->json($data, array('enableJsonExprFinder' => true));
+]]></programlisting>
+        </listitem>
+
         <listitem><para>
                 Den ViewRenderer ausschalten wenn er aktiviert ist.
         </para></listitem>
@@ -54,8 +67,7 @@ class FooController extends Zend_Controller_Action
         $json = $this->_helper->json->encodeJson($data);
     }
 }
-]]>
-    </programlisting>
+]]></programlisting>
 
     <note>
         <title>Layouts behalten</title>
@@ -68,16 +80,47 @@ class FooController extends Zend_Controller_Action
         </para>
 
         <programlisting role="php"><![CDATA[
-class FooController extends Zend_Controller_Action
-{
-    public function barAction()
-    {
-        // JSON empfangen, Layouts erhalten:
-        $json = $this->_helper->json->encodeJson($data, true);
-    }
-}
-]]>
-        </programlisting>
+$this->_helper->json($data, true);
+]]></programlisting>
+
+        <para>
+            Optional kann ein Array als zweiter Parameter übergeben werden. Dieses Array kann eine
+            Vielzahl von Optionen enthalten, inklusive der <code>keepLayouts</code> Option:
+        </para>
+
+        <programlisting role="php"><![CDATA[
+$this->_helper->json($data, array('keepLayouts' => true);
+]]></programlisting>
+    </note>
+
+    <note>
+        <title>Kodierung einschalten durch Verwendung von Zend_Json_Expr</title>
+
+        <para>
+            <code>Zend_Json::encode()</code> erlaubt die Kodierung von nativen JSON Ausdrücken
+            indem <code>Zend_Json_Expr Objekte verwendet</code> werden. Diese Option ist
+            standardmäßig ausgeschaltet. Um diese Option einzuschalten muß ein boolscher
+            <code>true</code> Wert an die <code>enableJsonExprFinder</code> Option übergeben
+            werden:
+        </para>
+
+        <programlisting role="php"><![CDATA[
+$this->_helper->json($data, array('enableJsonExprFinder' => true);
+]]></programlisting>
+
+        <para>
+            Wenn man das durchführen will, <emphasis>muss</emphasis> man ein Array als zweite
+            Option übergeben. Das erlaubt es auch andere Optionen, wie zum Beispiel die
+            <code>keepLayouts</code> Option, zu kombinieren. Alle diese Optionen werden dann
+            an <code>Zend_Json::encode()</code> übergeben.
+        </para>
+
+        <programlisting role="php"><![CDATA[
+$this->_helper->json($data, array(
+    'enableJsonExprFinder' => true,
+    'keepLayouts'          => true,
+));
+]]></programlisting>
     </note>
 </sect3>
 <!--

documentation/manual/de/module_specs/Zend_Tag_Cloud.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 15048 -->
+<!-- EN-Revision: 15054 -->
 <!-- Reviewed: no -->
 <sect1 id="zend.tag.cloud">
 

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 14978 -->
+<!-- EN-Revision: 15052 -->
 <!-- Reviewed: no -->
 <sect3 id="zend.view.helpers.initial.json">
     <title>JSON Helfer</title>
@@ -17,8 +17,7 @@
 
     <programlisting role="text"><![CDATA[
 Content-Type: application/json
-]]>
-    </programlisting>
+]]></programlisting>
 
     <para>
         Die meisten AJAX Bibliotheken sehen nach diesem Header wenn die Antworten geparst werden um
@@ -31,8 +30,49 @@ Content-Type: application/json
 
     <programlisting role="php"><![CDATA[
 <?php echo $this->json($this->data) ?>
-]]>
-    </programlisting>
+]]></programlisting>
+
+    <note>
+        <title>Layouts behalten und Encoding einschalten durch Verwendung von Zend_Json_Expr</title>
+
+        <para>
+            Jede Methode im JSON Helfer akzwptiert ein zweites, optionales, Argument. Dieses
+            zweite Argument kan ein boolsches Flag sein um Layouts ein- oder auszuschalten, oder
+            ein Array von Optionen die an <code>Zend_Json::encode()</code> übergeben und intern
+            verwendet werden um Daten zu kodieren.
+        </para>
+
+        <para>
+            Um Layouts zu behalten muß der zweite Parameter ein boolsches <code>true</code> sein.
+            Wenn der zweite Parameter ein Array ist, können Layouts behalten werden indem ein
+            <code>keepLayouts</code> Schlüssel mit dem boolschen Wert <code>true</code>
+            eingefügt wird.
+        </para>
+
+        <programlisting role="php"><![CDATA[
+// Ein boolsches true als zweites Argument aktiviert Layouts:
+echo $this->json($this->data, true);
+
+// Oder ein boolsches true als "keepLayouts" Schlüssel:
+echo $this->json($this->data, array('keepLayouts' => true));
+]]></programlisting>
+
+
+        <para>
+            <classname>Zend_Json::encode</classname> erlaubt es native JSON Ausdrücke zu kodieren
+            indem <classname>Zend_Json_Expr</classname> Objekte verwendet werden. Diese Option
+            ist standardmäßig deaktiviert. Um diese Option zu aktivieren, muß ein boolsches
+            <code>true</code> an den <code>enableJsonExprFinder</code> Schlüssel des Options
+            Arrays übergeben werden:
+        </para>
+
+        <programlisting role="php"><![CDATA[
+<?php echo $this->json($this->data, array(
+    'enableJsonExprFinder' => true,
+    'keepLayouts'          => true,
+)) ?>
+]]></programlisting>
+    </note>
 </sect3>
 <!--
 vim:se ts=4 sw=4 et: