[svnbook commit] r2784 - in trunk/src/nb: . book

sunny256 noreply at red-bean.com
Thu Apr 19 13:26:52 CDT 2007


Author: sunny256
Date: Thu Apr 19 13:26:52 2007
New Revision: 2784

Log:
Sync the Norwegian and English book up to r2594, merged r2585:2594 from 
/branches/ora-2e-reorg/. All changes from the ora-2e-reorg branch are 
now updated.

* src/nb/book/app-webdav.xml
* src/nb/book/book.xml
* src/nb/book/ch-advanced-topics.xml
* src/nb/book/ch-basic-usage.xml
* src/nb/book/ch-customizing-svn.xml
* src/nb/book/ch-developer-info.xml
* src/nb/book/ch-preface.xml
* src/nb/book/ch-reference.xml
* src/nb/book/ch-server-configuration.xml
  Merged and updated r2586, r2587, r2588, r2589, r2590, r2591, r2592, 
  r2593, r2594.

* src/nb/Makefile
  (engdir): Revert r2756; set the merge source back to trunk.

* src/nb/LAST_SYNC
  Updated by "make sync HEAD=2594".

* src/nb/TRANSLATION-STATUS
  Updated by "make status".


Modified:
   trunk/src/nb/LAST_SYNC
   trunk/src/nb/Makefile
   trunk/src/nb/TRANSLATION-STATUS
   trunk/src/nb/book/app-webdav.xml
   trunk/src/nb/book/book.xml
   trunk/src/nb/book/ch-advanced-topics.xml
   trunk/src/nb/book/ch-basic-usage.xml
   trunk/src/nb/book/ch-customizing-svn.xml
   trunk/src/nb/book/ch-developer-info.xml
   trunk/src/nb/book/ch-preface.xml
   trunk/src/nb/book/ch-reference.xml
   trunk/src/nb/book/ch-server-configuration.xml

Modified: trunk/src/nb/LAST_SYNC
==============================================================================
--- trunk/src/nb/LAST_SYNC	(original)
+++ trunk/src/nb/LAST_SYNC	Thu Apr 19 13:26:52 2007
@@ -1 +1 @@
-2585
+2594

Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile	(original)
+++ trunk/src/nb/Makefile	Thu Apr 19 13:26:52 2007
@@ -86,9 +86,7 @@
 	@if [ -d book/eng ]; then \
 		svn up -r`cat LAST_SYNC` book/eng; \
 	else \
-		: Temporary change while the ora-2e-reorg sync goes on. \
-		: svn co -r`cat LAST_SYNC` $(COLLAB)/trunk/src/en/book book/eng; \
-		svn co -r`cat LAST_SYNC` $(COLLAB)/branches/ora-2e-reorg/src/en/book at 2597 book/eng; \
+		svn co -r`cat LAST_SYNC` $(COLLAB)/trunk/src/en/book book/eng; \
 	fi
 
 sync:

Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS	(original)
+++ trunk/src/nb/TRANSLATION-STATUS	Thu Apr 19 13:26:52 2007
@@ -18,8 +18,8 @@
 * book/ch-basic-usage.xml
     Untranslated: 1.31% - 65 lines in 6 blocks
 * book/ch-advanced-topics.xml
-    Untranslated: 78.90% - 1991 lines in 5 blocks
-    Need proofreading: 21.42% - 575 lines in 2 blocks
+    Untranslated: 79.26% - 2029 lines in 5 blocks
+    Need proofreading: 21.06% - 575 lines in 2 blocks
 * book/ch-branching-and-merging.xml
     Untranslated: 5.06% - 125 lines in 1 block
     Need proofreading: 10.22% - 242 lines in 1 block
@@ -29,22 +29,22 @@
     Untranslated: 1.45% - 53 lines in 4 blocks
     Need proofreading: 83.82% - 2070 lines in 1 block
 * book/ch-customizing-svn.xml
-    Untranslated: 35.67% - 412 lines in 2 blocks
-    Need proofreading: 63.97% - 711 lines in 1 block
+    Untranslated: 35.66% - 412 lines in 2 blocks
+    Need proofreading: 63.98% - 711 lines in 1 block
 * book/ch-developer-info.xml
     Untranslated: 100.00% - 1427 lines in 1 block
 * book/ch-reference.xml
-    Untranslated: 100.00% - 6480 lines in 1 block
+    Untranslated: 100.00% - 6485 lines in 1 block
 * book/app-quickstart.xml
     Translation complete
 * book/app-svn-for-cvs-users.xml
     Translation complete
     Need proofreading: 100.00% - 592 lines in 1 block
 * book/app-webdav.xml
-    Untranslated: 100.00% - 828 lines in 1 block
+    Untranslated: 100.00% - 833 lines in 1 block
 * book/app-third-party-tools.xml
     Untranslated: 100.00% - 20 lines in 1 block
 * book/copyright.xml
     Untranslated: 100.00% - 310 lines in 1 block
 
-Summa summarum: 58.92% translated, 17.26% need proofreading
+Summa summarum: 58.87% translated, 17.19% need proofreading

Modified: trunk/src/nb/book/app-webdav.xml
==============================================================================
--- trunk/src/nb/book/app-webdav.xml	(original)
+++ trunk/src/nb/book/app-webdav.xml	Thu Apr 19 13:26:52 2007
@@ -415,7 +415,7 @@
       repository via autoversioning.  The module looks at the file's
       named extension and possibly the contents as well; if the file
       matches some common patterns, then the the
-      file's <literal>svn;mime-type</literal> property will be set
+      file's <literal>svn:mime-type</literal> property will be set
       automatically.</para>
 
   </sect1>
@@ -598,7 +598,7 @@
           in Java.  It's under a free Apache-like license and is
           available at <ulink url="http://www.ics.uci.edu/~webdav/"/>.
           DAV Explorer does everything cadaver does, but has the
-          advantages of being portable and being more user-friendly GUI
+          advantages of being portable and being a more user-friendly GUI
           application.  It's also one of the first clients to support
           the new WebDAV Access Control Protocol (RFC 3744).</para>
   
@@ -697,7 +697,7 @@
           algorithm seems to work consistently on every system.  The
           general consensus of the WebDAV community is that you should
           avoid the new Web Folders implementation and use the old one
-          instead, and that if you need real a real filesystem-level
+          instead, and that if you need a real filesystem-level
           client for Windows XP, then use a third-party program like
           WebDrive or NetDrive.</para>
 
@@ -717,7 +717,7 @@
   
         <para>Nautilus is the official file manager/browser for the
           GNOME desktop (<ulink url="http://www.gnome.org"/>), and
