[svnbook commit] r3314 - in trunk: src/de/book www
jmfelderhoff
noreply at red-bean.com
Wed Sep 17 10:22:27 CDT 2008
Author: jmfelderhoff
Date: Wed Sep 17 10:22:27 2008
New Revision: 3314
Log:
* src/de/book/appb-svn-for-cvs-users.xml
* src/de/book/ch00-preface.xml
* src/de/book/ch01-fundamental-concepts.xml
* src/de/book/ch03-advanced-topics.xml
* src/de/book/ch04-branching-and-merging.xml
* src/de/book/ch05-repository-admin.xml
* src/de/book/ch06-server-configuration.xml
* src/de/book/ch07-customizing-svn.xml
* src/de/book/ch09-reference.xml
* src/de/book/copyright.xml
* www/index.de.html
- Merge in changes from English version from revision 3287 to 3306
(en-1.5-final).
Modified:
trunk/src/de/book/appb-svn-for-cvs-users.xml (contents, props changed)
trunk/src/de/book/ch00-preface.xml (contents, props changed)
trunk/src/de/book/ch01-fundamental-concepts.xml (contents, props changed)
trunk/src/de/book/ch03-advanced-topics.xml (contents, props changed)
trunk/src/de/book/ch04-branching-and-merging.xml (contents, props changed)
trunk/src/de/book/ch05-repository-admin.xml (contents, props changed)
trunk/src/de/book/ch06-server-configuration.xml (contents, props changed)
trunk/src/de/book/ch07-customizing-svn.xml (contents, props changed)
trunk/src/de/book/ch09-reference.xml (contents, props changed)
trunk/src/de/book/copyright.xml (contents, props changed)
trunk/www/index.de.html
Modified: trunk/src/de/book/appb-svn-for-cvs-users.xml
==============================================================================
--- trunk/src/de/book/appb-svn-for-cvs-users.xml (original)
+++ trunk/src/de/book/appb-svn-for-cvs-users.xml Wed Sep 17 10:22:27 2008
@@ -548,7 +548,7 @@
<para>The most popular (and mature) conversion tool is
cvs2svn (<ulink url="http://cvs2svn.tigris.org/"/>), a Python
- script originally created by members of Subversion's own
+ program originally created by members of Subversion's own
development community. This tool is meant to run exactly once:
it scans your CVS repository multiple times and attempts to
deduce commits, branches, and tags as best it can. When it
Modified: trunk/src/de/book/ch00-preface.xml
==============================================================================
--- trunk/src/de/book/ch00-preface.xml (original)
+++ trunk/src/de/book/ch00-preface.xml Wed Sep 17 10:22:27 2008
@@ -651,16 +651,14 @@
Subversion filesystem, and the working copy
administrative areas from a programmer's point of view.
It also demonstrates how to use the public APIs to write a
- program that uses Subversion, and most importantly, how
- to contribute to the development of Subversion.</para>
+ program that uses Subversion.</para>
-->
<para>Beschreibt die Interna von Subversion, das
Subversion-Dateisystem und die Verwaltungsbereiche der
- Arbeitskopie aus der Sicht eines Programmierers.
- Hier wird auch gezeigt, wie die veröffentlichten APIs in
- einem Programm verwendet werden, das Subversion benutzt,
- und, was am wichtigsten ist, wie man zur
- Weiterentwicklung von Subversion beitragen kann.</para>
+ Arbeitskopie aus der Sicht eines Programmierers. Hier
+ wird auch gezeigt, wie die veröffentlichten APIs in
+ einem Programm verwendet werden, das Subversion
+ benutzt.</para>
</listitem>
</varlistentry>
@@ -1525,7 +1523,7 @@
documents (usually over a network) and keep track of who made
which changes, then Subversion is also appropriate. This is
why Subversion is so often used in software development
- environments— programming is an inherently social
+ environments— working on a development team is an inherently social
activity, and Subversion makes it easy to collaborate with
other programmers. Of course, there's a cost to using
Subversion as well: administrative overhead. You'll need to
@@ -1536,6 +1534,7 @@
Instead, you'll have to do all of those things through
Subversion.</para>
-->
+
<para>Falls Sie alte Datei- und Verzeichnisversionen aufbewahren,
sie eventuell wiedererwecken müssen, oder Protokolle darüber
auswerten möchten, wie sie sich im Lauf der Zeit geändert
@@ -1544,7 +1543,7 @@
gemeinsam (üblicherweise über das Netz) an Dokumenten arbeiten
und verfolgen müssen, wer welche Änderung gemacht hat. Deshalb
wird Subversion so oft in Softwareentwicklungsumgebungen
- eingesetzt – Programmierung ist von Natur aus eine soziale
+ eingesetzt – die Arbeit in einem Entwicklerteam ist von Natur aus eine soziale
Tätigkeit und Subversion vereinfacht die Zusammenarbeit mit
anderen Programmierern. Natürlich ist die Benutzung von
Subversion nicht umsonst zu bekommen: es kostet
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 Wed Sep 17 10:22:27 2008
@@ -1309,7 +1309,7 @@
<listitem>
<!--
- <para>A timestamp recording of when the local copy was last
+ <para>A timestamp recording when the local copy was last
updated by the repository</para>
-->
<para>Ein Zeitstempel, der festhält, wann die lokale Kopie
Modified: trunk/src/de/book/ch03-advanced-topics.xml
==============================================================================
--- trunk/src/de/book/ch03-advanced-topics.xml (original)
+++ trunk/src/de/book/ch03-advanced-topics.xml Wed Sep 17 10:22:27 2008
@@ -652,7 +652,7 @@
</screen>
<para>But even if you haven't checked out a working copy from
- that repository, you can still affect the property change by
+ that repository, you can still effect the property change by
providing the repository's root URL:</para>
<screen>
@@ -3009,25 +3009,25 @@
<variablelist>
<varlistentry>
- <term>../</term>
+ <term><literal>../</literal></term>
<listitem><para>Relative to the URL of the directory on which
the <literal>svn:externals</literal> property is
set</para></listitem>
</varlistentry>
<varlistentry>
- <term>^/</term>
+ <term><literal>^/</literal></term>
<listitem><para>Relative to the root of the repository in
which the <literal>svn:externals</literal> property is
versioned</para></listitem>
</varlistentry>
<varlistentry>
- <term>//</term>
+ <term><literal>//</literal></term>
<listitem><para>Relative to the scheme of the URL of the
directory on which the <literal>svn:externals</literal>
property is set</para></listitem>
</varlistentry>
<varlistentry>
- <term>/</term>
+ <term><literal>/</literal></term>
<listitem><para>Relative to the root URL of the server on
which the <literal>svn:externals</literal> property is
versioned</para></listitem>
@@ -3461,7 +3461,7 @@
<para>Subversion 1.5 brings a new
<firstterm>changelists</firstterm> feature that adds yet
another method to the mix. Changelists are basically arbitrary
- labels applied to working copy files for the express purpose of
+ labels (currently at most one per file) applied to working copy files for the express purpose of
associating multiple files together. Users of many of Google's
software offerings are familiar with this concept already. For
example, <ulink url="http://mail.google.com/">Gmail</ulink>
Modified: trunk/src/de/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/de/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/de/book/ch04-branching-and-merging.xml Wed Sep 17 10:22:27 2008
@@ -1525,7 +1525,7 @@
</varlistentry>
<varlistentry>
- <term>Apply reverse merges to a target's natural history</term>
+ <term>Applying reverse merges to a target's natural history</term>
<listitem>
<para>Earlier in this chapter
(<xref linkend="svn.branchmerge.basicmerging.undo"/>)
@@ -1692,7 +1692,7 @@
<para>This technique works, but it's also a little bit
dangerous. The main problem is that we're not clearly
- differentiating between the ideas of <quote>I don't want this
+ differentiating between the ideas of <quote>I already have this
change</quote> and <quote>I don't have this change.</quote>
We're effectively lying to the system, making it think that
the change was previously merged. This puts the
@@ -1966,7 +1966,7 @@
merging your <quote>rename</quote> to the branch has removed
Sally's recent changes from the latest revision!</para>
- <para>This isn't true data loss; Sally's changes are still in
+ <para>This isn't true data loss. Sally's changes are still in
the repository's history, but it may not be immediately
obvious that this has happened. The moral of this story is
that until Subversion improves, be very careful about
@@ -2121,9 +2121,10 @@
URL: http://svn.example.com/repos/calc/branches/my-calc-branch
</screen>
- <para>After <quote>switching</quote> to the branch, your working
- copy is no different from what you would get from doing a fresh
- checkout of the directory. And it's usually more efficient to
+ <para><quote>Switching</quote> a working copy that has no local
+ modifications to a different branch results in the working copy
+ looking just as it would if you'd done a fresh checkout of the
+ directory. It's usually more efficient to
use this command, because often branches differ by only a small
degree. The server sends only the minimal set of changes
necessary to make your working copy reflect the branch
@@ -2531,7 +2532,7 @@
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/stable-1.0 \
- -m "Creating stable branch of calc project."
+ -m "Creating stable branch of calc project."
Committed revision 377.
</screen>
Modified: trunk/src/de/book/ch05-repository-admin.xml
==============================================================================
--- trunk/src/de/book/ch05-repository-admin.xml (original)
+++ trunk/src/de/book/ch05-repository-admin.xml Wed Sep 17 10:22:27 2008
@@ -921,7 +921,7 @@
problems that could prevent the hook from performing the tasks
it is designed to perform.</para>
- <para>There are nine hooks implemented by the Subversion
+ <para>There are serveral hooks implemented by the Subversion
repository, and you can get details about each of them in
<xref linkend="svn.ref.reposhooks" />. As a repository
administrator, you'll need to decide which hooks you wish
@@ -1178,7 +1178,7 @@
<para>This output is human-readable, meaning items such as the
datestamp are displayed using a textual representation
instead of something more obscure (such as the number of
- nanoseconds since the Tasty Freeze guy drove by). But the
+ nanoseconds since the Tastee Freez guy drove by). But the
output is also machine-parsable—because the log
message can contain multiple lines and be unbounded in
length, <command>svnlook</command> provides the length of
Modified: trunk/src/de/book/ch06-server-configuration.xml
==============================================================================
--- trunk/src/de/book/ch06-server-configuration.xml (original)
+++ trunk/src/de/book/ch06-server-configuration.xml Wed Sep 17 10:22:27 2008
@@ -487,8 +487,8 @@
</screen>
<para>When running <command>svnserve</command> in daemon mode,
- you can use the <option>--listen-port=</option> and
- <option>--listen-host=</option> options to customize the
+ you can use the <option>--listen-port</option> and
+ <option>--listen-host</option> options to customize the
exact port and hostname to <quote>bind</quote> to.</para>
<para>Once we successfully start <command>svnserve</command> as
@@ -1115,7 +1115,7 @@
harry
$ svn list svn+ssh://host.example.com/repos/project
-harry at host.example.com's password: *****
+harryssh at host.example.com's password: *****
foo
bar
@@ -1126,16 +1126,16 @@
<para>In this example, the Subversion client is invoking a local
<command>ssh</command> process, connecting to
<literal>host.example.com</literal>, authenticating as the
- user <literal>harry</literal>, then spawning a private
+ user <literal>harryssh</literal> (according to SSH user
+ configuration), then spawning a private
<command>svnserve</command> process on the remote machine
- running as the user <literal>harry</literal>. The
+ running as the user <literal>harryssh</literal>. The
<command>svnserve</command> command is being invoked in tunnel
mode (<option>-t</option>), and its network protocol is being
<quote>tunneled</quote> over the encrypted connection by
<command>ssh</command>, the tunnel agent.
- <command>svnserve</command> is aware that it's running as the
- user <literal>harry</literal>, and if the client performs a
- commit, the authenticated username will be used as the author
+ If the client performs a commit, the authenticated username
+ <literal>harryssh</literal> will be used as the author
of the new revision.</para>
<para>The important thing to understand here is that the
@@ -1369,7 +1369,7 @@
one line—since SSH <filename>authorized_keys</filename>
files do not even allow the conventional backslash character
(<literal>\</literal>) for line continuation. The only
- reason we've formatted it with a line break is to fit it on
+ reason we've shown it with a line break is to fit it on
the physical page of a book.</para>
</sect3>
@@ -2742,7 +2742,7 @@
</screen>
<para>After this is done, we configure the master server's
- <filename>post-commit</filename> hook script to invoke
+ <literal>post-commit</literal> hook script to invoke
<command>svnsync</command> on each slave server:</para>
<programlisting>
@@ -2759,8 +2759,8 @@
commands to run in the background so that the Subversion
client isn't left waiting forever for the commit to
finish. In addition to this
- <filename>post-commit</filename> hook, you'll need a
- <filename>post-revprop-change</filename> hook as well so
+ <literal>post-commit</literal> hook, you'll need a
+ <literal>post-revprop-change</literal> hook as well so
that when a user, say, modifies a log message, the slave
servers get that change also:</para>
@@ -2784,8 +2784,8 @@
won't be able to query the status of locks
(e.g., <userinput>svn status -u</userinput> will show no
information about repository locks). If this bothers you,
- you can write <filename>post-lock</filename> and
- <filename>post-unlock</filename> hook scripts that run
+ you can write <literal>post-lock</literal> and
+ <literal>post-unlock</literal> hook scripts that run
<command>svn lock</command> and <command>svn
unlock</command> on each slave machine, presumably through
a remote shell method such as SSH. That's left as an
Modified: trunk/src/de/book/ch07-customizing-svn.xml
==============================================================================
--- trunk/src/de/book/ch07-customizing-svn.xml (original)
+++ trunk/src/de/book/ch07-customizing-svn.xml Wed Sep 17 10:22:27 2008
@@ -769,10 +769,11 @@
the Subversion client's ability to automatically set
properties on files when they are added or imported.
It contains any number of key-value pairs in the
- format <literal>PATTERN = PROPNAME=PROPVALUE</literal>,
- where <literal>PATTERN</literal> is a file pattern
- that matches a set of filenames and the rest of the
- line is the property and its value. Multiple matches
+ format <literal>PATTERN = PROPNAME=VALUE[;PROPNAME=VALUE
+ ...]</literal>, where <literal>PATTERN</literal> is a file
+ pattern that matches one or more filenames and the rest of
+ the line is a semicolon-delimited set of property
+ assignments. Multiple matches
on a file will result in multiple propsets for that
file; however, there is no guarantee that auto-props
will be applied in the order in which they are listed
Modified: trunk/src/de/book/ch09-reference.xml
==============================================================================
--- trunk/src/de/book/ch09-reference.xml (original)
+++ trunk/src/de/book/ch09-reference.xml Wed Sep 17 10:22:27 2008
@@ -1892,18 +1892,18 @@
</itemizedlist>
- <para><command>svn diff OLD-URL[@OLDREV]
- NEW-URL[@NEWREV]</command> is shorthand for <command>svn
+ <para><userinput>svn diff OLD-URL[@OLDREV]
+ NEW-URL[@NEWREV]</userinput> is shorthand for <userinput>svn
diff --old=OLD-URL[@OLDREV]
- --new=NEW-URL[@NEWREV].</command></para>
+ --new=NEW-URL[@NEWREV].</userinput></para>
- <para><command>svn diff -r N:M URL</command> is shorthand
- for <command>svn diff -r N:M --old=URL
- --new=URL</command>.</para>
-
- <para><command>svn diff [-r N[:M]] URL1[@N]
- URL2[@M]</command> is shorthand for <command>svn diff [-r
- N[:M]] --old=URL1 --new=URL2</command>.</para>
+ <para><userinput>svn diff -r N:M URL</userinput> is shorthand
+ for <userinput>svn diff -r N:M --old=URL
+ --new=URL</userinput>.</para>
+
+ <para><userinput>svn diff [-r N[:M]] URL1[@N]
+ URL2[@M]</userinput> is shorthand for <userinput>svn diff [-r
+ N[:M]] --old=URL1 --new=URL2</userinput>.</para>
<para>If <replaceable>TARGET</replaceable> is a URL, then
revs <literal>N</literal> and <literal>M</literal> can be given either via the
@@ -1911,8 +1911,12 @@
<quote>@</quote> notation as described earlier.</para>
<para>If <replaceable>TARGET</replaceable> is a working copy
- path, the <option>--revision</option> option
- means:</para>
+ path, the default behavior (when no
+ <option>--revision</option> option is provided) is to
+ display the differences between the base and working
+ copies of <replaceable>TARGET</replaceable>. If a
+ <option>--revision</option> option is specified in this
+ scenario, though, it means:</para>
<variablelist>
@@ -1935,14 +1939,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term>(no <option>--revision</option>)</term>
- <listitem>
- <para>The client compares base and working copies of
- <replaceable>TARGET</replaceable>.</para>
- </listitem>
- </varlistentry>
-
</variablelist>
<para>If the alternate syntax is used, the server compares
@@ -2044,7 +2040,7 @@
<screen>
$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 \
- http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500
+ http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500
Index: COMMITTERS
===================================================================
--- COMMITTERS (revision 3000)
@@ -3114,19 +3110,20 @@
</screen>
<tip>
- <para>If you run <command>svn log</command> on a specific
- path and provide a specific revision and get no output
- at all, as in the following:</para>
+ <para>Sometimes when you run <command>svn log</command> on
+ a specific path and a specific revision, you see no log
+ information output at all, as in the following:</para>
<screen>
$ svn log -r 20 http://svn.red-bean.com/untouched.txt
------------------------------------------------------------------------
</screen>
- <para>that just means the path was not modified in
- that revision. If you log from the top of the
- repository or know the file that changed in that
- revision, you can specify it explicitly:</para>
+ <para>That just means the path wasn't modified in that
+ revision. To get log information for that revision,
+ either run the log operation against the repository's
+ root URL, or specify a path that you happen to know was
+ changed in that revision:</para>
<screen>
$ svn log -r 20 touched.txt
@@ -8258,7 +8255,7 @@
the default behavior of <command>svndumpfilter</command>
is to remove all revision properties except for the date
and the log message (which will merely indicate that the
- revision is empty). Passing ths option will preserve
+ revision is empty). Passing this option will preserve
existing revision properties (which may or may not make
sense since the related content is no longer present in
the dump file).</para>
Modified: trunk/src/de/book/copyright.xml
==============================================================================
--- trunk/src/de/book/copyright.xml (original)
+++ trunk/src/de/book/copyright.xml Wed Sep 17 10:22:27 2008
@@ -3,7 +3,7 @@
<programlisting>
-Copyright (c) 2002-2007
+Copyright (c) 2002-2008
Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato.
This work is licensed under the Creative Commons Attribution License.
Modified: trunk/www/index.de.html
==============================================================================
--- trunk/www/index.de.html (original)
+++ trunk/www/index.de.html Wed Sep 17 10:22:27 2008
@@ -39,7 +39,7 @@
<td id="content">
<h1 class="bar"> </h1>
-<h1 class="tagline">Open Source Versionskontrolle der nächsten Generation</h1>
+<h1 class="tagline">Der Standard in<br/>Open-Source-Versionskontrolle</h1>
<h1 class="title1">Version Control with</h1>
<h1 class="title2">Subversion</h1>
@@ -63,10 +63,13 @@
um neue Features erweitert wird, planen wir, die entsprechende
Dokumentation auf dem Laufenden zu halten.</p>
-<p><strong>NEWSFLASH!</strong> O'Reilly hat einen Vertrag mit Ben,
- Fitz und Mike für die Produktion von <span style="text-decoration:
- underline">Version Control with Subversion, Second Edition</span> abgeschlossen.
- Hier werden Sie Neuerungen erfahren, sobald sie bekannt werden.</p>
+<p><strong>ZWEITE AUFLAGE GEHT IN DEN DRUCK:</strong> O'Reilly hat
+ geplant, die zwite Auflage von <span style="text-decoration:
+ underline">Version Control with Subversion</span> am 12. September
+ 2008 in den Druck zu geben. Diese Auflage verwendet die neueste
+ Version unserer Dokumentation und behandelt Subversion
+ 1.5.0. Machen sie jetzt eine <a
+ href="http://www.svnbook.com/buy/">Vorbestellung</a>!</p>
<h2>Online Version des Buches</h2>
More information about the svnbook-dev
mailing list