[svnbook] r4553 committed - Translation: Feature Branches

[svnbook at googlecode.com]

Revision: 4553
Author:   jmfelderhoff at gmx.eu
Date:     Sat Nov  2 13:12:49 2013 UTC
Log:      Translation: Feature Branches

http://code.google.com/p/svnbook/source/detail?r=4553

Modified:
  /branches/1.6/de/book/ch04-branching-and-merging.xml

=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml	Sat Nov  2  
13:10:00 2013 UTC
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml	Sat Nov  2  
13:12:49 2013 UTC
@@ -6025,7 +6025,7 @@
              wird <filename>/branches/1.0</filename> als Momentaufnahme
              nach <filename>/tags/1.0.0</filename> kopiert. Das Tag
              wird paketiert und an den Kunden ausgeliefert.</para>
-            </listitem>
+        </listitem>

          <listitem>
  <!--
@@ -6071,7 +6071,7 @@

      </sect2>

-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- ===============================================================  
-->
      <sect2 id="svn.branchmerge.commonpatterns.feature">
  <!--
        <title>Feature Branches</title>
@@ -6214,7 +6214,8 @@
          mit dem Stamm zusammenführen:</para>

  <!--
-      <screen>
+      <informalexample>
+        <screen>
  $ cd trunk-working-copy

  $ svn update
@@ -6229,8 +6230,10 @@
   U   .
  …
  </screen>
+      </informalexample>
  -->
-      <screen>
+      <informalexample>
+        <screen>
  $ cd trunk-working-copy

  $ svn update
@@ -6245,13 +6248,14 @@
   U   .
  …
  </screen>
+      </informalexample>

  <!--
        <para>Another way of thinking about this pattern is that your
          weekly sync of trunk to branch is analogous to running
          <command>svn update</command> in a working copy, while the
          final merge step is analogous to running <command>svn
-          commit</command> from a working copy.  After all, what else
+        commit</command> from a working copy.  After all, what else
          <emphasis>is</emphasis> a working copy but a very shallow
          private branch?  It's a branch that's capable of
          storing only one change at a time.</para>