[svnbook] r4908 committed - Translation: svn.ref.svn.c.resolved
svnbook at googlecode.com
svnbook at googlecode.com
Tue Nov 11 00:03:27 CST 2014
Revision: 4908
Author: jmfelderhoff at gmx.eu
Date: Tue Nov 11 06:03:18 2014 UTC
Log: Translation: svn.ref.svn.c.resolved
https://code.google.com/p/svnbook/source/detail?r=4908
Modified:
/branches/1.8/de/book/ref-svn.xml
=======================================
--- /branches/1.8/de/book/ref-svn.xml Mon Nov 10 17:13:02 2014 UTC
+++ /branches/1.8/de/book/ref-svn.xml Tue Nov 11 06:03:18 2014 UTC
@@ -7767,7 +7767,7 @@
<informalexample>
<screen>
- $ svn proplist --show-inherited-props foo.c <!--
+$ svn proplist --show-inherited-props foo.c <!--
Inherited properties on 'foo.c',
from 'http://svn.example.com/repos':
-->
@@ -8608,7 +8608,9 @@
</refsect1>
</refentry>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
+ <!-- =================================================================
-->
+ <!-- =================================================================
-->
+ <!-- =================================================================
-->
<refentry id="svn.ref.svn.c.resolved">
<indexterm>
@@ -8631,26 +8633,25 @@
<quote>Konfliktzustand</quote> einer Datei oder eines
Verzeichnisses der Arbeitskopie beenden.</refpurpose>
</refnamediv>
- <refsect1>
-<!--
- <title>Synopsis</title>
--->
- <title>Aufruf</title>
+
+ <refsynopsisdiv>
<para><literal>svn resolved PATH...</literal></para>
- </refsect1>
+ </refsynopsisdiv>
+
+ <!-- ===============================================================
-->
<refsect1>
-<!--
<title>Description</title>
-->
<title>Beschreibung</title>
<!--
<para>This command has been deprecated in favor of
- running <userinput>svn resolve - -accept working
<replaceable>PATH</replaceable></userinput>.
- See <xref linkend="svn.ref.svn.c.resolve"/> in the preceding
section for
- details.</para>
+ running <userinput>svn resolve - -accept
+ working <replaceable>PATH</replaceable></userinput>. See
+ <xref linkend="svn.ref.svn.c.resolve"/> in the preceding
+ section for details.</para>
-->
- <para>Von diesem Befehl wird abgeraten; verwenden Sie
+ <para>Dieser Befehl ist veraltet; verwenden Sie
stattdessen <userinput>svn resolve --accept working
<replaceable>PATH</replaceable></userinput>.
Siehe <xref linkend="svn.ref.svn.c.resolve"/> im
@@ -8677,6 +8678,7 @@
linkend="svn.tour.cycle.resolve"/> für eine tiefgehende
Erörterung der Konfliktauflösung.</para> </refsect1>
+ <!-- ===============================================================
-->
<refsect1>
<!--
<title>Options</title>
@@ -8693,6 +8695,7 @@
</informalexample>
</refsect1>
+ <!-- ===============================================================
-->
<refsect1>
<!--
<title>Examples</title>
More information about the svnbook-dev
mailing list