-          Konqueror is the manager/browser for KDE desktop (<ulink
+          Konqueror is the manager/browser for the KDE desktop (<ulink
           url="http://www.kde.org"/>).  Both of these applications have
           an explorer-level WebDAV client built-in, and operate just
           fine against an autoversioning repository.</para>
@@ -759,7 +759,7 @@
         <title>WebDrive, NetDrive</title> 
   
         <para>Both WebDrive and NetDrive are excellent commercial
-          products which allows a WebDAV share to be attached as drive
+          products which allow a WebDAV share to be attached as drive
           letters in Windows.  We've had nothing but success with
           these products.  At the time of writing, WebDrive can be
           purchased from South River Technologies (<ulink
@@ -780,14 +780,19 @@
           filesystem-level WebDAV client.  From the Finder, select the
           <guimenuitem>Connect to Server</guimenuitem> item from the
           <guimenu>Go menu</guimenu>.  Enter a WebDAV URL, and it
-          appears as a disk on the desktop, just like any other mounted
-          volume.<footnote><para>From the Darwin terminal, one can also
-          run <literal>mount -t webdav URL
-          /mountpoint</literal></para></footnote>.</para>
+          appears as a disk on the desktop, just like any other
+          mounted volume.  You can also mount a WebDAV share from the
+          Darwin terminal by using the <literal>webdav</literal>
+          filesystem type with the <command>mount</command> command:</para>
+
+        <screen>
+$ mount -t webdav http://svn.example.com/repos/project /some/mountpoint
+$
+</screen>
   
         <para>Note that if your mod_dav_svn is older than version 1.2,
           OS X will refuse to mount the share as read-write; it will
-          appear as read-only.  This is because the OS X insists on
+          appear as read-only.  This is because OS X insists on
           locking support for read-write shares, and the ability to lock
           files first appeared in Subversion 1.2.</para>
   

Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml	(original)
+++ trunk/src/nb/book/book.xml	Thu Apr 19 13:26:52 2007
@@ -50,7 +50,7 @@
 
   <bookinfo>
 
-    <subtitle>For Subversion 1.3</subtitle>
+    <subtitle>For Subversion 1.4</subtitle>
 
     <!-- Using revnumber would be more appropriate, but our stylesheets -->
     <!-- don't seem to render it. -->
@@ -110,6 +110,7 @@
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
+      <year>2007</year>
       <holder>Ben Collins-Sussman</holder>
       <holder>Brian W. Fitzpatrick</holder>
       <holder>C. Michael Pilato</holder>

Modified: trunk/src/nb/book/ch-advanced-topics.xml
==============================================================================
--- trunk/src/nb/book/ch-advanced-topics.xml	(original)
+++ trunk/src/nb/book/ch-advanced-topics.xml	Thu Apr 19 13:26:52 2007
@@ -228,10 +228,13 @@
 
       </itemizedlist>
 
-      <para>Not that even when you don't explicitly supply a
-        peg-revision, it's still present.  For your convenience, it
-        defaults to <literal>BASE</literal> for working copy items,
-        and to <literal>HEAD</literal> for repository URLs.</para>
+      <para>Note that even when you don't explicitly supply a peg
+        revision or operative revision, they are still present.  For
+        your convenience, the default peg revision is
+        <literal>BASE</literal> for working copy items and
+        <literal>HEAD</literal> for repository URLs.  And when no
+        operative revision is provided, it defaults to being the same
+        revision as the peg revision.</para>
         
     </sidebar>
 
@@ -281,6 +284,23 @@
       working copy paths, and of <literal>HEAD</literal> when applied
       to URLs.</para>
 
+    <para>The perceptive reader is probably wondering at this point if
+      the peg revision syntax causes problems for working copy paths
+      or URLs that actually have ampersand characters in them.  After
+      all, how does <command>svn</command> know whether
+      <literal>news at 11</literal> is the name of a directory in my
+      tree, or just a syntax for <quote>revision 11 of
+      <filename>news</filename></quote>?  Thankfully, while
+      <command>svn</command> will always assume the latter, there is a
+      trivial workaround.  You need only append an ampersand to the
+      end of the path, such as <literal>news at 11@</literal>.
+      <command>svn</command> only cares about the last ampersand in
+      the argument, and it is not considered illegal to omit a literal
+      peg revision specifier after that ampersand.  This workaround
+      even applies to paths that end in an ampersand—you would
+      use <literal>filename@@</literal> to talk about a file named
+      <filename>filename@</filename>.</para>
+
     <para>Let's ask the other question, then—in revision 1, what
       were the contents of whatever file occupied the address
       <filename>concepts/IDEA</filename> at the time?  We'll use an
@@ -295,15 +315,21 @@
 mechanisms.
 </screen>
 
-    <para>This appears to be the right output.  The text even mentions
-      frabbing naggily worts, so this is almost certainly the file
-      which describes the software now called Frabnaggilywort.  In
-      fact, we can verify this using the combination of an explicit
-      peg revision and explicit operative revision.  We know that in
-      <literal>HEAD</literal>, the Frabnaggilywort project is located
-      in the <filename>frabnaggilywort</filename> directory.  So we
-      specify that we want to see how the line of history identified
-      in <literal>HEAD</literal> as the path
+    <para>Notice that we didn't provide an operative revision this
+      time.  That's because when no operative revision is specified,
+      Subversion assumes a default operative revision that's the same
+      as the peg revision.</para>
+
+    <para>As you can see, the output from our operation appears to be
+      correct.  The text even mentions frabbing naggily worts, so this
+      is almost certainly the file which describes the software now
+      called Frabnaggilywort.  In fact, we can verify this using the
+      combination of an explicit peg revision and explicit operative
+      revision.  We know that in <literal>HEAD</literal>, the
+      Frabnaggilywort project is located in the
+      <filename>frabnaggilywort</filename> directory.  So we specify
+      that we want to see how the line of history identified in
+      <literal>HEAD</literal> as the path
       <filename>frabnaggilywort/IDEA</filename> looked in revision
       1.</para>
 
@@ -1866,6 +1892,18 @@
       result of a conversion of some source DocBook XML files to a
       more legible output format.</para>
 
+    <warning>
+      <para>Subversion's support for ignorable file patterns extends
+        only to the one-time process of adding unversioned
+        files and directories to version control.  Once an object is
+        under Subversion's watchkeep, the ignore pattern mechanisms no
+        longer apply to it.  In other words, don't expect Subversion
+        to avoid committing changes you've made to a versioned file
+        simply because that file's name matches an ignore
+        pattern—Subversion <emphasis>always</emphasis> notices
+        all of its versioned resources.</para>
+    </warning>
+
     <sidebar>
       <title>Ignore Patterns for CVS Users</title>
     

Modified: trunk/src/nb/book/ch-basic-usage.xml
==============================================================================
--- trunk/src/nb/book/ch-basic-usage.xml	(original)
+++ trunk/src/nb/book/ch-basic-usage.xml	Thu Apr 19 13:26:52 2007
@@ -695,7 +695,7 @@
         locale settings are compatible with UTF-8, and you don't use
         control characters in path names, you should have no trouble
         communicating with Subversion.  The command-line client adds
-        an extra bit of help—it will automatically escape legal
+        an extra bit of help—it will automatically escape illegal
         path characters as needed in URLs you type to create
         <quote>legally correct</quote> versions for internal
         use.</para>
@@ -706,7 +706,7 @@
         ikke bruker kontrolltegn i stinavn, skal du ikke oppleve 
         problemer når du kommuniserer med Subversion.
         Kommandolinjeklienten hjelper litt til – <!-- ¤ Krøkkete setning 
-        -->den vil automatisk beskytte lovlige tegn i stiene når det er 
+        -->den vil automatisk beskytte ulovlige tegn i stiene når det er 
         nødvendig i URL-er som du skriver for å lage 
         <quote>lovlige</quote> versjoner for intern bruk.</para>
 
@@ -2058,14 +2058,21 @@
           linkend="svn.advanced.props"/> for more information on
           properties).  If an <computeroutput>M</computeroutput>
           appears in the second column, then the properties have been
-          modified, otherwise a whitespace will be printed.</para>
+          modified.  If a <computeroutput>C</computeroutput> appears
+          in that column, then the properties for the file are in a
+          state of conflict, which must be resolved before committing
+          the changes to the repository.  Otherwise a whitespace will
+          be printed.</para>
         @ENGLISH }}} -->
         <para>Den andre kolonnen forteller statusen på egenskapene til 
           ei fil eller katalog (se <xref linkend="svn.advanced.props"/> 
           for mer informasjon om egenskaper).
           Hvis en <computeroutput>M</computeroutput> viser seg i den 
