[svnbook commit] r3280 - trunk/src/de/book
jmfelderhoff
noreply at red-bean.com
Sun Aug 24 08:05:27 CDT 2008
Author: jmfelderhoff
Date: Sun Aug 24 08:05:26 2008
New Revision: 3280
Log:
* foreword.xml
ch00-preface.xml
ch01-fundamental-concepts.xml
ch02-basic-usage.xml
- align English text (in comments) with original in ../../en/book.
Modified:
trunk/src/de/book/ch00-preface.xml
trunk/src/de/book/ch01-fundamental-concepts.xml
trunk/src/de/book/ch02-basic-usage.xml
trunk/src/de/book/foreword.xml
Modified: trunk/src/de/book/ch00-preface.xml
==============================================================================
--- trunk/src/de/book/ch00-preface.xml (original)
+++ trunk/src/de/book/ch00-preface.xml Sun Aug 24 08:05:26 2008
@@ -406,7 +406,7 @@
<!--
<para>The following typographic conventions are used in this
- book</para>:
+ book:</para>
-->
<para>Die folgenden typografischen Konventionen werden in diesem
Buch verwendet:</para>
@@ -814,7 +814,7 @@
links to the latest releases and tagged versions of the book in
various formats, as well as instructions for accessing the
book's Subversion repository (where its DocBook XML source
- code lives). Feedback is welcome—encouraged, even. Please
+ code lives). Feedback is welcomed—encouraged, even. Please
submit all comments, complaints, and patches against the book
sources to <email>svnbook-dev at red-bean.com</email>.</para>
-->
@@ -1293,8 +1293,6 @@
-->
<title>Von Brian W. Fitzpatrick</title>
- <!-- ### TODO(fitz): update this? -->
-
<!--
<para>Huge thanks to my wife Marie for being incredibly
understanding, supportive, and most of all, patient. Thank
@@ -1982,7 +1980,7 @@
<listitem>
<!--
<para>Release 1.1 introduced FSFS, a flat-file repository
- storage option for the repository. While the BerkeleyDB
+ storage option for the repository. While the Berkeley DB
backend is still widely used and supported, FSFS has
since become the default choice for
newly created repositories due to its low barrier to
@@ -2013,18 +2011,17 @@
<listitem>
<!--
<para>Release 1.2 introduced the ability to create
- server-side <quote>locks</quote> on files, thus
- serializing commit access to certain resources. While
- Subversion is still a fundamentally concurrent version
- control system, certain types of binary files (e.g. art
- assets) cannot be merged together. The
- locking feature fulfills the need to version and protect
- such resources. With locking also came a
- complete <quote>auto-versioning</quote> implementation,
- allowing Subversion repositories to be mounted as
- network folders. Finally, Subversion 1.2 began using a
- new, faster binary-differencing algorithm to compress
- and retrieve old versions of files.</para>
+ server-side locks on files, thus serializing commit
+ access to certain resources. While Subversion is still
+ a fundamentally concurrent version control system,
+ certain types of binary files (e.g. art assets)
+ cannot be merged together. The locking feature fulfills
+ the need to version and protect such resources. With
+ locking also came a complete WebDAV auto-versioning
+ implementation, allowing Subversion repositories to be
+ mounted as network folders. Finally, Subversion 1.2
+ began using a new, faster binary-differencing algorithm
+ to compress and retrieve old versions of files.</para>
-->
<para>Mit Release 1.2 konnten serverseitige Sperren auf
Dateien erzeugt und somit der Commit-Zugriff für
@@ -2077,11 +2074,11 @@
<para>Release 1.4 introduced a whole new
tool—<command>svnsync</command>— for doing
one-way repository replication over a network. Major
- parts of the working copy metadata were revamped to
+ parts of the working copy metadata were revamped to no
longer use XML (resulting in client-side speed gains),
while the BerkeleyDB repository backend gained the
- ability to automatically <quote>recover</quote> itself
- after a server crash.</para>
+ ability to automatically recover itself after a server
+ crash.</para>
-->
<para>Release 1.4 führte ein völlig neues
Werkzeug – <command>svnsync</command> – ein, um
Modified: trunk/src/de/book/ch01-fundamental-concepts.xml
==============================================================================
--- trunk/src/de/book/ch01-fundamental-concepts.xml (original)
+++ trunk/src/de/book/ch01-fundamental-concepts.xml Sun Aug 24 08:05:26 2008
@@ -43,7 +43,7 @@
makes the information available to others; by reading data, the
client receives information from others. <xref
linkend="svn.basic.repository.dia-1"/> illustrates this.</para> -->
- <para>Subversion ist ein zentralisiertes System zur gemeinsamen
+ <para>Subversion ist ein zentralisiertes System zur gemeinsamen
Nutzung von Informationen. In seinem Kern ist ein Repository ein
zentraler Speicher von Daten. Das Repository speichert Informationen
in Form eines <firstterm>Dateisystembaumes</firstterm>, typischerweise
@@ -68,7 +68,7 @@
to it—every change to every file, and even changes to the
directory tree itself, such as the addition, deletion, and
rearrangement of files and directories.</para> -->
- <para>So, warum ist das interessant? Bis zu diesem Punkt hört sich
+ <para>So, warum ist das interessant? Bis zu diesem Punkt hört sich
das wie die Definition eines typischen File-Servers an. Und
tatsächlich, das Repository <emphasis>ist</emphasis> eine Art von
File-Server, aber nicht von der Art, die Sie kennen. Was das
@@ -396,6 +396,9 @@
<!-- =============================================================== -->
<sect2 id="svn.advanced.reposurls">
+<!--
+ <title>Subversion Repository URLs</title>
+-->
<title>Subversion-Repository-URLs</title>
<!--
@@ -1348,7 +1351,7 @@
because you're ready to submit new changes to the repository
doesn't mean you're ready to receive changes from other
people. And if you have new changes still in progress,
- then <command>svn update</command> should gracefully merge
+ <command>svn update</command> should gracefully merge
repository changes into your own, rather than forcing you to
publish them.</para>
-->
@@ -1430,7 +1433,6 @@
</sect3>
- <!-- TODO(jmf) continue here -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.basic.in-action.mixedrevs.normal">
<!--
Modified: trunk/src/de/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/de/book/ch02-basic-usage.xml (original)
+++ trunk/src/de/book/ch02-basic-usage.xml Sun Aug 24 08:05:26 2008
@@ -437,8 +437,8 @@
<!--
<para>Since Subversion uses a copy-modify-merge
model instead of lock-modify-unlock (see
- <xref linkend="svn.basic.vsn-models"/>), you can start right in
- making changes to the files and directories in your working
+ <xref linkend="svn.basic.vsn-models"/>), you can immediately
+ make changes to the files and directories in your working
copy. Your working copy is just like any other collection of
files and directories on your system. You can edit and change
it, move it around, even delete the entire working copy and
@@ -1617,8 +1617,8 @@
$ svn diff
Index: bar.c
===================================================================
---- bar.c (revision 3)
-+++ bar.c (working copy)
+--- bar.c (revision 3)
++++ bar.c (working copy)
@@ -1,7 +1,12 @@
+#include <sys/types.h>
+#include <sys/stat.h>
@@ -1634,22 +1634,22 @@
Index: README
===================================================================
---- README (revision 3)
-+++ README (working copy)
+--- README (revision 3)
++++ README (working copy)
@@ -193,3 +193,4 @@
+Note to self: pick up laundry.
Index: stuff/fish.c
===================================================================
---- stuff/fish.c (revision 1)
-+++ stuff/fish.c (working copy)
+--- stuff/fish.c (revision 1)
++++ stuff/fish.c (working copy)
-Welcome to the file known as 'fish'.
-Information on fish will be here soon.
Index: stuff/things/bloo.h
===================================================================
---- stuff/things/bloo.h (revision 8)
-+++ stuff/things/bloo.h (working copy)
+--- stuff/things/bloo.h (revision 8)
++++ stuff/things/bloo.h (working copy)
+Here is a new file to describe
+things about bloo.
</screen>
@@ -2089,9 +2089,9 @@
(<userinput>d</userinput>) is what you'll use for this:</para>
-->
<para>Bevor Sie entscheiden, wie Sie einen Konflikt beseitigen
- wollen, wollen Sie wahrscheinlich genau sehen, worin der
- Konflikt besteht, und benutzen hierfür den Befehl
- <firstterm>diff</firstterm> (<userinput>d</userinput>):</para>
+ wollen, wollen Sie wahrscheinlich genau sehen, worin der
+ Konflikt besteht, und benutzen hierfür den Befehl
+ <firstterm>diff</firstterm> (<userinput>d</userinput>):</para>
<screen>
…
@@ -2771,7 +2771,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.tour.cycle.resolve.revert">
<!--
- <title>Punting: using svn revert</title>
+ <title>Punting: Using svn revert</title>
-->
<title>Die Verwendung von svn revert</title>
@@ -3213,8 +3213,8 @@
$ svn diff
Index: rules.txt
===================================================================
---- rules.txt (revision 3)
-+++ rules.txt (working copy)
+--- rules.txt (revision 3)
++++ rules.txt (working copy)
@@ -1,4 +1,5 @@
Be kind to others
Freedom = Responsibility
@@ -3240,8 +3240,8 @@
$ svn diff -r 3 rules.txt
Index: rules.txt
===================================================================
---- rules.txt (revision 3)
-+++ rules.txt (working copy)
+--- rules.txt (revision 3)
++++ rules.txt (working copy)
@@ -1,4 +1,5 @@
Be kind to others
Freedom = Responsibility
@@ -3267,8 +3267,8 @@
$ svn diff -r 2:3 rules.txt
Index: rules.txt
===================================================================
---- rules.txt (revision 2)
-+++ rules.txt (revision 3)
+--- rules.txt (revision 2)
++++ rules.txt (revision 3)
@@ -1,4 +1,4 @@
Be kind to others
-Freedom = Chocolate Ice Cream
@@ -3286,8 +3286,8 @@
$ svn diff -c 3 rules.txt
Index: rules.txt
===================================================================
---- rules.txt (revision 2)
-+++ rules.txt (revision 3)
+--- rules.txt (revision 2)
++++ rules.txt (revision 3)
@@ -1,4 +1,4 @@
Be kind to others
-Freedom = Chocolate Ice Cream
Modified: trunk/src/de/book/foreword.xml
==============================================================================
--- trunk/src/de/book/foreword.xml (original)
+++ trunk/src/de/book/foreword.xml Sun Aug 24 08:05:26 2008
@@ -16,7 +16,7 @@
vom Autor geschrieben und bietet Informationen, die für das
Verständnis wichtig sind. -->
-<preface id="svn-foreword">
+<preface id="svn.foreword">
<prefaceinfo>
<author>
More information about the svnbook-dev
mailing list