[svnbook] r5101 committed - branches/1.8/de/book
jensmf at users.sourceforge.net
jensmf at users.sourceforge.net
Mon Feb 8 11:01:55 CST 2016
Revision: 5101
http://sourceforge.net/p/svnbook/source/5101
Author: jensmf
Date: 2016-02-08 17:01:54 +0000 (Mon, 08 Feb 2016)
Log Message:
-----------
catch up with en version part 1
Modified Paths:
--------------
branches/1.8/de/book/book.xml
branches/1.8/de/book/ch00-preface.xml
branches/1.8/de/book/ch01-fundamental-concepts.xml
branches/1.8/de/book/ch02-basic-usage.xml
branches/1.8/de/book/ch03-advanced-topics.xml
branches/1.8/de/book/ch04-branching-and-merging.xml
branches/1.8/de/book/ch06-server-configuration.xml
branches/1.8/de/book/ch07-customizing-svn.xml
branches/1.8/de/book/ch08-embedding-svn.xml
branches/1.8/de/book/copyright.xml
branches/1.8/de/book/ref-svn.xml
branches/1.8/de/book/ref-svnadmin.xml
branches/1.8/de/book/ref-svnmucc.xml
branches/1.8/de/book/ref-svnrdump.xml
branches/1.8/de/book/ref-svnsync.xml
Added Paths:
-----------
branches/1.8/de/book/appd-berkeley-db.xml
Added: branches/1.8/de/book/appd-berkeley-db.xml
===================================================================
--- branches/1.8/de/book/appd-berkeley-db.xml (rev 0)
+++ branches/1.8/de/book/appd-berkeley-db.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -0,0 +1,436 @@
+<!-- -*- sgml -*- -->
+
+<appendix id="svn.berkeleydb">
+ <title>The Berkeley DB Legacy Filesystem</title>
+
+ <para>Long ago, when Subversion first learned to store versioned
+ data, it did so using a storage layer implementation based on the
+ Berkeley DB (BDB) transactional database
+ system.<footnote><para>Okay, strictly speaking, it used XML files
+ for starters. But that was never intended for public
+ release.</para></footnote> As the product matured, though, this
+ storage layer implementation was joined by—and then
+ outmatched by—another one, the FSFS backend which is used by
+ the vast majority of Subversion's repositories today. In
+ Subversion 1.8, the Subversion development community announced
+ that the BDB-based storage layer was being officially
+ deprecated.</para>
+
+ <para>This appendix presents some of the documentation about
+ administering BDB-backed repositories featured more prominently in
+ previous versions of this book.</para>
+
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <sect1 id="svn.berkeleydb.configuration">
+ <title>Configuring Your Berkeley DB Environment</title>
+
+ <para>A Berkeley DB environment is an encapsulation of one or more
+ databases, logfiles, region files, and configuration files. The
+ Berkeley DB environment has its own set of default configuration
+ values for things such as the number of database locks allowed
+ to be taken out at any given time, the maximum size of the
+ journaling logfiles, and so on. Subversion's filesystem logic
+ additionally chooses default values for some of the Berkeley DB
+ configuration options. However, sometimes your particular
+ repository, with its unique collection of data and access
+ patterns, might require a different set of configuration option
+ values.</para>
+
+ <para>The producers of Berkeley DB understand that different
+ applications and database environments have different
+ requirements, so they have provided a mechanism for overriding
+ at runtime many of the configuration values for the Berkeley DB
+ environment. BDB checks for the presence of a file named
+ <filename>DB_CONFIG</filename> in the environment directory
+ (namely, the repository's <filename>db</filename> subdirectory),
+ and parses the options found in that file.</para>
+
+ <para>Subversion creates the <filename>DB_CONFIG</filename> file
+ when it creates the rest of the repository. The file
+ initially contains some default options, as well as pointers
+ to the Berkeley DB online documentation so that you can read
+ about what those options do.</para>
+
+ <informalexample>
+ <screen>
+$ svnadmin create --fstype bdb /var/svn/repos
+$ ls /var/svn/repos/db
+changes __db.003 __db.register log.0000000001 revisions
+checksum-reps __db.004 format miscellaneous strings
+copies __db.005 fs-type node-origins transactions
+__db.001 __db.006 locks nodes uuids
+__db.002 DB_CONFIG lock-tokens representations
+$
+</screen>
+ </informalexample>
+
+ <para>Of course, you are free to add any of the supported Berkeley
+ DB options to your <filename>DB_CONFIG</filename> file. Just be
+ aware that while Subversion never attempts to read or interpret
+ the contents of the file and makes no direct use of the option
+ settings in it, you'll want to avoid any configuration changes
+ that may cause Berkeley DB to behave in a fashion that is at
+ odds with what Subversion might expect. Also, changes made
+ to <filename>DB_CONFIG</filename> won't take effect until you
+ recover the database environment (using
+ <command>svnadmin recover</command>).</para>
+
+ </sect1>
+
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <sect1 id="svn.berkeleydb.limitations">
+ <title>Limitations of Berkeley DB</title>
+
+ <para>The Berkeley DB transactional data store offers all the data
+ integrity promises that you'd expect from a world-class database
+ system. But every rose has its thorn, and so we must note some
+ known limitations of Berkeley DB.</para>
+
+ <!-- =============================================================== -->
+ <sect2 id="svn.berkeleydb.limitations.architectural">
+ <title>Architectural Limitations</title>
+
+ <para>Berkeley DB environments are not portable. You cannot
+ simply copy a Subversion repository that was created on a Unix
+ system onto a Windows system and expect it to work. While much
+ of the Berkeley DB database format is architecture-independent,
+ other aspects of the environment are not.</para>
+
+ <para>Second, Subversion requires the use of Berkeley DB in a
+ way that will not operate on Windows 95/98 systems—if
+ you need to house a BDB-backed repository on a Windows
+ machine, stick with Windows 2000 or later.</para>
+
+ </sect2>
+
+ <!-- =============================================================== -->
+ <sect2 id="svn.berkeleydb.limitations.sharedfs">
+ <title>Network Share Deployment</title>
+
+ <para>While Berkeley DB promises to behave correctly on
+ network shares that meet a particular set of
+ specifications,<footnote><para>Berkeley DB requires that the
+ underlying filesystem implement strict POSIX locking
+ semantics, and more importantly, the ability to map files
+ directly into process memory.</para></footnote> most
+ networked filesystem types and appliances do
+ <emphasis>not</emphasis> actually meet those requirements.
+ And in no case can you allow a BDB-backed repository that
+ resides on a network share to be accessed by multiple
+ clients of that share at once (which quite often is the
+ whole point of having the repository live on a network share
+ in the first place).</para>
+
+ <warning>
+ <para>If you attempt to use Berkeley DB on a noncompliant
+ remote filesystem, the results are unpredictable—you
+ may see mysterious errors right away, or it may be months
+ before you discover that your repository database is
+ subtly corrupted. You should strongly consider using the
+ FSFS data store for repositories that need to live on a
+ network share.</para>
+ </warning>
+
+ </sect2>
+
+ <!-- =============================================================== -->
+ <sect2 id="svn.berkeleydb.limitations.faulttolerance">
+ <title>Fault Tolerance and the Need for Recovery</title>
+
+ <para>Because Berkeley DB is a library linked directly into
+ Subversion, it's more sensitive to interruptions than a
+ typical relational database system. Most SQL systems, for
+ example, have a dedicated server process that mediates all
+ access to tables. If a program accessing the database crashes
+ for some reason, the database daemon notices the lost
+ connection and cleans up any mess left behind. And because
+ the database daemon is the only process accessing the tables,
+ applications don't need to worry about permission
+ conflicts.</para>
+
+ <para>These things are not the case with Berkeley DB, however.
+ Subversion (and programs using Subversion libraries) access
+ the database tables directly, which means that a program crash
+ can leave the database in a temporarily inconsistent,
+ inaccessible state. When this happens, an administrator needs
+ to ask Berkeley DB to restore to a checkpoint, which is a bit
+ of an annoyance. Other things can cause a repository
+ to <quote>wedge</quote> besides crashed processes, such as
+ programs conflicting over ownership and permissions on the
+ database files.</para>
+
+ <note>
+ <para>Berkeley DB 4.4 brings (to Subversion 1.4 and later)
+ the ability for Subversion to automatically and
+ transparently recover Berkeley DB environments in need of
+ such recovery. When a Subversion process attaches to a
+ repository's Berkeley DB environment, it uses some process
+ accounting mechanisms to detect any unclean disconnections
+ by previous processes, performs any necessary recovery,
+ and then continues on as though nothing happened. This
+ doesn't completely eliminate instances of repository
+ wedging, but it does drastically reduce the amount of
+ human interaction required to recover from them.</para>
+ </note>
+
+ </sect2>
+ </sect1>
+
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <sect1 id="svn.berkeleydb.maintenance">
+ <title>Maintaining Berkeley DB Repositories</title>
+
+ <para>In theory, the maintenance of a BDB-backed repository
+ involves essentially the same steps used to maintain an
+ FSFS-backed repository. Historically, though, Berkeley DB
+ repositories have need a little extra TLC<footnote><para>Tender
+ loving care, Baby.</para></footnote> in order to stay
+ operational. This section will cover some of the unique aspects
+ of Berkeley DB administration.</para>
+
+ <!-- =============================================================== -->
+ <sect2 id="svn.berkeleydb.maintenance.recovery">
+ <title>Berkeley DB Recovery</title>
+
+ <para>As mentioned in
+ <xref linkend="svn.berkeleydb.limitations.faulttolerance" />,
+ a Berkeley DB repository can sometimes be left in a frozen
+ state if not closed properly. When this happens, an
+ administrator needs to rewind the database back into a
+ consistent state. This is unique to BDB-backed repositories,
+ though—if you are using FSFS-backed ones instead, this
+ won't apply to you. And for those of you using Subversion 1.4
+ with Berkeley DB 4.4 or later, you should find that Subversion
+ has become much more resilient in these types of situations.
+ Still, wedged Berkeley DB repositories do occur, and an
+ administrator needs to know how to safely deal with this
+ circumstance.</para>
+
+ <para>To protect the data in your repository, Berkeley
+ DB uses a locking mechanism. This mechanism ensures that
+ portions of the database are not simultaneously modified by
+ multiple database accessors, and that each process sees the
+ data in the correct state when that data is being read from
+ the database. When a process needs to change something in the
+ database, it first checks for the existence of a lock on the
+ target data. If the data is not locked, the process locks the
+ data, makes the change it wants to make, and then unlocks the
+ data. Other processes are forced to wait until that lock is
+ removed before they are permitted to continue accessing that
+ section of the database. (This has nothing to do with the
+ locks that you, as a user, can apply to versioned files within
+ the repository; we try to clear up the confusion caused by
+ this terminology collision in the sidebar <xref
+ linkend="svn.advanced.locking.meanings" />.)</para>
+
+ <para>In the course of using your Subversion repository, fatal
+ errors or interruptions can prevent a process from having the
+ chance to remove the locks it has placed in the database. The
+ result is that the backend database system gets
+ <quote>wedged.</quote> When this happens, any attempts to
+ access the repository hang indefinitely (since each new
+ accessor is waiting for a lock to go away—which isn't
+ going to happen).</para>
+
+ <para>If this happens to your repository, don't panic. The
+ Berkeley DB filesystem takes advantage of database
+ transactions, checkpoints, and prewrite journaling to ensure
+ that only the most catastrophic of events<footnote><para>For
+ example, hard drive + huge electromagnet =
+ disaster.</para></footnote> can permanently destroy a database
+ environment. A sufficiently paranoid repository administrator
+ will have made off-site backups of the repository data in some
+ fashion, but don't head off to the tape backup storage closet
+ just yet.</para>
+
+ <para>Instead, use the following recipe to attempt to
+ <quote>unwedge</quote> your repository:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Make sure no processes are accessing (or
+ attempting to access) the repository. For networked
+ repositories, this also means shutting down the Apache HTTP
+ Server or svnserve daemon.</para>
+ </listitem>
+ <listitem>
+ <para>Become the user who owns and manages the repository.
+ This is important, as recovering a repository while
+ running as the wrong user can tweak the permissions of the
+ repository's files in such a way that your repository will
+ still be inaccessible even after it is
+ <quote>unwedged.</quote></para>
+ </listitem>
+ <listitem>
+ <para>Run the <command>svnadmin recover</command> command:</para>
+ <informalexample>
+ <screen>
+$ svnadmin recover /var/svn/repos
+Repository lock acquired.
+Please wait; recovering the repository may take some time...
+
+Recovery completed.
+The latest repos revision is 19.
+$
+</screen>
+ </informalexample>
+ <para>This command may take many minutes to complete.</para>
+ </listitem>
+ <listitem>
+ <para>Restart the server process.</para>
+ </listitem>
+ </orderedlist>
+
+ <para>This procedure fixes almost every case of repository
+ wedging. Make sure that you run this command as the user that
+ owns and manages the database, not just as
+ <literal>root</literal>. Part of the recovery process might
+ involve re-creating from scratch various database files (shared
+ memory regions, e.g.). Recovering as
+ <literal>root</literal> will create those files such that they
+ are owned by <literal>root</literal>, which means that even
+ after you restore connectivity to your repository, regular
+ users will be unable to access it.</para>
+
+ </sect2>
+
+ <!-- =============================================================== -->
+ <sect2 id="svn.berkeleydb.maintenance.bdblogs">
+ <title>Purging unused Berkeley DB logfiles</title>
+
+ <para>Prior to the release of Berkeley DB 4.2, the largest
+ offender of disk space usage with respect to BDB-backed
+ Subversion repositories were the logfiles in which Berkeley DB
+ performs its prewrites before modifying the actual database
+ files. These files capture all the actions taken along the
+ route of changing the database from one state to
+ another—while the database files, at any given time,
+ reflect a particular state, the logfiles contain all of the
+ many changes along the way
+ <emphasis>between</emphasis> states. Thus, they can grow
+ and accumulate quite rapidly.</para>
+
+ <para>Fortunately, beginning with the 4.2 release of Berkeley
+ DB, the database environment has the ability to remove its
+ own unused logfiles automatically. Any
+ repositories created using <command>svnadmin</command>
+ when compiled against Berkeley DB version 4.2 or later
+ will be configured for this automatic logfile removal. If
+ you don't want this feature enabled, simply pass the
+ <option>--bdb-log-keep</option> option to the
+ <command>svnadmin create</command> command. If you forget
+ to do this or change your mind at a later time, simply edit
+ the <filename>DB_CONFIG</filename> file found in your
+ repository's <filename>db</filename> directory, comment out
+ the line that contains the <literal>set_flags
+ DB_LOG_AUTOREMOVE</literal> directive, and then run
+ <command>svnadmin recover</command> on your repository to
+ force the configuration changes to take effect.</para>
+
+ <para>Without some sort of automatic logfile removal in
+ place, logfiles will accumulate as you use your repository.
+ This is actually somewhat of a feature of the database
+ system—you should be able to recreate your entire
+ database using nothing but the logfiles, so these files can
+ be useful for catastrophic database recovery. But
+ typically, you'll want to archive the logfiles that are no
+ longer in use by Berkeley DB, and then remove them from disk
+ to conserve space. Use the <command>svnadmin
+ list-unused-dblogs</command> command to list the unused
+ logfiles:</para>
+
+ <informalexample>
+ <screen>
+$ svnadmin list-unused-dblogs /var/svn/repos
+/var/svn/repos/log.0000000031
+/var/svn/repos/log.0000000032
+/var/svn/repos/log.0000000033
+…
+$ rm `svnadmin list-unused-dblogs /var/svn/repos`
+## disk space reclaimed!
+</screen>
+ </informalexample>
+
+ <warning>
+ <para>BDB-backed repositories whose logfiles are used as
+ part of a backup or disaster recovery plan should
+ <emphasis>not</emphasis> make use of the logfile
+ autoremoval feature. Reconstruction of a repository's
+ data from logfiles can only be accomplished only when
+ <emphasis>all</emphasis> the logfiles are available. If
+ some of the logfiles are removed from disk before the
+ backup system has a chance to copy them elsewhere, the
+ incomplete set of backed-up logfiles is essentially
+ useless.</para>
+ </warning>
+
+ </sect2>
+
+ <!-- =============================================================== -->
+ <sect2 id="svn.berkeleydb.maintenance.bdbutil">
+ <title>Berkeley DB Utilities</title>
+
+ <para>If you're using a Berkeley DB repository, all of
+ your versioned filesystem's structure and data live in a set
+ of database tables within the <filename>db/</filename>
+ subdirectory of your repository. This subdirectory is a
+ regular Berkeley DB environment directory and can therefore
+ be used in conjunction with any of the Berkeley database
+ tools, typically provided as part of the Berkeley DB
+ distribution.</para>
+
+ <para>For day-to-day Subversion use, these tools are
+ unnecessary. Most of the functionality typically needed for
+ Subversion repositories has been duplicated in the
+ <command>svnadmin</command> tool. For example,
+ <command>svnadmin list-unused-dblogs</command> and
+ <command>svnadmin list-dblogs</command> perform a
+ subset of what is provided by the Berkeley
+ <command>db_archive</command> utility, and <command>svnadmin
+ recover</command> reflects the common use cases of the
+ <command>db_recover</command> utility.</para>
+
+ <para>However, there are still a few Berkeley DB utilities
+ that you might find useful. The <command>db_dump</command>
+ and <command>db_load</command> programs write and read,
+ respectively, a custom file format that describes the keys
+ and values in a Berkeley DB database. Since Berkeley
+ databases are not portable across machine architectures,
+ this format is a useful way to transfer those databases from
+ machine to machine, irrespective of architecture or
+ operating system. As we describe later in this chapter, you
+ can also use <command>svnadmin dump</command> and
+ <command>svnadmin load</command> for similar purposes, but
+ <command>db_dump</command> and <command>db_load</command>
+ can do certain jobs just as well and much faster. They can
+ also be useful if the experienced Berkeley DB hacker needs
+ to do in-place tweaking of the data in a BDB-backed
+ repository for some reason, which is something Subversion's
+ utilities won't allow. Also, the <command>db_stat</command>
+ utility can provide useful information about the status of
+ your Berkeley DB environment, including detailed statistics
+ about the locking and storage subsystems.</para>
+
+ <para>For more information on the Berkeley DB tool chain,
+ visit the documentation section of the Berkeley DB section
+ of Oracle's web site, located at <ulink
+ url="http://www.oracle.com/technology/documentation/berkeley-db/db/"
+ />.</para>
+
+ </sect2>
+
+ </sect1>
+</appendix>
+
+<!--
+local variables:
+sgml-parent-document: ("book.xml" "appendix")
+end:
+-->
+
Modified: branches/1.8/de/book/book.xml
===================================================================
--- branches/1.8/de/book/book.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/book.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -34,6 +34,7 @@
<!ENTITY appa SYSTEM "appa-quickstart.xml">
<!ENTITY appb SYSTEM "appb-svn-for-cvs-users.xml">
<!ENTITY appc SYSTEM "appc-webdav.xml">
+<!ENTITY appd SYSTEM "appd-berkeley-db.xml">
<!-- Other Stuff -->
<!ENTITY license SYSTEM "copyright.xml">
@@ -107,6 +108,9 @@
<year>2011</year>
<year>2012</year>
<year>2013</year>
+ <year>2014</year>
+ <year>2015</year>
+ <year>2016</year>
<holder>Ben Collins-Sussman</holder>
<holder>Brian W. Fitzpatrick</holder>
<holder>C. Michael Pilato</holder>
@@ -167,6 +171,7 @@
&appa;
&appb;
&appc;
+ &appd;
</part>
&license;
Modified: branches/1.8/de/book/ch00-preface.xml
===================================================================
--- branches/1.8/de/book/ch00-preface.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch00-preface.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -1221,16 +1221,43 @@
<varlistentry>
<!--
- <term>Subversion 1.8 (not yet released)</term>
+ <term>Subversion 1.8 (June 2013)</term>
-->
- <term>Subversion 1.8 (noch nicht freigegeben)</term>
+ <term>Subversion 1.8 (Juni 2013)</term>
<listitem>
+
<!--
- <para><emphasis>*shrug*</emphasis>. Patches (to
- Subversion) welcome.</para>
+ <para>In release 1.8, Subversion's client now tracks
+ renamed files and directories more thoroughly, and
+ its <command>svn merge</command> command has grown
+ intelligent enough to make the
+ <option>- -reintegrate</option> option unnecessary.
+ Certain new versioned property values can be inherited
+ from parent directories. That feature now allows a
+ repository to dictate default values for automatic
+ property settings and ignorable file patterns, bringing
+ consistency across the user base of that repository in a
+ way which previously had to be managed socially. As
+ always, Subversion 1.8 includes many additional
+ features, defect fixes, and improvements in behavior and
+ performance.</para>
-->
- <para><emphasis>*Schulterzuck*</emphasis>. Patches (für
- Subversion) willkommen.</para>
+ <para>In release 1.8 überwacht der Client von Subversion
+ umbenannte Dateien und Verzeichnisse sorgfältiger,
+ und der Befehl <command>svn merge</command> ist nun
+ intelligent genug, um die Option
+ <option>--reintegrate</option> unnötig zu machen.
+ Bestimmte neue versionierte Eigenschaftswerte können nun
+ von Elternverzeichnissen ererbt werden. Diese
+ Funktionalität erlaubt es einem Projektarchiv nun,
+ Standardwerte für automatische Einstellungen von
+ Eigenschaften und Muster für ignorierbare Dateinamen
+ vorzugeben, und bringt somit Konzistenz in die
+ Gemeinschaft der Nutzer des Projektarchivs, die vorher
+ nur auf sozialem Wege zu bewerkstelligen war. Wie immer,
+ beinhaltet Subversion 1.8 viel zusätzliche
+ Funktionalität, Fehlerbeseitigungen und Verbesserungen
+ im Verhalten und in der Leistung.</para>
</listitem>
</varlistentry>
Modified: branches/1.8/de/book/ch01-fundamental-concepts.xml
===================================================================
--- branches/1.8/de/book/ch01-fundamental-concepts.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch01-fundamental-concepts.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -1099,10 +1099,11 @@
<entry><literal>https://</literal></entry>
<!--
<entry>Same as <literal>http://</literal>, but with
- SSL encryption</entry>
+ SSL encapsulation (encryption and authentication)</entry>
-->
<entry>Wie <literal>http://</literal>, jedoch mit
- SSL-Verschlüsselung</entry>
+ SSL-Einbindung (Verschlüsselung und
+ Authentifizierung).</entry>
</row>
<row>
<entry><literal>svn://</literal></entry>
Modified: branches/1.8/de/book/ch02-basic-usage.xml
===================================================================
--- branches/1.8/de/book/ch02-basic-usage.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch02-basic-usage.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -2382,7 +2382,7 @@
<para>
<indexterm>
<primary>conflicts</primary>
- <secondary>resolving</secondary>
+ <secondary>resolution</secondary>
</indexterm>We've already seen how <userinput>svn status
-u</userinput> can predict conflicts, but dealing with those
conflicts is still something that remains to be done.
@@ -2880,24 +2880,22 @@
-->
<title>Interaktive Konfliktauflösung</title>
- <indexterm>
+ <para>
<!--
- <primary>conflicts</primary>
- <secondary>resolution</secondary>
- <tertiary>interactive</tertiary>
--->
- <primary>Konflikte</primary>
- <secondary>Auflösung</secondary>
- <tertiary>interaktiv</tertiary>
- </indexterm>
-
-<!--
- <para>There are several different ways to resolve conflicts
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>interactive</tertiary>
+ </indexterm>There are several different ways to resolve conflicts
interactively—two of which allow you to selectively
merge and edit changes, the rest of which allow you to
simply pick a version of the file and move along.</para>
-->
- <para>Es gibt mehrere unterschiedliche Wege, um Konflikte
+ <indexterm>
+ <primary>Konflikte</primary>
+ <secondary>Auflösung</secondary>
+ <tertiary>interaktiv</tertiary>
+ </indexterm>Es gibt mehrere unterschiedliche Wege, um Konflikte
interaktiv aufzulösen – von denen Ihnen zwei erlauben,
Änderungen selektiv zusammenzuführen und zu editieren und
die restlichen, die es Ihnen erlauben, einfach eine Version
@@ -3007,19 +3005,13 @@
-->
<title>Aufschieben der Konfliktauflösung</title>
- <indexterm>
+ <para>
<!--
- <primary>conflicts</primary>
- <secondary>resolution</secondary>
- <tertiary>postponing</tertiary>
--->
- <primary>Konflikte</primary>
- <secondary>Auflösung</secondary>
- <tertiary>aufschieben</tertiary>
- </indexterm>
-
-<!--
- <para>This may sound like an appropriate section for avoiding
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>postponing</tertiary>
+ </indexterm>This may sound like an appropriate section for avoiding
marital disagreements, but it's actually still about
Subversion, so read on. If you're doing an update and
encounter a conflict that you're not prepared to review or
@@ -3032,7 +3024,11 @@
will be marked with a <computeroutput>C</computeroutput>
automatically.</para>
-->
- <para>Das hört sich vielleicht an wie ein passender Abschnitt
+ <indexterm>
+ <primary>Konflikte</primary>
+ <secondary>Auflösung</secondary>
+ <tertiary>aufschieben</tertiary>
+ </indexterm>Das hört sich vielleicht an wie ein passender Abschnitt
zur Vermeidung von Ehestreitigkeiten, doch es geht immer
noch um Subversion; also lesen Sie weiter. Falls Sie eine
Aktualisierung vornehmen und ein Konflikt auftaucht, den Sie
@@ -3391,23 +3387,21 @@
-->
<title>Manuelle Konfliktauflösung</title>
- <indexterm>
+ <para>
<!--
- <primary>conflicts</primary>
- <secondary>resolution</secondary>
- <tertiary>manual</tertiary>
--->
- <primary>Konflikte</primary>
- <secondary>Auflösung</secondary>
- <tertiary>manuell</tertiary>
- </indexterm>
-
-<!--
- <para>Manually resolving conflicts can be quite intimidating the
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>manual</tertiary>
+ </indexterm>Manually resolving conflicts can be quite intimidating the
first time you attempt it, but with a little practice, it
can become as easy as falling off a bike.</para>
-->
- <para>Das manuelle Auflösen von Konflikten kann ganz
+ <indexterm>
+ <primary>Konflikte</primary>
+ <secondary>Auflösung</secondary>
+ <tertiary>manuell</tertiary>
+ </indexterm>Das manuelle Auflösen von Konflikten kann ganz
schön einschüchternd sein, wenn Sie es das erste Mal
versuchen; jedoch kann es mit etwas Übung so leicht werden,
wie vom Fahrrad zu fallen.</para>
@@ -3667,12 +3661,21 @@
-->
<title>Die Verwendung von svn revert</title>
+ <para>
<!--
- <para>If you decide that you want to throw out your changes
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>discarding local changes</tertiary>
+ </indexterm>If you decide that you want to throw out your changes
and start your edits again (whether this occurs after a
conflict or anytime), just revert your changes:</para>
-->
- <para>Falls Sie sich entscheiden, Ihre Änderungen zu verwerfen
+ <indexterm>
+ <primary>Konflikte</primary>
+ <secondary>Auflösung</secondary>
+ <tertiary>Verwerfen lokaler Änderungen</tertiary>
+ </indexterm>Falls Sie sich entscheiden, Ihre Änderungen zu verwerfen
und erneut mit der Bearbeitung zu beginnen (ob nach einem
Konflikt oder sonst zu jeder Zeit), machen Sie einfach Ihre
Änderungen rückgängig:</para>
@@ -5769,7 +5772,7 @@
$ cat PATCHFILE
Index: code/bar.c
===================================================================
---- code/bar.c (working copy)
+--- code/bar.c (revision 14)
+++ code/bar.c (working copy)
@@ -1,4 +1,4 @@
const char *bar(void)
@@ -5783,7 +5786,7 @@
$ cat PATCHFILE
Index: code/baz.c
===================================================================
---- code/baz.c (working copy)
+--- code/baz.c (revision 14)
+++ code/baz.c (working copy)
@@ -1,4 +1,4 @@
const char *bar(void)
Modified: branches/1.8/de/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/de/book/ch03-advanced-topics.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch03-advanced-topics.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -7559,7 +7559,7 @@
the database. This is the sort of lock whose unwanted
persistence after an error can cause a repository to
be <quote>wedged,</quote> as described in
- <xref linkend="svn.reposadmin.maint.recovery" />.</para>
+ <xref linkend="svn.berkeleydb.maintenance.recovery" />.</para>
-->
<para>
<indexterm>
@@ -7572,7 +7572,7 @@
zugreifen möchten. Dies ist die Sorte von Sperren, deren
unerwünschte Persistenz nach einem Fehler dazu führen kann,
dass das Projektarchiv sich <quote>verklemmt</quote>, wie in
- <xref linkend="svn.reposadmin.maint.recovery" />
+ <xref linkend="svn.berkeleydb.maintenance.recovery" />
beschrieben.</para>
<!--
@@ -7781,6 +7781,7 @@
Name: banana.jpg
Working Copy Root Path: /home/harry/project
URL: http://svn.example.com/repos/project/banana.jpg
+Relative URL: ^/banana.jpg
Repository Root: http://svn.example.com/repos/project
Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec
Revision: 2198
@@ -7801,6 +7802,7 @@
Name: banana.jpg
Working Copy Root Path: /home/harry/project
URL: http://svn.example.com/repos/project/banana.jpg
+Relative URL: ^/banana.jpg
Basis des Projektarchivs: http://svn.example.com/repos/project
UUID des Projektarchivs: edb2f264-5ef2-0310-a47a-87b0ce17a8ec
Revision: 2198
@@ -8157,6 +8159,7 @@
Path: raisin.jpg
Name: raisin.jpg
URL: http://svn.example.com/repos/project/raisin.jpg
+Relative URL: ^/raisin.jpg
Repository Root: http://svn.example.com/repos/project
Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec
Revision: 105
@@ -8172,6 +8175,7 @@
Pfad: raisin.jpg
Name: raisin.jpg
URL: http://svn.example.com/repos/project/raisin.jpg
+Relative URL: ^/raisin.jpg
Basis des Projektarchivs: http://svn.example.com/repos/project
UID des Projektarchivs: edb2f264-5ef2-0310-a47a-87b0ce17a8ec
Revision: 105
@@ -8350,7 +8354,7 @@
svn: E195013: 'raisin.jpg' is not locked in this working copy
-->
svn: E195013: '»raisin.jpg« ist in dieser Arbeitskopie nicht gesperrt.
-$ svn info raisin.jpg | grep URL
+$ svn info raisin.jpg | grep ^URL
URL: http://svn.example.com/repos/project/raisin.jpg
$ svn unlock http://svn.example.com/repos/project/raisin.jpg <!--
svn: warning: W160039: Unlock failed on 'raisin.jpg' (403 Forbidden)
@@ -9472,6 +9476,7 @@
Name: green.html
Working Copy Root Path: /home/harry/projects/my-project
URL: http://svn.example.com/projects/my-project/trunk/bikeshed/blue.html
+Relative URL: ^/trunk/bikeshed/blue.html
Repository Root: http://svn.example.com/projects/my-project
Repository UUID: b2a368dc-7564-11de-bb2b-113435390e17
Revision: 40
@@ -10735,9 +10740,10 @@
<para>For other Unix-like operating systems, no single
standard <quote>keychain</quote> service exists.
However, the Subversion client knows how to store
- passwords securely using the <quote>GNOME Keyring</quote>
- and <quote>KDE Wallet</quote> services. Also, before
- storing unencrypted passwords in the
+ passwords securely using the <quote>GNOME Keyring</quote>,
+ <quote>KDE Wallet</quote>, and <quote>GnuPG
+ Agent</quote> services. Also, before storing
+ unencrypted passwords in the
<filename>~/.subversion/auth/</filename> caching area,
the Subversion client will ask the user for permission
to do so. Note that the <filename>auth/</filename>
@@ -10754,10 +10760,11 @@
<para>Für andere Unix-ähnliche Betriebssysteme existiert
kein einzelner standardisierter
<quote>Schlüsselring</quote>-Dienst. Der
- Subversion-Client weiß aber, wie er Passwörter sicher mit
- den Diensten <quote>GNOME Keyring</quote> und <quote>KDE
- Wallet</quote> speichern kann. Bevor unverschlüsselte
- Passwörter im Zwischenspeicherbereich
+ Subversion-Client weiß aber, wie er Passwörter sicher
+ mit den Diensten <quote>GNOME Keyring</quote>,
+ <quote>KDE Wallet</quote> und <quote>GnuPG Agent</quote>
+ speichern kann. Bevor unverschlüsselte Passwörter im
+ Zwischenspeicherbereich
<filename>~/.subversion/auth/</filename> gespeichert
werden, fragt der Subversion-Client den Anwender, ob er
das machen darf. Beachten Sie, dass der
Modified: branches/1.8/de/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.8/de/book/ch04-branching-and-merging.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch04-branching-and-merging.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -6446,7 +6446,7 @@
$ svn info | grep URL
URL: http://svn.example.com/repos/calc/trunk
-
+Relative URL: ^/calc/trunk
$ svn switch ^/calc/branches/my-calc-branch
U integer.c
U button.c
@@ -6457,6 +6457,8 @@
$ svn info | grep URL
URL: http://svn.example.com/repos/calc/branches/my-calc-branch
+Relative URL: ^/calc/branches/my-calc-branch
+$
</screen>
</informalexample>
Modified: branches/1.8/de/book/ch06-server-configuration.xml
===================================================================
--- branches/1.8/de/book/ch06-server-configuration.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch06-server-configuration.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -3342,6 +3342,502 @@
</sect3>
</sect2>
+
+ <!-- =============================================================== -->
+ <sect2 id="svn.serverconfig.svnserve.ref">
+<!--
+ <title>svnserve Configuration Reference</title>
+-->
+ <title>svnserve Konfigurations-Referenz</title>
+
+<!--
+ <para>In the previous sections, we've mentioned numerous
+ configuration options that administrators can use in their
+ <filename>svnserve.conf</filename> files to configure the
+ behavior of Subversion as accessed via Subversion's
+ <command>svnserve</command> server option. In this section,
+ we'll quickly summarize <emphasis>all</emphasis> the
+ configuration options supported by this server.</para>
+-->
+ <para>In den vorhergehenden Abschnitten erwähnten wir zahlreiche
+ Optionen, die Administratoren in ihren
+ <filename>svnserve.conf</filename> Dateien verwenden können,
+ um das Verhalten von Subversion zu konfigurieren, so wie es
+ beim Zugriff über die Server-Option
+ <command>svnserve</command> geschieht. In diesem Abschnitt
+ wollen wir schnell <emphasis>alle</emphasis> von diesem Server
+ unterstützten Konfigurationsoptionen zusammenfassen.</para>
+
+<!--
+ <para>The <filename>svnserve.conf</filename> configuration file
+ uses a typical INI-style format, with name/value pairs of
+ options grouped into named sections. (This is conveniently
+ the same format used by Subversion's runtime configuration
+ area on the client side of the network.) We'll describe
+ herein each of those named sections and the options available
+ for use within them.</para>
+-->
+ <para>Die Konfigurations-Datei <filename>svnserve.conf</filename>
+ verwendet ein typisches Format im INI-Stil mit Name-Wert
+ Paaren von Optionen, die in benannten Abschnitten
+ zusammengefasst werden. (Praktischerweise handelt es sich um
+ dasselbe Format, das im client-seitigen
+ Laufzeit-Konfigurations-Bereich des Netzes Verwendung findet.)
+ Wir werden hiermit jeden dieser benamten Abschnitte sowie die
+ darin verfügbaren Optionen beschreiben.</para>
+
+<!--
+ <para>By default, <command>svnserve</command> will consult
+ per-repository configuration files located
+ at <filename>conf/svnserve.conf</filename> within the physical
+ directory structure of the repository. To instead use a
+ single configuration file whose values apply to all
+ repositories served via an instance
+ of <command>svnserve</command>, use
+ the <option>- -config-file</option> option when starting your
+ server.</para>
+-->
+ <para>Standardmäßig untersucht <command>svnserve</command>
+ Konfigurations-Dateien pro Projektarchiv, die sich in
+ <filename>conf/svnserve.conf</filename> innerhalb der
+ physischen Verzeichnisstruktur des Projektarchivs befinden. Um
+ stattdessen eine einzelne Konfigurations-Datei zu verwenden,
+ deren Werte für alle Projektarchive gelten, die von einer
+ Instanz von <command>svnserve</command> bedient werden,
+ verwenden Sie beim Start Ihres Servers die Option
+ <option>--config-file</option>.</para>
+
+ <note>
+<!--
+ <para>In the following sections, we will refer to
+ the <command>svnserve</command> configuration file by its
+ canonical name, <filename>svnserve.conf</filename>. The
+ filename of actual configuration file used by
+ your <command>svnserve</command> instance might be something
+ else, though. We trust this won't be too confusing.</para>
+-->
+ <para>In den folgenden Abschnitten beziehen wir uns auf die
+ Konfigurations-Datei von <command>svnserve</command> unter
+ deren kanonischen Namen <filename>svnserve.conf</filename>.
+ Der Dateiname der tatsächlich von Ihrer
+ <command>svnserve</command>-Instanz verwendeten
+ Konfigurations-Datei kann jedoch anders lauten. Wir gehen
+ davon aus, das es nicht zu verwirrend wird.</para>
+ </note>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <sect3 id="svn.serverconfig.svnserve.ref.general">
+<!--
+ <title>General configuration</title>
+-->
+ <title>Allgemeine Konfiguration</title>
+
+<!--
+ <para>The <literal>[general]</literal> section contains the
+ most commonly used and broadly
+ focused <command>svnserve</command> configuration
+ options.</para>
+-->
+ <para>Der Abschnitt <literal>[general]</literal> beinhaltet
+ die meist verwendeten und am weitesten wirksamen
+ Konfigurations-Optionen von
+ <command>svnserve</command>.</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><literal>anon-access</literal></term>
+ <listitem>
+
+<!--
+ <para>Controls the access level granted to
+ unauthenticated (anonymous) users. Valid values
+ are <literal>write</literal>, <literal>read</literal>,
+ and <literal>none</literal>, with <literal>read</literal>
+ being the default value.</para>
+-->
+ <para>Kontrolliert die Zugriffs-Ebene, die
+ nicht-authentifizierten (anonymen) Anwendern gewährt
+ wird. Gültige Werte sind <literal>write</literal>,
+ <literal>read</literal>, und <literal>none</literal>,
+ wobei <literal>read</literal> der Standardwert
+ ist.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>auth-access</literal></term>
+ <listitem>
+
+<!--
+ <para>Controls the access level granted to authenticaed
+ users. Valid values are <literal>write</literal>,
+ <literal>read</literal>, and <literal>none</literal>,
+ with <literal>write</literal> being the default
+ value.</para>
+-->
+ <para>Kontrolliert die Zugriffs-Ebene, die
+ -authentifizierten Anwendern gewährt wird. Gültige
+ Werte sind <literal>write</literal>,
+ <literal>read</literal>, und <literal>none</literal>,
+ wobei <literal>write</literal> der Standardwert
+ ist.</para>
+
+ </listitem>
+ </varlistentry>
+ <!-- TODO: CONTINUE HERE -->
+ <varlistentry>
+ <term><literal>authz-db</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies the location of the repository access
+ file as described in
+ <xref linkend="svn.serverconfig.pathbasedauthz.getting-started"
+ />. If a regular local path is used, then unless that
+ path begins with a forward-slash character
+ (<literal>/</literal>), it is interpreted as a path
+ relative to the directory containing
+ the <filename>svnserve.conf</filename> configuration
+ file. If no path is specified, path-based access
+ control will be disabled.</para>
+-->
+ <para>Gibt den Ort der Projektarchiv-Zugriffs-Datei an,
+ wie in
+ <xref linkend="svn.serverconfig.pathbasedauthz.getting-started"
+ /> beschrieben. Falls ein gewöhnlicher lokaler Pfad
+ verwendet wird, der nicht mit einem Schrägstrich
+ (<literal>/</literal>) beginnt, wird er relativ zum
+ dem Verzeichnis interpretiert, in dem sich die
+ Konfigurations-Datei
+ <filename>svnserve.conf</filename> befindet. Ist kein
+ Pfad angegeben, die pfad-basierte Zugriffskontrolle
+ abgeschaltet.</para>
+
+<!--
+ <para>As a special consideration, you may also specify
+ the location of an access file which is versioned
+ inside a Subversion repository. Use a local URL (one
+ which begins with <literal>file://</literal>) to refer
+ to an absolute Subversion-versioned access file.
+ Alternatively, use a repository relative URL (one
+ which begins with <literal>^/</literal>) to cause
+ <command>svnserve</command> to consult for each
+ repository the access file stored at the specified
+ relative URL within that repository.</para>
+-->
+ <para>Als besondere Gegenleistung können Sie auch den
+ Ort einer Zugriffsdatei angeben, die innerhalb eines
+ Subversion-Projektarchivs versioniert ist. Verwenden
+ Sie einen lokalen URL (einen, der mit
+ <literal>file://</literal> beginnt), um sich auf eine
+ absolute Zugriffsdateizu beziehen, die durch
+ Subversion versioniert ist. Alternativ können Sie
+ einen URL relativ zum Projektarchiv angeben(einer, der
+ mit <literal>^/</literal> beginnt), um
+ <command>svnserve</command> dazu zu veranlassen, für
+ jedes Projektarchiv die unter dem bestimmten relativen
+ URL in diesem Projektarchiv gespeicherte Datei
+ heranzuziehen.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>force-username-case</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies the case normalization applied to
+ usernames before comparing them against the rules
+ found in the access file (specified by
+ the <literal>authz-db</literal> option). Valid values
+ are <literal>upper</literal> (to uppercase the
+ usernames), <literal>lower</literal> (to lowercase the
+ usernames), and <literal>none</literal> (to perform no
+ normalization at all). By
+ default, <command>svnserve</command> will not perform
+ any case normalization on usernames.</para>
+-->
+ <para>Gibt die Normalisierung der Groß- bzw.
+ Kleinschreibung von Anwendernamen an, bevor sie mit
+ den Regeln in der Zugriffsdatei (durch die Option
+ <literal>authz-db</literal> spezifiziert) verglichen
+ werden. Gültige Werte sind <literal>upper</literal>
+ (Anwendernamen in Großbuchstaben umwandeln),
+ <literal>lower</literal> (Anwendernamen in
+ Kleinbuchstaben umwandeln) und <literal>none</literal>
+ (keine Umwandlung vornehmen). Standardmäßig nimmt
+ <command>svnserve</command> keinerlei Umwandlung von
+ Anwendernamen vor.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>groups-db</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies the path of the groups file. If a
+ regular local path is used, then unless that path
+ begins with a forward-slash character
+ (<literal>/</literal>), it is interpreted as a path
+ relative to the directory containing
+ the <filename>svnserve.conf</filename> configuration
+ file.</para>
+-->
+ <para>Gibt den Pfad der Gruppen-Datei an. Falls ein
+ gewöhnlicher lokaler Pfad verwendet wird, der nicht
+ mit einem Schrägstrich (<literal>/</literal>) beginnt,
+ wird er relativ zum dem Verzeichnis interpretiert, in
+ dem sich die Konfigurations-Datei
+ <filename>svnserve.conf</filename> befindet.</para>
+
+<!--
+ <para>You may also specify the location of a groups file
+ which is versioned inside a Subversion repository.
+ Use a local URL (one which begins
+ with <literal>file://</literal>) to refer to an
+ absolute Subversion-versioned file. Alternatively,
+ use a repository relative URL (one which begins
+ with <literal>^/</literal>) to cause
+ <command>svnserve</command> to consult for each
+ repository the group file stored at the specified
+ relative URL within that repository.</para>
+-->
+ <para>Sie können auch einen Ort einer Gruppen-Datei
+ angeben, die innerhalb eines Subversion-Projektarchivs
+ versioniert ist. Verwenden Sie einen lokalen URL
+ (einer, der mit <literal>file://</literal> beginnt),
+ um eine absolute Datei unter Subversion-Versionierung
+ zu referenzieren. Alternativ verwenden Sie einen URL
+ relativ zum Projektarchiv (einer, der mit
+ <literal>^/</literal> beginnt), um
+ <command>svnserve</command> dazu zu veranlassen, für
+ jedes Projektarchiv die Gruppen-Datei zu lesen, die am
+ angegebenen relativen URL innerhalb diesed
+ Projektarchivs liegt.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>hooks-env</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies the path to the hook script environment
+ configuration file. This option overrides the
+ per-repository default location for this file, and can
+ be used to configure the hook script environment for
+ multiple repositories in a single file if an absolute
+ path is specified. Unless you specify an absolute
+ path, the file's location is interpreted as relative
+ to the directory containing
+ the <filename>svnserve.conf</filename> configuration
+ file.</para>
+-->
+ <para>Gibt den Pfad zur Umgebungs-Konfigurations-Datei
+ für Hook-Skripte an. Diese Option überschreibt den
+ Standard-Ort für diese Datei pro Projektarchiv und
+ kann verwendet werden, um die Umgebung für
+ Hook-Skripte mehrerer Projektarchive in einer einzigen
+ Datei zu konfigurieren, falls ein absoluter Pfad
+ angegeben wird. Falls Sie keinen absoluten Pfad
+ angeben, wird der Ort der Datei relativ zu dem
+ Verzeichnis interpretiert, in dem sich die
+ Konfigurations-Datei
+ <filename>svnserve.conf</filename> befindet.</para>
+
+ <!--
+ <para>You may also specify the location of a groups file
+ which is versioned inside a Subversion repository.
+ Use a local URL (one which begins
+ with <literal>file://</literal>) to refer to an
+ absolute Subversion-versioned file. Alternatively,
+ you may use a repository relative URL (one which
+ begins with <literal>^/</literal>) to cause
+ <command>svnserve</command> to consult for each
+ repository the group file stored at the specified
+ relative URL within that repository.</para>
+ -->
+
+<!--
+ <para>See
+ <xref linkend="svn.reposadmin.hooks.configuration" />
+ for detailed information regarding the hook script
+ environment configuration file.</para>
+-->
+ <para>Siehe
+ <xref linkend="svn.reposadmin.hooks.configuration" />
+ für detailierte Informationen zur
+ Umgebungs-Konfigurations-Datei für
+ Hook-Scripte.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>password-db</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies the path of the password database file.
+ Unless the path specified begins with a forward-slash
+ character (<literal>/</literal>), it is interpreted as
+ a path relative to the directory containing the
+ <filename>svnserve.conf</filename> configuration file.
+ Note that if the SASL feature is used, this option
+ will be ignored.</para>
+-->
+ <para>Gibt den Pfad zur Passwort-Datei an. Sofern der
+ angegebene Pfad nicht mit einem Schrägstrich
+ (<literal>/</literal>) beginnt, wird er relativ zum
+ Verzeichnis interpretiert, in dem sich die
+ Konfigurations-Datei
+ <filename>svnserve.conf</filename> befindet.
+ Beachten Sie, dass diese Option ignoriert wird, falls
+ die SASL-Funktionalität verwendet wird.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>realm</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies the authentication realm of the
+ repository. This is primarily used by the client to
+ associate cached authentication credentials with a
+ specific repository or set of repositories. As such,
+ it is best that the specified realm be unique across
+ your repositories unless those repositories share the
+ same password database. By default, the repository's
+ UUID is used as its authentication realm.</para>
+-->
+ <para>Gibt die Zugangsregion des Projektarchivs an. Dies
+ wird primär vom Client verwendet, um
+ zwischengespeicherte Authentisierungsdaten mit einem
+ bestimmten Projektarchiv oder einer Menge von
+ Projektarchiven zu verknüpfen. Daher sollte die
+ angegebene Region über die Projektarchiv hinweg
+ eindeutig sein, es sei denn, diese Projektarchive
+ teilen sich dieselben Passwort-Daten. Standardmäßig
+ wird der UUID des Projektarchivs als seine
+ Zugangsregion verwendet.</para>
+
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect3>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <sect3 id="svn.serverconfig.svnserve.ref.sasl">
+<!--
+ <title>Cyrus SASL configuration</title>
+-->
+ <title>Cyrus SASL Konfiguration</title>
+
+<!--
+ <para>The <literal>[sasl]</literal> section contains
+ configuration which is specific to the optional Cyrus Simple
+ Authentication and Security Layer (SASL) integration feature
+ of <command>svnserve</command>. See
+ <xref linkend="svn.serverconfig.svnserve.sasl"/> for a more
+ thorough description of this feature and the benefits it
+ provides.</para>
+-->
+ <para>Der Abschnitt <literal>[sasl]</literal> beinhaltet die
+ Konfiguration, die spezifisch für die optionale Cyrus Simple
+ Authentication and Security Layer (SASL) Integration von
+ <command>svnserve</command> ist. Siehe
+ <xref linkend="svn.serverconfig.svnserve.sasl"/> für eine
+ gründlichere Beschreibung dieser Funktionalität und die
+ hiermit verbundenen Vorteile.</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><literal>max-encryption</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies—as an integer bit-width—the
+ maximum desired strength of the security layer's
+ encryption algorithm. The special
+ value <literal>0</literal> means "no encryption", and
+ the special value <literal>1</literal> means
+ "integrity checking only". The default value for this
+ option is <literal>256</literal> (256-bit
+ encryption).</para>
+-->
+ <para>Gibt die maximale Stärke des
+ Verschlüsselungs-Algorithmus der Sicherheitsschicht
+ als ganzzahlige Bit-Breite an.
+ Der besondere Wert
+ <literal>0</literal> bedeutet "keine Verschlüsselung", und
+ der besondere Wert <literal>1</literal> bedeutet
+ "nur Integritäts-Überprüfung". Der Standardwert für
+ diese Option ist <literal>256</literal> (256-bit
+ Verschlüsselung).</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>min-encryption</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies—as an integer bit-width—the
+ minimum desired strength of the security layer's
+ encryption algorithm. The special
+ value <literal>0</literal> means "no encryption", and
+ the special value <literal>1</literal> means
+ "integrity checking only". The default value for this
+ option is <literal>0</literal> (no encryption).</para>
+-->
+ <para>Gibt die minimale Stärke des
+ Verschlüsselungs-Algorithmus der Sicherheitsschicht
+ als ganzzahlige Bit-Breite an. Der besondere Wert
+ <literal>0</literal> bedeutet "keine Verschlüsselung",
+ und der besondere Wert <literal>1</literal> bedeutet
+ "nur Integritäts-Überprüfung". Der Standardwert für
+ diese Option ist <literal>0</literal> (keine
+ Verschlüsselung).</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>use-sasl</literal></term>
+ <listitem>
+
+<!--
+ <para>Specifies (as a <literal>true</literal>
+ or <literal>false</literal> value) whether to enable
+ the Cyrus SASL feature. Note that this feature is
+ only available if <command>svnserve</command> was
+ built with support for the feature. This feature is
+ disabled by default.</para>
+-->
+ <para>Gibt an (als <literal>true</literal> oder
+ <literal>false</literal> Wert), ob die the Cyrus SASL
+ Funktionalität aktiviert werden soll. Beachten Sie,
+ dass diese Funktionalität nur verfügbar ist, falls
+ dessen Unterstützung in <command>svnserve</command>
+ eingebaut wurde. Standardmäßig ist diese
+ Funktionalität deaktiviert.</para>
+
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </sect3>
+ </sect2>
</sect1>
@@ -6874,7 +7370,7 @@
# Die initiale Replizierung durchführe
$ svnsync sync http://slave1.example.com/svn-proxy-sync \
-$ svnsync sync http://slave1.example.com/svn-proxy-sync <!--
+$ file:///var/syn/repos <!--
Transmitting file data ....
Committed revision 1.
Copied properties for revision 1.
Modified: branches/1.8/de/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/de/book/ch07-customizing-svn.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch07-customizing-svn.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -582,24 +582,24 @@
attempt to use when saving and retrieving cached
authentication credentials, and in what order
Subversion should prefer them. The default value is
- <literal>gnome-keyring, kwallet, keychain,
+ <literal>gnome-keyring, kwallet, keychain, gpg-agent,
windows-crypto-api</literal>, representing the GNOME
- Keyring, KDE Wallet, Mac OS X Keychain, and Microsoft
- Windows cryptography API, respectively. Listed stores
- which are not available on the system are
- ignored.</para>
+ Keyring, KDE Wallet, Mac OS X Keychain, GnuPG Agent,
+ and Microsoft Windows cryptography API, respectively.
+ Listed stores which are not available on the system
+ are ignored.</para>
-->
<para>Diese Liste aus durch Komma getrennten Elementen
bestimmt, welche der (wenn überhaupt) vom System
bereitgestellten Passwortspeicher von Subversion zur
Zwischenspeicherung von Authentifizierungsdaten in
Erwägung gezogen werden sollen. Der Standardwert ist
- <literal>gnome-keyring, kwallet, keychain,
+ <literal>gnome-keyring, kwallet, keychain, gpg-agent,
windows-crypto-api</literal>, was für GNOME
- Keyring, KDE Wallet, Mac OS X Keychain bzw. Microsoft
- Windows Cryptography API steht. Aufgeführte Speicher,
- die auf dem System nicht zur Verfügung stehen, werden
- ignoriert.</para>
+ Keyring, KDE Wallet, Mac OS X Keychain, GnuPG Agent
+ bzw. Microsoft Windows Cryptography API steht.
+ Aufgeführte Speicher, die auf dem System nicht zur
+ Verfügung stehen, werden ignoriert.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -1599,19 +1599,20 @@
wait for a server response. If you experience
problems with a slow network connection causing
Subversion operations to time out, you should increase
- the value of this option. The default value is
- <literal>0</literal>, which instructs the underlying
- HTTP library, Neon, to use its default timeout
- setting.</para>
+ the value of this option. In Subversion 1.8 (or
+ older versions employing the Serf-based HTTP
+ provider), use the value <literal>0</literal> to
+ disable the timeout altogether.</para>
-->
<para>Die Zeitspanne in Sekunden, in der auf eine
Antwort vom Server gewartet werden soll. Falls Sie
Probleme mit einer langsamen Netzverbindung haben, die
zu Auszeiten bei Subversion-Operationen führen,
- sollten Sie den Wert dieser Option erhöhen. Der
- Standardwert ist <literal>0</literal>, der der
- zugrunde liegenden HTTP-Bibliothek, Neon, auffordert,
- deren Standardwert zu benutzen.</para>
+ sollten Sie den Wert dieser Option erhöhen. Verwenden Sie den
+ Wert <literal>0</literal> in Subversion 1.8 (oder
+ älteren Versionen, die den Serf-basierten HTTP
+ Diensteanbieter verwenden), um den Timeout vollständig
+ abzuschalten.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -1715,13 +1716,15 @@
PKCS#11 provider from which an SSL client certificate
will be drawn (if the server asks for one). This
setting is only honored by Subversion's Neon-based
- HTTP provider module.</para>
+ HTTP provider module, which was removed in Subversion
+ 1.8.</para>
-->
<para>Der Wert dieser Option ist der Name des
PKCS#11-Lieferanten, von dem ein SSL-Client-Zertifikat
gezogen wird (falls der Server danach fragt). Diese
Einstellung wird nur von Subversions Neon-basierten
- HTTP-Modul berücksichtigt.</para>
+ HTTP-Modul berücksichtigt, das in Subversion 1.8
+ entfernt wurde.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -2522,34 +2525,42 @@
<note>
<!--
- <para>The decision on when to fire off a contextual two- or three-way
- diff as part of a larger Subversion operation is made entirely
- by Subversion and is affected by, among other things, whether
- the files being operated on are human-readable as
- determined by their <literal>svn:mime-type</literal> property.
- This means, for example, that even if you had the niftiest
- Microsoft Word-aware differencing or merging tool in the
- universe, it would never be invoked by Subversion as long as
- your versioned Word documents had a configured MIME type that
- denoted that they were not human-readable (such as
- <literal>application/msword</literal>). For more about MIME
- type settings, see <xref
- linkend="svn.advanced.props.special.mime-type"/></para>
+ <para>The decision on when to fire off a contextual two- or
+ three-way diff as part of a larger Subversion operation is
+ made internally by Subversion and is affected by, among other
+ things, whether the files being operated on are human-readable
+ as determined by their <literal>svn:mime-type</literal>
+ property. This means, for example, that even if you had the
+ niftiest Microsoft Word-aware differencing or merging tool in
+ the universe, it would typically not be invoked by Subversion
+ if your versioned Word documents had a configured MIME type
+ that denoted that they were not human-readable (such as
+ <literal>application/msword</literal>). Fortunately, you can
+ pass the <option>- -force</option> option to <command>svn
+ diff</command> to short-circuit this MIME-related sanity check
+ and force the difference to be calculated. For more about
+ MIME type settings, see
+ <xref linkend="svn.advanced.props.special.mime-type"/></para>
-->
<para>Die Entscheidung, wann ein kontextabhängiges Zwei- oder
Dreiwege-Vergleichsprogramm als Teil einer größeren Operation
- von Subversion gestartet wird, obliegt allein Subversion und
+ von Subversion gestartet wird, wird von Subversion intern
+ getroffen und
wird unter anderem dadurch beeinflusst, ob die Dateien nach
Maßgabe der Eigenschaft <literal>svn:mime-type</literal>
menschenlesbar sind. Das bedeutet beispielsweise, selbst falls
Sie über das raffinierteste Vergleichs- oder
Zusammenführungsprogramm des Universums verfügten, welches
- Microsoft Word versteht, würde es niemals von Subversion
- aufgerufen, solange Ihre versionierten Word-Dokumente einen
+ Microsoft Word versteht, würde es normalerweise von Subversion
+ nicht aufgerufen, falls Ihre versionierten Word-Dokumente einen
MIME-Typen hätten, der sie als nicht-menschenlesbar
kennzeichnet (so wie <literal>application/msword</literal>).
- Mehr über MIME-Type-Einstellungen unter <xref
- linkend="svn.advanced.props.special.mime-type"/></para>
+ Glücklicherweise können Sie dem Befehl <command>svn
+ diff</command> die Option <option>--force</option> mitgeben,
+ um diese MIME-bezogene Plausibilitätsprüfung zum umgehen, und
+ die Unterschiedsberechnung zu erzwingen. Mehr über
+ MIME-Type-Einstellungen unter
+ <xref linkend="svn.advanced.props.special.mime-type"/></para>
</note>
<!--
Modified: branches/1.8/de/book/ch08-embedding-svn.xml
===================================================================
--- branches/1.8/de/book/ch08-embedding-svn.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ch08-embedding-svn.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -1424,8 +1424,8 @@
Subversion uses pools internally for all its memory allocation
needs (unless an external library requires a different memory
management mechanism for data passed through its
- API),<footnote><para>Neon and Berkeley DB are examples of such
- libraries.</para></footnote> and while a person coding against
+ API),<footnote><para>Berkeley DB is an example of such a
+ library.</para></footnote> and while a person coding against
the Subversion APIs is not required to do the same,
she <emphasis>is</emphasis> required to provide pools to the
API functions that need them. This means that users of the
@@ -1451,8 +1451,8 @@
Zuteilen all seines Speichers (außer wenn eine externe
Bibliothek eine unterschiedliche Speicherverwaltung für die
über ihre API ausgetauschten Daten
- voraussetzt),<footnote><para>Neon und Berkeley DB sind
- Beispiele solcher Bibliotheken.</para></footnote> und obwohl
+ voraussetzt),<footnote><para>Berkeley DB ist ein
+ Beispiel einer solchen Bibliothek.</para></footnote> und obwohl
jemand, der mit den Subversion-APIs programmiert nicht
gezwungen ist, dasselbe zu tun, <emphasis>muss</emphasis> er
Pools für die API-Funktionen zur Verfügung stellen, die sie
Modified: branches/1.8/de/book/copyright.xml
===================================================================
--- branches/1.8/de/book/copyright.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/copyright.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -2,10 +2,10 @@
<title>Copyright</title>
<!--
- <para>Copyright (c) 2002-2013 Ben Collins-Sussman, Brian
+ <para>Copyright (c) 2002-2016 Ben Collins-Sussman, Brian
W. Fitzpatrick, C. Michael Pilato.</para>
-->
- <para>Copyright (c) 2002-2013 Ben Collins-Sussman, Brian W.
+ <para>Copyright (c) 2002-2016 Ben Collins-Sussman, Brian W.
Fitzpatrick, C. Michael Pilato.</para>
Modified: branches/1.8/de/book/ref-svn.xml
===================================================================
--- branches/1.8/de/book/ref-svn.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ref-svn.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -473,9 +473,9 @@
of course, the option itself,
and <replaceable>VALUE</replaceable> the value (if any)
you wish to assign to the option. For example, to
- temporarily disable the use of the automatic property
- setting feature,
- use <option>- -config-option=config:miscellany:enable-auto-props=no</option>.
+ temporarily disable the use of the compression in the
+ HTTP protocol,
+ use <option>- -config-option=servers:global:http-compression=no</option>.
You can use this option multiple times to change
multiple option values simultaneously.</para>
-->
@@ -495,10 +495,10 @@
<replaceable>OPTION</replaceable> ist natürlich die
Option selbst, und <replaceable>VALUE</replaceable> der
Wert (sofern vorhanden), den Sie der Option zuweisen
- möchten. Wenn Sie beispielsweise vorübergehend das
- automatische Setzen von Eigenschaften verhindern
- möchten, verwenden Sie
- <option>--config-option=config:miscellany:enable-auto-props=no</option>.
+ möchten. Wenn Sie beispielsweise vorübergehend die
+ Komprimierung im HTTP-Protokoll verhindern möchten,
+ verwenden Sie
+ <option>--config-option=servers:global:http-compression=no</option>.
Sie können diese Option mehrfach verwenden, um
gleichzeitig unterschiedliche Optionswerte zu
ändern.</para>
@@ -4995,6 +4995,7 @@
Name: foo.c
Working Copy Root Path: /home/sally/projects/test
URL: http://svn.red-bean.com/repos/test/foo.c
+Relative URL: ^/foo.c
Repository Root: http://svn.red-bean.com/repos/test
Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25
Revision: 4417
@@ -5011,6 +5012,7 @@
Name: foo.c
Working Copy Root Path: /home/sally/projects/test
URL: http://svn.red-bean.com/repos/test/foo.c
+Relative URL: ^/foo.c
Basis des Projektarchivs: http://svn.red-bean.com/repos/test
UUID des Projektarchivs: 5e7d134a-54fb-0310-bd04-b611643e5c25
Revision: 4417
@@ -5037,6 +5039,7 @@
Path: vendors
Working Copy Root Path: /home/sally/projects/test
URL: http://svn.red-bean.com/repos/test/vendors
+Relative URL: ^/vendors
Repository Root: http://svn.red-bean.com/repos/test
Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25
Revision: 19
@@ -5050,6 +5053,7 @@
Pfad: vendors
Working Copy Root Path: /home/sally/projects/test
URL: http://svn.red-bean.com/repos/test/vendors
+Relative URL: ^/vendors
Basis des Projektarchivs: http://svn.red-bean.com/repos/test
UUID des Projektarchivs: 5e7d134a-54fb-0310-bd04-b611643e5c25
Revision: 19
@@ -5080,6 +5084,7 @@
Path: readme.doc
Name: readme.doc
URL: http://svn.red-bean.com/repos/test/readme.doc
+Relative URL: ^/readme.doc
Repository Root: http://svn.red-bean.com/repos/test
Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25
Revision: 1
@@ -5097,6 +5102,7 @@
Pfad: readme.doc
Name: readme.doc
URL: http://svn.red-bean.com/repos/test/readme.doc
+Relative URL: ^/readme.doc
Basis des Projektarchivs: http://svn.red-bean.com/repos/test
UUID des Projektarchivs: 5e7d134a-54fb-0310-bd04-b611643e5c25
Revision: 1
@@ -5132,6 +5138,7 @@
path="."
revision="1">
<url>http://svn.red-bean.com/repos/test</url>
+<relative-url>^/</relative-url>
<repository>
<root>http://svn.red-bean.com/repos/test</root>
<uuid>5e7d134a-54fb-0310-bd04-b611643e5c25</uuid>
@@ -6100,6 +6107,153 @@
und <option>--extensions</option>
(<option>-x</option>).</para>
+ <para>
+<!--
+ Beginning with Subversion 1.8, users can filter <command>svn log</command>
+ output using <option>- -search</option> and <option>- -search-and</option>
+ options. When using these options, a log message is shown only if a
+ revision's author, date, log message text, or list of changed paths,
+ matches a search pattern. Searching by changed patch requies
+ <option>- -verbose</option> option, otherwise <command>svn log</command>
+ does not show changed paths therefore they can't be filtered.
+-->
+ Beginnend mit Subversion 1.8, konnen Anwernder die Ausgabe von
+ <command>svn log</command> mit den Optionen
+ <option>--search</option> und <option>--search-and</option>
+ filtern. Wenn diese Optionen verwendet werden, wird eine
+ Protokollnachricht nur dann angezeigt, falls der Autor, das
+ Datum, der Protokolltext oder die Liste der geänderten Pfade
+ einer Revision zum Suchmuster passt. Das Suchen nach
+ geänderten Pfaden erfordert die Option
+ <option>--verbose</option>, da sonst <command>svn
+ log</command> die geänderten Pfade nicht anzeigt, so dass sie
+ nicht gefiltert werden können.
+ </para>
+ <para>
+<!--
+ The search pattern may include "glob syntax"
+ wildcards:
+-->
+ Die Suchmuster können Platzhalter in "Glob Syntax" enthalten:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <literal>?</literal>
+ </term>
+ <listitem>
+ <para>
+<!--
+ Matches any single character.
+-->
+ Passt auf ein einzelnes Zeichen.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <literal>*</literal>
+ </term>
+ <listitem>
+ <para>
+<!--
+ Matches a sequence of arbitrary
+ characters.
+-->
+ Passt auf eine Folge beliebiger Zeichen.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <literal>[ABC]</literal>
+ </term>
+ <listitem>
+ <para>
+<!--
+ Matches any of the characters listed inside the brackets.
+-->
+ Passt auf irgendeines der Zeichen in den eckigen Klammern.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+<!--
+ Using multiple <option>- -search</option> parameters will show log messages
+ that match the pattern specified at least in one of the options. For example:
+-->
+ Mehrere <option>--search</option>-Parameter zeigen
+ Protokollnachrichten an, die einem Muster mindestens einer
+ Option entsprechen. Zum Beispiel:
+ </para>
+ <informalexample>
+<screen>
+$ svn log --search sally --search harry https://svn.red-bean.com/repos/test
+------------------------------------------------------------------------
+r1701 | sally | 2011-10-12 22:35:30 -0600 (Wed, 12 Oct 2011) | 1 line
+
+Add a reminder.
+------------------------------------------------------------------------
+r1564 | harry | 2011-10-09 22:35:30 -0600 (Sun, 09 Oct 2011) | 1 line
+
+Merge r1560 to the 1.0.x branch.
+------------------------------------------------------------------------
+$
+ </screen>
+ </informalexample>
+ <para>
+<!--
+ Using <option>- -search</option> with <option>- -search-and</option> options will show log messages
+ that match the combined pattern from both options. For example:
+-->
+ Die gemeinsame Verwendung der Optionen
+ <option>--search</option> und <option>--search-and</option>
+ zeigen Protokollnachrichten an, die der Kombination der Muster
+ beider Optionen entsprechen. Zum Beispiel:
+ </para>
+ <informalexample>
+<screen>
+$ svn log --verbose --search sally --search-and /foo/bar https://svn.red-bean.com/repos/test
+------------------------------------------------------------------------
+r1555 | sally | 2011-07-15 22:33:14 -0600 (Fri, 15 Jul 2011) | 1 line
+Changed paths:
+M /foo/bar/src.c
+
+Typofix.
+------------------------------------------------------------------------
+r1530 | sally | 2011-07-13 07:24:11 -0600 (Wed, 13 Jul 2011) | 1 line
+Changed paths:
+M /foo/bar
+M /foo/build
+
+Fix up some svn:ignore properties.
+------------------------------------------------------------------------
+$
+</screen>
+ </informalexample>
+ <tip>
+ <para>
+<!--
+ <option>- -search</option> and <option>- -search-and</option>
+ options does not actually perform a search. They just filter
+ the <command>svn log</command> output to display only log
+ messages that match the specified pattern. Therefore, if
+ <option>- -limit</option> is used, it restricts the number
+ of log messages searched, rather than restricting the
+ output to a particular number of matching log messages.
+-->
+ Die Optionen <option>--search</option> und
+ <option>--search-and</option> bewirken nicht tatsächlich
+ eine Suche. Sie filtern nur die Ausgabe von <command>svn
+ log</command>, um nur diejenigen Protokollnachrichten
+ anzuzeigen, die zum angegebenen Muster passen. Deshalb wird
+ bei Verwendung von <option>--limit</option> die Anzahl
+ durchsuchter Protokollnachrichten beschränkt anstatt die
+ Ausgabe auf eine bestimmte Anzahl passender
+ Protokollnachrichten zu begrenzen.
+ </para>
+ </tip>
</refsect1>
</refentry>
@@ -7732,7 +7886,7 @@
<informalexample>
<screen>
- $ svn pg svn:global-ignores --verbose --show-inherited-props ^/branches/1.x <!--
+$ svn pg svn:global-ignores --verbose --show-inherited-props ^/branches/1.x <!--
Inherited properties on 'http://svn.example.com/repos/branches/1.x',
from 'http://svn.example.com/repos':
-->
@@ -8400,7 +8554,7 @@
<informalexample>
<screen>
-$ svn info | grep URL:
+$ svn info | grep ^URL:
URL: file:///var/svn/repos/trunk
$
</screen>
Modified: branches/1.8/de/book/ref-svnadmin.xml
===================================================================
--- branches/1.8/de/book/ref-svnadmin.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ref-svnadmin.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -1233,14 +1233,14 @@
<warning>
<!--
<para>As described in <xref
- linkend="svn.reposadmin.basics.backends.bdb"/>, hot-copied
+ linkend="svn.berkeleydb.limitations.architectural"/>, hot-copied
Berkeley DB repositories are <emphasis>not</emphasis>
portable across operating systems, nor will they work on
machines with a different <quote>endianness</quote> than
the machine where they were created.</para>
-->
<para>Wie in <xref
- linkend="svn.reposadmin.basics.backends.bdb"/>
+ linkend="svn.berkeleydb.limitations.architectural"/>
erläutert, sind mit <command>svnadmin hotcopy</command>
erstellte Berkeley-DB-Projektarchive
<emphasis>nicht</emphasis> über Betriebssystemgrenzen
Modified: branches/1.8/de/book/ref-svnmucc.xml
===================================================================
--- branches/1.8/de/book/ref-svnmucc.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ref-svnmucc.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -332,10 +332,10 @@
change. <replaceable>OPTION</replaceable> is, of
course, the option itself,
and <replaceable>VALUE</replaceable> the value (if
- any) you wish to assign to the option. For example,
- to temporarily disable the use of the automatic
- property setting feature,
- use <option>- -config-option=config:miscellany:enable-auto-props=no</option>.
+ any) you wish to assign to the option. For example, to
+ temporarily disable the use of the compression in the
+ HTTP protocol,
+ use <option>- -config-option=servers:global:http-compression=no</option>.
You can use this option multiple times to change
multiple option values simultaneously.</para>
-->
@@ -357,9 +357,9 @@
Option selbst und <replaceable>WERT</replaceable> der
Wert (falls vorhanden), den Sie der Option zuweisen
möchten. Um beispielsweise vorübergehend die Verwendung
- der automatischen Einstellung von Eigenschaften zu
+ der Kompression im HTTP-Protokoll zu
unterbinden, verwenden Sie
- <option>--config-option=config:miscellany:enable-auto-props=no</option>.
+ <option>--config-option=config:global:http-compression=no</option>.
Sie können diese Option mehrfach verwenden, um
gleichzeitig mehrere Optionswerte zu ändern.</para>
</listitem>
Modified: branches/1.8/de/book/ref-svnrdump.xml
===================================================================
--- branches/1.8/de/book/ref-svnrdump.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ref-svnrdump.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -77,9 +77,9 @@
of course, the option itself,
and <replaceable>VALUE</replaceable> the value (if any)
you wish to assign to the option. For example, to
- temporarily disable the use of the automatic property
- setting feature,
- use <option>- -config-option=servers:global:http-library=serf</option>.
+ temporarily disable the use of the compression in the HTTP
+ protocol,
+ use <option>- -config-option=servers:global:http-compression=no</option>.
You can use this option multiple times to change
multiple option values simultaneously.</para>
-->
@@ -95,10 +95,10 @@
natürlich die Option selbst, und
<replaceable>VALUE</replaceable> der Wert (falls
vorhanden), den Sie der Option zuweisen möchten. Um
- beispielsweise vorübergehend die Verwendung des
- automatischen Setzens von Eigenschaften zu unterbinden,
+ beispielsweise vorübergehend die Verwendung der
+ Komprimierung im HTTP-Protokoll zu unterbinden,
verwenden Sie
- <option>--config-option=servers:global:http-library=serf</option>.
+ <option>--config-option=servers:global:http-compression=no</option>.
Sie können diese Option mehrfach verwenden, um
gleichzeitig die Werte mehrerer Optionen zu
ändern.</para>
Modified: branches/1.8/de/book/ref-svnsync.xml
===================================================================
--- branches/1.8/de/book/ref-svnsync.xml 2016-02-04 14:28:06 UTC (rev 5100)
+++ branches/1.8/de/book/ref-svnsync.xml 2016-02-08 17:01:54 UTC (rev 5101)
@@ -128,9 +128,9 @@
of course, the option itself,
and <replaceable>VALUE</replaceable> the value (if any)
you wish to assign to the option. For example, to
- temporarily disable the use of the automatic property
- setting feature,
- use <option>- -config-option=servers:global:http-library=serf</option>.
+ temporarily disable the use of the compression in the
+ HTTP protocol,
+ use <option>- -config-option=servers:global:http-compression=no</option>.
You can use this option multiple times to change
multiple option values simultaneously.</para>
-->
@@ -151,10 +151,9 @@
selbstverständlich die Option selber und und
<replaceable>VALUE</replaceable> der Wert (falls
vorhanden), die Sie der Option zuweisen möchten. Um
- beispielsweise vorübergehend die Verwendung der
- automatischen Einstellung der Eigenschaften
- auszuschalten, verwenden Sie
- <option>--config-option=servers:global:http-library=serf</option>.
+ beispielsweise vorübergehend die Kompression im
+ HTTP-Protokoll auszuschalten, verwenden Sie
+ <option>--config-option=servers:global:http-compression=no</option>.
Sie können diese Option mehrfach verwenden, um
gleichzeitig mehrere Optionswerte zugleich zu
ändern.</para>
More information about the svnbook-dev
mailing list