-          andre kolonnen, er egenskapene blitt modifisert, ellers vil et 
-          blankt tegn bli skrevet.</para>
+          andre kolonnen, er egenskapene blitt modifisert.
+          Hvis en <computeroutput>C</computeroutput> kommer til syne i 
+          den kolonnen, er egenskapene for fila i en konflikt som må 
+          løses før forandringene kan legges inn i depotet.
+          Ellers vil et blankt tegn bli skrevet.</para>
         
         <!-- @ENGLISH {{{
         <para>The third column will only show whitespace or an
@@ -4046,13 +4053,13 @@
         arbeidskopien til det eksterne diffprogrammet.</para>
 
       <!-- @ENGLISH {{{
-      <para>Sometimes it's easier to look at an older version of a
-        file in its entirety as opposed to just the differences
-        between it and another revision.</para>
-      @ENGLISH }}} -->
-      <para>Noen ganger er det lettere å se på en eldre versjon av en 
-        fil i sin helhet i stedet for bare forskjellene mellom den og en 
-        annen revisjon.</para>
+      <para>Secondly, it's sometimes just easier to look at an older
+        version of a file in its entirety than to look only at the
+        differences between it and another revision.</para>
+      @ENGLISH }}} -->
+      <para>For det andre er det noen ganger rett og slett lettere å se 
+        på en eldre versjon av en fil i sin helhet i stedet for bare å 
+        se på forskjellene mellom den og en annen revisjon.</para>
 
       </sect2>
 

Modified: trunk/src/nb/book/ch-customizing-svn.xml
==============================================================================
--- trunk/src/nb/book/ch-customizing-svn.xml	(original)
+++ trunk/src/nb/book/ch-customizing-svn.xml	Thu Apr 19 13:26:52 2007
@@ -160,7 +160,7 @@
         maskinkonfigurasjonsområde.</para>
 
       <!-- @ENGLISH {{{
-      <para>The configuration area currently contains three
+      <para>The per-user configuration area currently contains three
         files—two configuration files (<filename>config</filename> and
         <filename>servers</filename>), and a <filename>README.txt</filename> 
         file which describes the INI format.  At the time of their
@@ -177,9 +177,9 @@
         configuration directory with the default contents will be
         created.</para>
       @ENGLISH }}} -->
-      <para>Konfigurasjonsområdet inneholder for tiden tre filer – to 
-        konfigurasjonsfiler (<filename>config</filename> og 
-        <filename>servers</filename>) og en 
+      <para>Konfigurasjonsområdet for hver bruker inneholder for tiden 
+        tre filer – to konfigurasjonsfiler (<filename>config</filename> 
+        og <filename>servers</filename>) og en 
         <filename>README.txt</filename>-fil som beskriver INI-formatet.
         På tidspunktet de ble laget, inneholder filene standardverdier 
         for alle valgene som Subversion støtter.
@@ -1373,12 +1373,12 @@
         repository.  In order to do this, it must convert the data
         from the native locale into UTF-8.</para>
 
-      <para>For example, suppose you create a file
-        named<filename>caffè.txt</filename>, and then when committing
-        the file, you write the log message as <quote>Adesso il caffè
-        è più forte</quote>.  Both the filename and log message
-        contain non-ASCII characters, but because your locale is set
-        to <literal>it_IT</literal>, the Subversion client knows to
+      <para>For example, suppose you create a file named
+        <filename>caffè.txt</filename>, and then when committing the
+        file, you write the log message as <quote>Adesso il caffè è
+        più forte</quote>.  Both the filename and log message contain
+        non-ASCII characters, but because your locale is set to
+        <literal>it_IT</literal>, the Subversion client knows to
         interpret them as Italian.  It uses an Italian character set
         to convert the data to UTF-8 before sending them off to the
         repository.</para>

Modified: trunk/src/nb/book/ch-developer-info.xml
==============================================================================
--- trunk/src/nb/book/ch-developer-info.xml	(original)
+++ trunk/src/nb/book/ch-developer-info.xml	Thu Apr 19 13:26:52 2007
@@ -348,10 +348,10 @@
       <para>For example, here is a code segment that illustrates the
         use of both the repository and filesystem interfaces to create
         a new revision of the filesystem in which a directory is
-        added.  Note that in this example (and all others throughout
-        this book), the <function>SVN_ERR()</function> macro simply
-        checks for a non-successful error return from the function it
-        wraps, and returns that error if it exists.</para>
+        added.  Note that in this example, the
+        <function>SVN_ERR()</function> macro simply checks for a
+        non-successful error return from the function it wraps, and
+        returns that error if it exists.</para>
 
       <example id="svn.developer.layerlib.repos.ex-1">
         <title>Using the Repository Layer</title>

Modified: trunk/src/nb/book/ch-preface.xml
==============================================================================
--- trunk/src/nb/book/ch-preface.xml	(original)
+++ trunk/src/nb/book/ch-preface.xml	Thu Apr 19 13:26:52 2007
@@ -3,55 +3,83 @@
   <title>Preface</title>
   @ENGLISH }}} -->
   <title>Innledning</title>
-  
+
+  <!-- ### TODO(sussman):  I replaced our rope-quote with some cool
+  quotes that (to me) demonstrate some core truths about subversion's
+  design philosophy.  We probably don't want to keep both of them in
+  there forever... remove one at some point, after we discuss. -->
+
   <blockquote>
-    <attribution>Brian W. Fitzpatrick</attribution>
+    <attribution>Greg Hudson</attribution>
     <!-- @ENGLISH {{{
-    <para><quote>If C gives you enough rope to hang yourself, think
-      of Subversion as a sort of rope storage facility.</quote></para>
+    <para><quote>Unnecessary optimization is the root of all evil.
+   (Okay, 65% of all evil.)</quote></para>
     @ENGLISH }}} -->
-    <para><quote>Hvis C gir deg nok tau til å henge deg selv, tenk på 
-      Subversion som en slags taubeholder.</quote></para>
+    <para><quote>Unødvendig optimalisering er roten til alt ondt.
+      (Okay, 65% av alt ondt.)</quote></para>
   </blockquote>
 
+  <blockquote>
+    <attribution>Greg Hudson</attribution>
+    <!-- @ENGLISH {{{
+    <para><quote>It is important not to let the perfect become the
+    enemy of the good, even when you can agree on what perfect is.
+    Doubly so when you can't.  As unpleasant as it is to be trapped by
+    past mistakes, you can't make any progress by being afraid of your
+    own shadow during design.
+</quote></para>
+    @ENGLISH }}} -->
+    <para><quote>Det er viktig å ikke la det perfekte bli fienden til 
+      det gode, selv når du kan være enig i hva det perfekte er.
+      Dobbelt så mye når du ikke kan det.
+      Samme hvor ubehagelig det er å bli fanget av tidligere feil, kan 
+      du ikke gjøre fremskritt ved å være redd din egen skygge når du 
+      designer.</quote></para>
+  </blockquote>
+
+  <!-- ### NOTE:  I've rephrased this section to make CVS sound like
+  it "used" to be the big standard, but no more.  :-)   -->
+
   <!-- @ENGLISH {{{
-  <para>In the world of open-source software, the Concurrent
-    Versions System (CVS) has long been the tool of choice for
-    version control.  And rightly so.  CVS itself is free software,
-    and its non-restrictive <foreignphrase>modus
-    operandi</foreignphrase> and support for networked
-    operation—which allow dozens of geographically dispersed
-    programmers to share their work—fits the collaborative
-    nature of the open-source world very well.  CVS and its
-    semi-chaotic development model have become cornerstones of
-    open-source culture.
+  <para>In the world of open-source software, the Concurrent Versions
+    System (CVS) was the tool of choice for version control for many
+    years.  And rightly so.  CVS was open-source software itself, and
+    its non-restrictive <foreignphrase>modus operandi</foreignphrase>
+    and support for networked operation allowed dozens of
+    geographically dispersed programmers to share their work.  It fit
+    the collaborative nature of the open-source world very well.  CVS
+    and its semi-chaotic development model have since become
+    cornerstones of open-source culture.
   </para>
   @ENGLISH }}} -->
-  <para>I opensource-verdenen har Concurrent Versions System (CVS) lenge 
-    vært førstevalget innen versjonskontroll.
+  <para>I opensource-verdenen var Concurrent Versions System (CVS) i 
+    flere år førstevalget innen versjonskontroll.
     Og det er fortjent.
-    CVS er selv fri programvare, og dens ikke-restriktive virkemåte og 
-    støtte for nettverksbaserte operasjoner – som tillater dusinvis av 
-    programmerere spredt over et geografisk område å dele arbeidet – 
-    passer veldig bra sammen med samarbeidsånden i opensource-verdenen.
-    CVS med sin halvkaotiske utviklingsmodell har blitt hjørnesteiner i 
-    kulturen av fri programvare.</para>
+    CVS var selv fri programvare, og dens ikke-restriktive virkemåte og 
+    støtte for nettverksbaserte operasjoner tillot dusinvis av 
+    programmerere spredt over et geografisk område å dele på arbeidet.
+    Den passet veldig bra sammen med samarbeidsånden i 
+    opensource-verdenen.
+    CVS med sin halvkaotiske utviklingsmodell har siden blitt 
+    hjørnesteiner i kulturen omkring fri programvare.</para>
 
   <!-- @ENGLISH {{{
-  <para>But like many tools, CVS is starting to show its age.
-    Subversion is a relatively new version control system designed
-    to be the successor to CVS.  The designers set out to win the
-    hearts of CVS users in two ways: by creating an open-source
-    system with a design (and <quote>look and feel</quote>) similar
-    to CVS, and by attempting to fix most of CVS's noticeable flaws.
-    While the result isn't necessarily the next great evolution in
-    version control design, Subversion <emphasis>is</emphasis> very
-    powerful, very usable, and very flexible.
+  <para>But like many tools, CVS began to show its age, and Subversion
+    entered the picture.  Subversion was originally designed as a
+    successor to CVS.  The designers set out to win the hearts of CVS
+    users in two ways: by creating an open-source system with a design
+    (and <quote>look and feel</quote>) similar to CVS, and by
+    attempting to fix most of CVS's noticeable flaws.  While the
+    result isn't necessarily the next great evolution in version
+    control design, Subversion <emphasis>is</emphasis> very powerful,
+    very usable, and very flexible.  And for the most part, almost all
+    newly-started open-source projects now choose Subversion instead
+    of CVS.
   </para>
   @ENGLISH }}} -->
-  <para>Men som mange verktøy, begynner CVS å vise aldringstegn.
-    Subversion er et relativt nytt versjonskontrollsystem konstruert for 
-    å bli etterfølgeren til CVS.
+  <para>Men som mange verktøy, begynte CVS å vise aldringstegn, og 
+    Subversion inntok scenen.
+    Subversion var originalt konstruert som en etterfølger til CVS.
     Designerne gikk inn for å vinne hjertene til CVS-brukerne på to 
     måter:
     Ved å lage et opensource-system med en design (og <!-- ¤ 
@@ -59,19 +87,21 @@
     prøve å fikse mesteparten av de åpenbare feilene i CVS.
     Selv om resultatet nødvendigvis ikke er det neste store steget innen 
     versjonskontrolldesign, <emphasis>er</emphasis> Subversion meget 
-    kraftig, brukbart og veldig fleksibelt.</para>
+    kraftig, brukbart og veldig fleksibelt.
+    Og i de fleste tilfeller velger nå nesten alle nye 
+    opensource-prosjekter Subversion istedenfor CVS.</para>
 
   <!-- @ENGLISH {{{
-  <para>This book is written to document the 1.3 series of the
-    Subversion version control system.  We have made every attempt to be
-    thorough in our coverage.  However, Subversion has a thriving
-    and energetic development community, so there are already a
-    number of features and improvements planned for future versions
-    of Subversion that may change some of the commands and specific
-    notes in this book.
+  <para>This book is written to document the 1.4 series of the
+    Subversion version control system.  We have made every attempt to
+    be thorough in our coverage.  However, Subversion has a thriving
+    and energetic development community, so there are already a number
+    of features and improvements planned for future versions of
+    Subversion that may change some of the commands and specific notes
+    in this book.
   </para>
   @ENGLISH }}} -->
-  <para>Denne boka er skrevet for å dokumentere 1.3-serien av 
+  <para>Denne boka er skrevet for å dokumentere 1.4-serien av 
     versjonskontrollsystemet Subversion.
     Vi har gjort hva vi kan for å være grundig i dekningen av systemet.
     Subversion har imidlertid et livlig og energisk utviklermiljø, så 
@@ -118,9 +148,7 @@
       (<literal>\</literal>) instead of forward slashes
       (<literal>/</literal>) for path separators, the input to and
       output from this tool when run on Windows are identical to its
-      Unix counterpart.  However, Windows users may find more success
-      by running the examples inside the Cygwin Unix emulation
-      environment.</para>
+      Unix counterpart.</para>
     @ENGLISH }}} -->
     <para>Når det er sagt, kjører <command>svn</command>-programmet også 
       på andre plattformer enn Unix, for eksempel Microsoft Windows.
@@ -128,9 +156,7 @@
       (<literal>\</literal>) istedenfor vanlige skråstreker 
       (<literal>/</literal>) som stiseparatorer, er inndataene og 
       utdataene til og fra dette verktøyet når det kjøres under Windows 
-      identisk med den tilsvarende versjonen på Unix.
-      Windowsbrukere kan imidlertid få større suksess ved å kjøre 
-      eksemplene i Unix-emuleringsmiljøet Cygwin.</para>
+      identisk med den tilsvarende versjonen på Unix.</para>
 
     <!-- @ENGLISH {{{
     <para>Most readers are probably programmers or system
@@ -154,18 +180,19 @@
     <!-- @ENGLISH {{{
     <para>While this book is written with the assumption that the
       reader has never used version control, we've also tried to make
-      it easy for users of CVS to make a painless leap into
-      Subversion.  Special sidebars may discuss CVS from time to time,
-      and a special appendix summarizes most of the differences
-      between CVS and Subversion.</para>
+      it easy for users of CVS (and other systems) to make a painless
+      leap into Subversion.  Special sidebars may mention other
+      version control systems from time to time, and a special
+      appendix summarizes many of the differences between CVS and
+      Subversion.</para>
     @ENGLISH }}} -->
     <para>Selv om denne boka er skrevet med antakelsen om at brukeren 
       aldri har brukt versjonskontroll tidligere, har vi også forsøkt å 
-      gjøre det lett for CVS-brukere å foreta en smertefri overgang til 
-      Subversion.
-      Spesielle sidenotater kan diskutere CVS nå og da, og et spesielt 
-      tillegg summerer opp mesteparten av forskjellene mellom CVS og 
-      Subversion.</para>
+      gjøre det lett for brukere av CVS (og andre systemer) å foreta en 
+      smertefri overgang til Subversion.
+      Spesielle sidenotater kan nevne andre versjonskontrollsystemer nå 
+      og da, og et spesielt tillegg summerer opp mesteparten av 
+      forskjellene mellom CVS og Subversion.</para>
 
     <!-- @ENGLISH {{{
     <para>Note also that the source code examples used throughout the
@@ -217,25 +244,26 @@
         <term>Erfarne systemadministratorer</term>
         <listitem>
           <!-- @ENGLISH {{{
-          <para>The assumption here is that you've probably used CVS
-            before, and are dying to get a Subversion server up and
-            running ASAP.  <xref linkend="svn.reposadmin"/> and <xref
-              linkend="svn.serverconfig"/> will show you how to create
-            your first repository and make it available over the
-            network.  After that's done, <xref linkend="svn.tour"/> and
+          <para>The assumption here is that you've probably used
+            version control before before, and are dying to get a
+            Subversion server up and running ASAP.
+            <xref linkend="svn.reposadmin"/> and
+            <xref linkend="svn.serverconfig"/> will show you how to
+            create your first repository and make it available over
+            the network.  After that's done,
+            <xref linkend="svn.tour"/> and
             <xref linkend="svn.forcvs"/> are the fastest routes to
-            learning the Subversion client while drawing on your CVS
-            experience.</para>
+            learning the Subversion client.</para>
           @ENGLISH }}} -->
           <para>Antakelsen her er at du sannsynligvis har brukt CVS før, 
             og klør i fingrene etter å få en Subversion&server; opp og 
             gå så fort som mulig.
             <xref linkend="svn.reposadmin"/> og <xref 
-            linkend="svn.tour"/> vil vise deg hvordan du lager ditt 
-            første depot og gjør det tilgjengelig over nettverket.
-            Etter at det er gjort, er kapittel 3 og tillegg A den 
-            raskeste veien for å bli kjent med Subversionklienten mens 
-            du drar nytte av erfaringen du har fra CVS.</para>
+            linkend="svn.serverconfig"/> vil vise deg hvordan du lager 
+            ditt første depot og gjør det tilgjengelig over nettverket.
+            Etter at det er gjort, er <xref linkend="svn.tour"/> og 
+            <xref linkend="svn.forcvs"/> den raskeste veien for å bli 
+            kjent med Subversionklienten.</para>
         </listitem>
       </varlistentry>
 
@@ -248,19 +276,18 @@
           <!-- @ENGLISH {{{
           <para>Your administrator has probably set up Subversion
             already, and you need to learn how to use the client.  If
-            you've never used a version control system (like CVS),
-            then <xref linkend="svn.basic"/> and <xref
-              linkend="svn.tour"/> are a vital introduction.  If you're
-            already an old hand at CVS, chapter 3 and appendix A are
-            the best place to start.</para>
+            you've never used a version control system, then
+            <xref linkend="svn.basic"/> is a vital introduction to the
+            ideas behind version control.  <xref linkend="svn.tour"/>
+            is a guided tour of the Subversion client.</para>
           @ENGLISH }}} -->
           <para>Administratoren din har muligens satt opp Subversion 
             allerede, og du trenger å lære hvordan klienten skal brukes.
-            Hvis du aldri har brukt et versjonskontrollsystem før (som 
-            CVS), er <xref linkend="svn.basic"/> og <xref 
-            linkend="svn.tour"/> en vital introduksjon.
-            Hvis du allerede er en gammel rev innen CVS, er kapittel 3 
-            og tillegg A de beste plassene å starte.</para>
+            Hvis du aldri har brukt et versjonskontrollsystem før, er 
+            <xref linkend="svn.basic"/> en vital introduksjon til idéene 
+            bak versjonskontroll.
+            <xref linkend="svn.tour"/> er en gjennomgang av 
+            Subversionklienten.</para>
         </listitem>
       </varlistentry>
 
@@ -278,7 +305,7 @@
               linkend="svn.branchmerge"/>), how to use Subversion's
             property support, how to configure runtime options (<xref
               linkend="svn.advanced"/>), and other things.  These two
-            chapters aren't vital at first, but be sure to read them
+            chapters aren't critical at first, but be sure to read them
             once you're comfortable with the basics.</para>
           @ENGLISH }}} -->
           <para>Enten du er en bruker eller administrator, vil 
@@ -454,16 +481,14 @@
       <variablelist>
         
         <varlistentry>
-          <term><xref linkend="svn.intro"/></term>
+          <term><xref linkend="svn.preface"/></term>
           <listitem>
             <!-- @ENGLISH {{{
             <para>Covers the history of Subversion as well as its
-              features, architecture, components, and install
-              methods.  Also includes a quick-start guide.</para>
+              features, architecture, and components.</para>
             @ENGLISH }}} -->
             <para>Dekker historien til Subversion så vel som funksjoner, 
-              arkitektur, komponenter og installasjonsmetoder.
-              Inkluderer også en guide for å komme fort i gang.</para>
+              arkitektur og komponenter.</para>
           </listitem>
         </varlistentry>
 
@@ -549,7 +574,7 @@
             <para>Explains how to configure your Subversion server and
               the three ways to access your repository:
               <literal>HTTP</literal>, the <literal>svn</literal>
-              protocol, and local access.  It also covers the details
+              protocol, and local disk access.  It also covers the details
               of authentication, authorization and anonymous
               access.</para>
             @ENGLISH }}} -->
@@ -557,7 +582,7 @@
               Subversion&the_server; din og de tre måtene å få tilgang 
               til depotet ditt:
               <literal>HTTP</literal>, 
-              <literal>svn</literal>-protokollen og lokal tilgang.
+              <literal>svn</literal>-protokollen og lokal disktilgang.
               Det dekker også detaljer omkring autentisering, 
               tilgangskontroll og anonym tilgang.</para>
           </listitem>
@@ -615,6 +640,21 @@
         </varlistentry>
 
         <varlistentry>
+          <term><xref linkend="svn.intro"/></term>
+          <listitem>
+            <!-- @ENGLISH {{{
+            <para>For the impatient, a whirlwind explanation of how to
+              install Subversion and start using it immediately.  You
+              have been warned.</para>
+            @ENGLISH }}} -->
+            <para>En forklaring i full fart for den utålmodige om 
+              hvordan Subversion installeres og hvordan den kan brukes 
+              med en gang.
+              Du er herved advart.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term><xref linkend="svn.forcvs"/></term>
           <listitem>
             <!-- @ENGLISH {{{
@@ -710,14 +750,17 @@
 
       <listitem>
         <!-- @ENGLISH {{{
-        <para>You can distribute and make changes to this book however
-          you wish—it's under a free license.  Of course,
-          rather than distribute your own private version of this
-          book, we'd much rather you send feedback and patches to the
-          Subversion developer community.</para>
+        <para>You can make changes to this book and redistribute it
+          however you wish—it's under a free license.  Your only
+          obligation is to maintain proper attribution to the original
+          authors.  Of course, rather than distribute your own private
+          version of this book, we'd much rather you send feedback and
+          patches to the Subversion developer community.</para>
         @ENGLISH }}} -->
-        <para>Du kan distribuere og gjøre forandringer til denne boka så 
-          mye du ønsker – den er under en fri lisens.
+        <para>Du kan gjøre forandringer i denne boka og redistribuere 
+          den så mye du ønsker – den er under en fri lisens.
+          Det eneste som kreves er at de originale forfatterne blir 
+          kreditert.
           Selvfølgelig, istedenfor at du distribuerer din egen private 
           versjon av boka, vil vi heller at du sender respons og patcher 
           til utviklermiljøet for Subversion.</para>
@@ -788,49 +831,52 @@
     <para>Finally, we thank the countless people who contributed to
       this book with informal reviews, suggestions, and fixes: While
       this is undoubtedly not a complete list, this book would be
-      incomplete and incorrect without the help of: Jani Averbach,
-      Ryan Barrett, Francois Beausoleil, Jennifer Bevan, Matt Blais,
-      Zack Brown, Martin Buchholz, Brane Cibej, John R. Daily, Peter
-      Davis, Olivier Davy, Robert P. J. Day, Mo DeJong, Brian Denny,
-      Joe Drew, Nick Duffek, Ben Elliston, Justin Erenkrantz, Shlomi
-      Fish, Julian Foad, Chris Foote, Martin Furter, Dave Gilbert,
-      Eric Gillespie, Matthew Gregan, Art Haas, Greg Hudson, Alexis
-      Huxley, Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark
-      Benedetto King, Andreas J. Koenig, Nuutti Kotivuori, Matt Kraai,
-      Scott Lamb, Vincent Lefevre, Morten Ludvigsen, Paul Lussier,
-      Bruce A. Mah, Philip Martin, Feliciano Matias, Patrick Mayweg,
-      Gareth McCaughan, Jon Middleton, Tim Moloney, Mats Nilsson, Joe
-      Orton, Amy Lyn Pilato, Kevin Pilch-Bisson, Dmitriy Popkov,
-      Michael Price, Mark Proctor, Steffen Prohaska, Daniel Rall,
-      Tobias Ringstrom, Garrett Rooney, Joel Rosdahl, Christian Sauer,
-      Larry Shatzer, Russell Steicke, Sander Striker, Erik Sjoelund,
-      Johan Sundstroem, John Szakmeister, Mason Thomas, Eric
-      Wadsworth, Colin Watson, Alex Waugh, Chad Whitacre, Josef Wolf,
-      Blair Zajac, and the entire Subversion community.</para>
+      incomplete and incorrect without the help of: David Anderson,
+      Jani Averbach, Ryan Barrett, Francois Beausoleil, Jennifer
+      Bevan, Matt Blais, Zack Brown, Martin Buchholz, Brane Cibej,
+      John R. Daily, Peter Davis, Olivier Davy, Robert P. J. Day, Mo
+      DeJong, Brian Denny, Joe Drew, Nick Duffek, Ben Elliston, Justin
+      Erenkrantz, Shlomi Fish, Julian Foad, Chris Foote, Martin
+      Furter, Dave Gilbert, Eric Gillespie, David Glasser, Matthew
+      Gregan, Art Haas, Eric Hanchrow, Greg Hudson, Alexis Huxley,
+      Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark Benedetto
+      King, Andreas J. Koenig, Nuutti Kotivuori, Matt Kraai, Scott
+      Lamb, Vincent Lefevre, Morten Ludvigsen, Paul Lussier, Bruce
+      A. Mah, Philip Martin, Feliciano Matias, Patrick Mayweg, Gareth
+      McCaughan, Jon Middleton, Tim Moloney, Christopher Ness, Mats
+      Nilsson, Joe Orton, Amy Lyn Pilato, Kevin Pilch-Bisson, Dmitriy
+      Popkov, Michael Price, Mark Proctor, Steffen Prohaska, Daniel
+      Rall, Jack Repenning, Tobias Ringstrom, Garrett Rooney, Joel
+      Rosdahl, Christian Sauer, Larry Shatzer, Russell Steicke, Sander
+      Striker, Erik Sjoelund, Johan Sundstroem, John Szakmeister,
+      Mason Thomas, Eric Wadsworth, Colin Watson, Alex Waugh, Chad
+      Whitacre, Josef Wolf, Blair Zajac, and the entire Subversion
+      community.</para>
     @ENGLISH }}} -->
     <para>Til slutt vil vi takke alle de utallige folkene som har 
       bidratt til denne boka med informative anmeldelser, forslag og 
       korreksjoner:
       Selv om dette uten tvil ikke er en komplett liste, ville denne 
       boka være ukomplett og ukorrekt uten hjelp fra:
-      Jani Averbach, Ryan Barrett, François Beausoleil, Jennifer Bevan, 
-      Matt Blais, Zack Brown, Martin Buchholz, Brane Čibej, John R. 
-      Daily, Peter Davis, Olivier Davy, Robert P. J. Day, Mo DeJong, 
-      Brian Denny, Joe Drew, Nick Duffek, Ben Elliston, Justin 
-      Erenkrantz, Shlomi Fish, Julian Foad, Chris Foote, Martin Furter, 
-      Dave Gilbert, Eric Gillespie, Matthew Gregan, Art Haas, Greg 
-      Hudson, Alexis Huxley, Jens B. Jorgensen, Tez Kamihira, David 
-      Kimdon, Mark Benedetto King, Andreas J. König, Nuutti Kotivuori, 
-      Matt Kraai, Scott Lamb, Vincent Lefevre, Morten Ludvigsen, Paul 
-      Lussier, Bruce A. Mah, Philip Martin, Féliciano Matias, Patrick 
-      Mayweg, Gareth McCaughan, Jon Middleton, Tim Moloney, Mats 
-      Nilsson, Joe Orton, Amy Lyn Pilato, Kevin Pilch-Bisson, Dmitriy 
-      Popkov, Michael Price, Mark Proctor, Steffen Prohaska, Daniel 
-      Rall, Tobias Ringström, Garrett Rooney, Joel Rosdahl, Christian 
-      Sauer, Larry Shatzer, Russell Steicke, Sander Striker, Erik 
-      Sjölund, Johan Sundström, John Szakmeister, Mason Thomas, Eric 
-      Wadsworth, Colin Watson, Alex Waugh, Chad Whitacre, Josef Wolf, 
-      Blair Zajac, og hele Subversion-fellesskapet.</para>
+      David Anderson, Jani Averbach, Ryan Barrett, François Beausoleil, 
+      Jennifer Bevan, Matt Blais, Zack Brown, Martin Buchholz, Brane 
+      Čibej, John R. Daily, Peter Davis, Olivier Davy, Robert P. J. Day, 
+      Mo DeJong, Brian Denny, Joe Drew, Nick Duffek, Ben Elliston, 
+      Justin Erenkrantz, Shlomi Fish, Julian Foad, Chris Foote, Martin 
+      Furter, Dave Gilbert, Eric Gillespie, David Glasser, Matthew 
+      Gregan, Art Haas, Eric Hanchrow, Greg Hudson, Alexis Huxley, Jens 
+      B. Jorgensen, Tez Kamihira, David Kimdon, Mark Benedetto King, 
+      Andreas J. König, Nuutti Kotivuori, Matt Kraai, Scott Lamb, 
+      Vincent Lefevre, Morten Ludvigsen, Paul Lussier, Bruce A. Mah, 
+      Philip Martin, Féliciano Matias, Patrick Mayweg, Gareth McCaughan, 
+      Jon Middleton, Tim Moloney, Christopher Ness, Mats Nilsson, Joe 
+      Orton, Amy Lyn Pilato, Kevin Pilch-Bisson, Dmitriy Popkov, Michael 
+      Price, Mark Proctor, Steffen Prohaska, Daniel Rall, Jack 
+      Repenning, Tobias Ringström, Garrett Rooney, Joel Rosdahl, 
+      Christian Sauer, Larry Shatzer, Russell Steicke, Sander Striker, 
+      Erik Sjölund, Johan Sundström, John Szakmeister, Mason Thomas, 
+      Eric Wadsworth, Colin Watson, Alex Waugh, Chad Whitacre, Josef 
+      Wolf, Blair Zajac, og hele Subversion-fellesskapet.</para>
 
     <!-- =============================================================== -->
     <sect2 id="svn.preface.acks.sussman">
@@ -847,10 +893,10 @@
           I don’t know where she gets all that patience!
           She’s my perfect counterbalance.</emphasis></para>
 
-        <para><emphasis>Thanks to my extended family for their sincere 
-          encouragement, despite having no actual interest in the 
-          subject.
-          (You know, the ones who say, <quote>Ooh, you’re writing a 
+        <para><emphasis>Thanks to my extended family and friends for 
+          their sincere encouragement, despite having no actual interest 
+          in the subject.
+          (You know, the ones who say, <quote>Ooh, you wrote a 
           book?</quote>, and then when you tell them it’s a computer 
           book, sort of glaze over.)</emphasis></para>
 
@@ -858,6 +904,12 @@
           rich, rich man.
           Don’t look at me that way—you know who you 
           are.</emphasis></para>
+
+        <para><emphasis>Thanks to my parents for the perfect low-level 
+          formatting, and being unbelievable role models.
+          Thanks to my son for the opportunity to pass that 
+          on.</emphasis></para>
+
       </blockquote>
 
       <!-- @ENGLISH {{{
@@ -873,19 +925,20 @@
         med eposten</quote>.
         Jeg vet ikke hvor hun får all tålmodigheten fra!
         Hun er min perfekte motvekt.</para>
-      
+
       <!-- @ENGLISH {{{
-      <para>Thanks to my extended family for their sincere
+      <para>Thanks to my extended family and friends for their sincere
         encouragement, despite having no actual interest in the
-        subject.  (You know, the ones who say, <quote>Ooh, you're
-        writing a book?</quote>, and then when you tell them it's a
-        computer book, sort of glaze over.)</para>
-      @ENGLISH }}} -->
-      <para>Takk til min storfamilie for deres oppriktige oppmuntring, 
-        til tross for at de ikke har noen egentlig interesse for emnet.
-        (Du vet, de som sier <quote>Åååja, du skriver ei bok?</quote>, 
-        og når du forteller at det er ei bok om datamaskiner, forsvinner 
-        stjerneglansen i øynene deres.)</para>
+        subject.  (You know, the ones who say, <quote>Ooh, you wrote a
+        book?</quote>, and then when you tell them it's a computer
+        book, sort of glaze over.)</para>
+      @ENGLISH }}} -->
+      <para>Takk til min storfamilie og mine venner for deres oppriktige 
+        oppmuntring, til tross for at de ikke har noen egentlig 
+        interesse for emnet.
+        (Du vet, de som sier <quote>Åååja, du har skrevet ei 
+        bok?</quote>, og når du forteller at det er ei bok om 
+        datamaskiner, forsvinner stjerneglansen i øynene deres.)</para>
 
       <!-- @ENGLISH {{{
       <para>Thanks to all my close friends, who make me a rich, rich man.
@@ -895,6 +948,15 @@
         mann.
         Ikke se på meg på den måten – dere vet hvem dere er.</para>
 
+      <!-- @ENGLISH {{{
+      <para>Thanks to my parents for the perfect low-level formatting,
+        and being unbelievable role models.  Thanks to my son for the
+        opportunity to pass that on.</para>
+      @ENGLISH }}} -->
+      <para>Takk til foreldrene mine for den perfekte 
+        grunnformateringen, og for at de er noen utrolige rollemodeller.
+        Takk til sønnen min for muligheten til å føre det videre.</para>
+
     </sect2>
 
     <!-- =============================================================== -->
@@ -931,6 +993,8 @@
           I couldn’t agree more.</emphasis></para>
       </blockquote>
 
+      <!-- ### TODO(fitz):  update this? -->
+
       <!-- @ENGLISH {{{
       <para>Huge thanks to my wife Marie for being incredibly
         understanding, supportive, and most of all, patient.  Thank
@@ -1011,6 +1075,8 @@
           creative excellence—thank you.</emphasis></para>
       </blockquote>
 
+      <!-- ### TODO(cmpilato):  update this? -->
+
       <!-- @ENGLISH {{{
       <para>Special thanks to my wife, Amy, for her love and patient
         support, for putting up with late nights, and for even
@@ -1325,7 +1391,7 @@
         And if you're not familiar with version control at all, your
         eyes may glaze over unless you first read <xref
         linkend="svn.basic"/>, in which we provide a gentle introduction
-        to version control in general.</para>
+        to version control.</para>
       @ENGLISH }}} -->
       <para>Når vi diskuterer funksjonalitetene som Subversion bringer til 
         <!-- ¤ -->versjonskontrollbordet, hjelper det ofte å snakke om dem 
@@ -1336,7 +1402,7 @@
         Og hvis du ikke er kjent med versjonskontroll i det hele tatt, kan 
         nok blikket sløves såfremt du ikke har lest <xref
         linkend="svn.basic"/>, hvor vi foretar en forsiktig introduksjon 
-        til versjonskontroll generelt.</para>
+        til versjonskontroll.</para>
   
       <!-- @ENGLISH {{{
       <para>Subversion provides:</para>
@@ -1562,12 +1628,12 @@
       <title>Subversions arkitektur</title>
   
       <!-- @ENGLISH {{{
-      <para><xref linkend="svn.intro.architecture.dia-1"/> illustrates what one might
-        call a <quote>mile-high</quote> view of Subversion's
+      <para><xref linkend="svn.intro.architecture.dia-1"/> illustrates
+        a <quote>mile-high</quote> view of Subversion's
         design.</para>
       @ENGLISH }}} -->
-      <para><xref linkend="svn.intro.architecture.dia-1"/> illustrerer hva 
-        man kan kalle en <quote>milehøy</quote> oversikt over Subversions 
+      <para><xref linkend="svn.intro.architecture.dia-1"/> illustrerer 
+        en <quote>milehøy</quote> oversikt over Subversions 
         design.</para>
       
       <figure id="svn.intro.architecture.dia-1">
@@ -1653,9 +1719,10 @@
           <term>svnlook</term>
           <listitem>
             <!-- @ENGLISH {{{
-            <para>A tool for inspecting a Subversion repository.</para>
+            <para>A tool for directly inspecting a Subversion repository.</para>
             @ENGLISH }}} -->
-            <para>Et verktøy for å inspisere et Subversiondepot.</para>
+            <para>Et verktøy for å inspisere et Subversiondepot 
+              direkte.</para>
           </listitem>
         </varlistentry>
   
@@ -1711,6 +1778,19 @@
               over et nettverk.</para>
           </listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term>svnsync</term>
+          <listitem>
+            <!-- @ENGLISH {{{
+            <para>A program for incrementally mirroring one
+            repository to another over a network.</para>
+            @ENGLISH }}} -->
+            <para>Et program for inkrementell speiling av et depot til 
+              et annet over et nettverk.</para>
+          </listitem>
+        </varlistentry>
+
       </variablelist>
   
       <!-- @ENGLISH {{{

Modified: trunk/src/nb/book/ch-reference.xml
==============================================================================
--- trunk/src/nb/book/ch-reference.xml	(original)
+++ trunk/src/nb/book/ch-reference.xml	Thu Apr 19 13:26:52 2007
@@ -672,7 +672,7 @@
 --no-auth-cache
 --non-interactive
 --config-dir DIR
---verbose
+--verbose (-v)
 </screen>
         </refsect1>
 
@@ -1677,7 +1677,7 @@
 --password PASS
 --no-auth-cache
 --non-interactive
---non-recursive
+--non-recursive (-N)
 --config-dir DIR
 --native-eol EOL
 --ignore-externals
@@ -1938,13 +1938,13 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --recursive (-R)
 --targets FILENAME
 --incremental
 --xml
---username ARG
---password ARG
+--username USER
+--password PASS
 --no-auth-cache
 --non-interactive
 --config-dir DIR
@@ -2170,16 +2170,16 @@
           <title>Switches</title>
 
           <screen>
---targets ARG
---message (-m) ARG
---file (-F) ARG
+--targets FILENAME
+--message (-m) TEXT
+--file (-F) FILE
 --force-log
---encoding ARG
---username ARG
---password ARG
+--encoding ENC
+--username USER
+--password PASS
 --no-auth-cache
 --non-interactive
---config-dir ARG
+--config-dir DIR
 --force
 </screen>
         </refsect1>
@@ -3702,7 +3702,7 @@
 --password PASS
 --no-auth-cache
 --non-interactive
---config-dir
+--config-dir DIR
 --ignore-externals
 </screen>
         </refsect1>
@@ -3812,7 +3812,7 @@
 --non-recursive (-N)
 --quiet (-q)
 --diff3-cmd CMD
---relocate
+--relocate FROM TO
 --username USER
 --password PASS
 --no-auth-cache
@@ -3959,12 +3959,12 @@
           <title>Switches</title>
 
           <screen>
---targets ARG
---username ARG
---password ARG
+--targets FILENAME
+--username USER
+--password PASS
 --no-auth-cache
 --non-interactive
---config-dir ARG
+--config-dir DIR
 --force
 </screen>
         </refsect1>
@@ -4356,8 +4356,8 @@
           <title>Description</title>
 
           <para><command>svnadmin deltify</command> only exists in
-            1.0.x due to historical reasons.  This command is
-            deprecated and no longer needed.</para>
+            current versions of Subversion due to historical reasons.
+            This command is deprecated and no longer needed.</para>
 
           <para>It dates from a time when Subversion offered
             administrators greater control over compression strategies
@@ -4370,8 +4370,8 @@
           <title>Switches</title>
           
           <screen>
---revision (-r)
---quiet
+--revision (-r) REV
+--quiet (-q)
 </screen>
         </refsect1>
       </refentry>
@@ -4441,9 +4441,9 @@
           <title>Switches</title>
           
           <screen>
---revision (-r)
+--revision (-r) REV
 --incremental
---quiet
+--quiet (-q)
 --deltas
 </screen>
         </refsect1>
@@ -4937,7 +4937,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r) ARG
+--revision (-r) REV
 --bypass-hooks
 </screen>
         </refsect1>
@@ -5103,7 +5103,7 @@
           <title>Switches</title>
           
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 </screen>
         </refsect1>
@@ -5142,7 +5142,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 </screen>
         </refsect1>
@@ -5239,7 +5239,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 </screen>
         </refsect1>
@@ -5285,7 +5285,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 </screen>
         </refsect1>
@@ -5324,7 +5324,7 @@
           <title>Switches</title>
           
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 --no-diff-added
 --no-diff-deleted
@@ -5389,7 +5389,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 </screen>
         </refsect1>
@@ -5455,7 +5455,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --show-ids
 </screen>
         </refsect1>
@@ -5511,7 +5511,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 </screen>
         </refsect1>
@@ -5598,7 +5598,7 @@
           <title>Switches</title>
           
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 </screen>
         </refsect1>
@@ -5644,7 +5644,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 --revprop
 </screen>
@@ -5692,7 +5692,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 --verbose (-v)
 --revprop
@@ -5745,7 +5745,7 @@
           <title>Switches</title>
 
           <screen>
---revision (-r)
+--revision (-r) REV
 --transaction (-t)
 --show-ids
 </screen>
@@ -6011,7 +6011,7 @@
 
       <refsect1 id="svn.ref.svnversion.re.syn">
         <title>Synopsis</title>
-        <programlisting>svnversion [OPTIONS] WC_PATH [TRAIL_URL]</programlisting>
+        <programlisting>svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]</programlisting>
       </refsect1>
 
       <refsect1 id="svn.ref.svnversion.re.desc">
@@ -6029,6 +6029,10 @@
           <replaceable>WC_PATH</replaceable> does not rely on
           <replaceable>TRAIL_URL</replaceable>).</para>
 
+        <para>When WC_PATH is not defined the current directory
+          will be used as the working copy path.  TRAIL_URL cannot be
+          defined if WC_PATH is not explicitly given.</para>
+  
       </refsect1>
 
       <refsect1 id="svn.ref.svnversion.re.sw">
@@ -6080,11 +6084,12 @@
           example, immediately after an update), then that revision is
           printed out:</para>
 
-        <screen>$ svnversion .
+        <screen>$ svnversion
 4168</screen>
 
         <para>You can add TRAIL_URL to show that the working copy is
-          not switched from what you expect:</para>
+          not switched from what you expect.  Note that the WC_PATH was
+          required in this command:</para>
 
         <screen>$ svnversion . /repos/svn/trunk
 4168</screen>
@@ -6092,32 +6097,32 @@
         <para>For a mixed-revision working copy, the range of
           revisions present is printed:</para>
 
-        <screen>$ svnversion .
+        <screen>$ svnversion
 4123:4168</screen>
 
         <para>If the working copy contains modifications, a trailing
           "M" is added:</para>
 
-        <screen>$ svnversion .
+        <screen>$ svnversion
 4168M</screen>
 
         <para>If the working copy is switched, a trailing "S" is
           added:</para> 
 
-        <screen>$ svnversion .
+        <screen>$ svnversion
 4168S</screen>
 
         <para>Thus, here is a mixed-revision, switched working copy
           containing some local modifications:</para>
 
-        <screen>$ svnversion .
+        <screen>$ svnversion
 4212:4168MS</screen>
 
         <para>If invoked on a directory that is not a working copy,
           <command>svnversion</command> assumes it is an exported
           working copy and prints "exported":</para>
 
-        <screen>$ svnversion .
+        <screen>$ svnversion
 exported</screen>
 
       </refsect1>

Modified: trunk/src/nb/book/ch-server-configuration.xml
==============================================================================
--- trunk/src/nb/book/ch-server-configuration.xml	(original)
+++ trunk/src/nb/book/ch-server-configuration.xml	Thu Apr 19 13:26:52 2007
@@ -1182,13 +1182,14 @@
       <!-- @ENGLISH {{{
       <para>At the time of writing, the server only knows how to send
         a CRAM-MD5 <footnote><para>See RFC 2195.</para></footnote>
-        authentication challenge.  In essence, the server sends a bit
-        of data to the client.  The client uses the MD5 hash algorithm
-        to create a fingerprint of the data and password combined,
-        then sends the fingerprint as a response.  The server performs
-        the same computation with the stored password to verify that
-        the result is identical.  <emphasis>At no point does the
-        actual password travel over the network.</emphasis></para>
+        authentication challenge.  In essence, the server sends a
+        small amount of data to the client.  The client uses the MD5
+        hash algorithm to create a fingerprint of the data and
+        password combined, then sends the fingerprint as a response.
+        The server performs the same computation with the stored
+        password to verify that the result is identical.  <emphasis>At
+        no point does the actual password travel over the
+        network.</emphasis></para>
       @ENGLISH }}} -->
       <para>Når dette skrives, vet &the_server; bare hvordan den skal 
         sende en CRAM-MD5<footnote>
@@ -2472,9 +2473,10 @@
       <para>Be sure that when you define your new
         <literal>Location</literal>, it doesn't overlap with other
         exported Locations.  For example, if your main
-        <literal>DocumentRoot</literal> is <filename>/www</filename>,
-        do not export a Subversion repository in <literal><Location
-        /www/repos></literal>.  If a request comes in for the URI
+        <literal>DocumentRoot</literal> is exported to
+        <filename>/www</filename>, do not export a Subversion
+        repository in <literal><Location /www/repos></literal>.
+        If a request comes in for the URI
         <filename>/www/repos/foo.c</filename>, Apache won't know
         whether to look for a file <filename>repos/foo.c</filename> in
         the <literal>DocumentRoot</literal>, or whether to delegate
@@ -2485,9 +2487,9 @@
       <para>Pass på at den nye <literal>Location</literal>-defineringen 
         ikke overlapper med andre eksporterte plasseringer.
         For eksempel, hvis hovedplasseringen av 
-        <literal>DocumentRoot</literal> er <filename>/www</filename>, 
-        ikke eksporter et Subversiondepot med <literal><Location 
-        /www/repos></literal>.
+        <literal>DocumentRoot</literal> eksporteres til 
+        <filename>/www</filename>, ikke eksporter et Subversiondepot med 
+        <literal><Location /www/repos></literal>.
         Hvis en forespørsel kommer for URIen 
         <filename>/www/repos/foo.c</filename>, vet ikke Apache om den 
         skal se etter fila <filename>repos/foo.c</filename> i 
@@ -4064,7 +4066,7 @@
         <!-- @ENGLISH {{{
         <para>All of this path-checking can sometimes be quite
           expensive, especially in the case of <command>svn
-          log</command>.  When retrieving a list revisions, the server
+          log</command>.  When retrieving a list of revisions, the server
           looks at every changed path in each revision and checks it
           for readability.  If an unreadable path is discovered, then
           it's omitted from the list of the revision's changed paths




More information about the svnbook-dev mailing list