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

sunny256 svnbook-dev at red-bean.com
Tue Jan 3 17:18:10 CST 2006


Author: sunny256
Date: Tue Jan  3 17:17:46 2006
New Revision: 1912

Modified:
   trunk/src/nb/LAST_UPDATED
   trunk/src/nb/book/appa.xml
   trunk/src/nb/book/appc.xml
   trunk/src/nb/book/book.xml
   trunk/src/nb/book/ch00.xml
   trunk/src/nb/book/ch01.xml
   trunk/src/nb/book/ch02.xml
   trunk/src/nb/book/ch05.xml
   trunk/src/nb/book/ch06.xml
   trunk/src/nb/book/ch08.xml

Log:
Sync the Norwegian book with the English files, r1881:1911.

* src/nb/LAST_UPDATED
  Modified by "make sync".

* src/nb/book/appa.xml
* src/nb/book/appc.xml
* src/nb/book/book.xml
* src/nb/book/ch00.xml
* src/nb/book/ch01.xml
* src/nb/book/ch02.xml
* src/nb/book/ch05.xml
* src/nb/book/ch06.xml
* src/nb/book/ch08.xml
  Updated r1883, r1887, r1888, r1889, r1890, r1891, r1895, r1896, r1898, 
  r1900, r1901, r1904, r1908.


Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED	(original)
+++ trunk/src/nb/LAST_UPDATED	Tue Jan  3 17:17:46 2006
@@ -1 +1 @@
-1881
+1911

Modified: trunk/src/nb/book/appa.xml
==============================================================================
--- trunk/src/nb/book/appa.xml	(original)
+++ trunk/src/nb/book/appa.xml	Tue Jan  3 17:17:46 2006
@@ -486,9 +486,9 @@
       forandringer ut som dette:</para>
 
     <screen>
-% svn status
-M     ./foo.c
-M     ./bar/baz.c
+$ svn status
+M      foo.c
+M      bar/baz.c
 </screen>
 
     <!-- @ENGLISH {{{
@@ -500,11 +500,11 @@
       (<option>-u</option>), brukes et lengre format:</para>
 
     <screen>
-% svn status -u
-M             1047    ./foo.c
-       *      1045    ./faces.html
-       *         -    ./bloo.png
-M             1050    ./bar/baz.c
+$ svn status -u
+M            1047   foo.c
+       *     1045   faces.html
+       *            bloo.png
+M            1050   bar/baz.c
 Status against revision:   1066
 </screen>
 
@@ -515,7 +515,7 @@
       item.  In the example above, the asterisk indicates that
       <filename>faces.html</filename> would be patched if we updated,
       and that <filename>bloo.png</filename> is a newly added file in
-      the repository.  (The <literal>-</literal> next to
+      the repository.  (The absence of any revision number next to
       <filename>bloo.png</filename> means that it doesn't yet exist in
       the working copy.)</para>
     @ENGLISH }}} -->
@@ -528,11 +528,11 @@
       <filename>faces.html</filename> vil bli patchet hvis vi 
       oppdaterer, og at <filename>bloo.png</filename> er en fil som 
       nylig er lagt til i depotet.
-      (Tegnet <literal>-</literal> ved siden av 
-      <filename>bloo.png</filename> betyr at den ikke eksisterer enda i 
+      (Når revisjonsnummeret ved siden av <filename>bloo.png</filename> 
+      mangler, betyr det at at fila ikke eksisterer enda i 
       arbeidskopien.)</para>
 
-    <!-- ###TODO describe -u here as well as -uv. -u and -v use
+    <!-- ###TODO describe -v here as well as -uv. -u and -v use
          different <quote>long</quote> formats and need to be
          documented separately. Moreover, as you can combine -u and
          -v, it needs to be explained what each of them does. As -u is
@@ -935,13 +935,13 @@
       <option>--no-auth-cache</option>.</para>
 
     <!-- @ENGLISH {{{
-    <para>The exception to this behaviors, however, is in the case of
+    <para>The exception to this behavior, however, is in the case of
       accessing an <command>svnserve</command> server over an SSH
       tunnel, using the <literal>svn+ssh://</literal> URL schema.  In
       that case, the <command>ssh</command> program unconditionally
       demands authentication just to start the tunnel.</para>
     @ENGLISH }}} -->
-    <para>Unntaket fra denne oppførselen derimot, er tilfellet med å 
+    <para>Unntaket fra denne oppførselen, derimot, er tilfellet med å 
       aksessere en <command>svnserve</command>-tjener gjennom en 
       SSH-tunnel ved å bruke URL-skjemaet <literal>svn+ssh://</literal>.
       I det tilfellet forlanger <command>ssh</command> autentisering 
@@ -991,14 +991,14 @@
       Subversion.</para>
 
     <!-- @ENGLISH {{{
-    <para>One such tool is cvs2svn (<systemitem
-      class="url">http://cvs2svn.tigris.org/</systemitem>), a Python
-      script originally created by members of Subversion's own
-      development community.  Others include Chia-liang Kao's
-      Subversion converter plugin to the VCP tool (<systemitem
-      class="url">http://svn.clkao.org/revml/branches/svn-perl/</systemitem>)
-      and Lev Serebryakov's RefineCVS (<systemitem
-      class="url">http://lev.serebryakov.spb.ru/refinecvs/</systemitem>).
+    <para>One such tool is cvs2svn
+      (<ulink url="http://cvs2svn.tigris.org/"/>), a Python script
+      originally created by members of Subversion's own development
+      community.  Others include Chia-liang Kao's Subversion converter
+      plugin to the VCP tool
+      (<ulink url="http://svn.clkao.org/revml/branches/svn-perl/"/>)
+      and Lev Serebryakov's RefineCVS
+      (<ulink url="http://lev.serebryakov.spb.ru/refinecvs/"/>).
       These tools have various levels of completeness, and may make
       entirely different decisions about how to handle your CVS
       repository history.  Whichever tool you decide to use, be sure
@@ -1006,15 +1006,13 @@
       conversion results—after all, you've worked hard to build
       that history!</para>
     @ENGLISH }}} -->
-    <para>Et slikt verktøy er cvs2svn (<systemitem 
-      class="url">http://cvs2svn.tigris.org/</systemitem>), et 
-      Pythonskript originalt laget av medlemmer fra Subversions 
-      utviklermiljø.
+    <para>Et slikt verktøy er cvs2svn (<ulink 
+      url="http://cvs2svn.tigris.org/"/>), et Pythonskript originalt 
+      laget av medlemmer fra Subversions utviklermiljø.
       Andre inkluderer et programtillegg av Chia-liang Kao til verktøyet 
-      VCP (<systemitem 
-      class="url">http://svn.clkao.org/revml/branches/svn-perl/</systemitem>) 
-      og Lev Serebryakovs RefineCVS (<systemitem 
-      class="url">http://lev.serebryakov.spb.ru/refinecvs/</systemitem>).
+      VCP (<ulink url="http://svn.clkao.org/revml/branches/svn-perl/"/>) 
+      og Lev Serebryakovs RefineCVS (<ulink 
+      url="http://lev.serebryakov.spb.ru/refinecvs/"/>).
       Disse verktøyene er komplette i varierende grad, og kan komme til 
       å gjøre helt forskjellige vurderinger om hvordan historien til 
       CVS-depotet skal behandles.
@@ -1025,13 +1023,13 @@
 
     <!-- @ENGLISH {{{
     <para>For an updated collection of links to known converter tools,
-      visit the Links page of the Subversion website (<systemitem
-      class="url">http://subversion.tigris.org/project_links.html</systemitem>).</para>
+      visit the Links page of the Subversion website
+      (<ulink url="http://subversion.tigris.org/project_links.html"/>).</para>
     @ENGLISH }}} -->
     <para>For en oppdatert samling av lenker til kjente 
       konverteringsverktøy, besøk lenkesiden på hjemmesiden til 
-      Subversion (<systemitem 
-      class="url">http://subversion.tigris.org/project_links.html</systemitem>).</para>
+      Subversion (<ulink 
+      url="http://subversion.tigris.org/project_links.html"/>).</para>
 
   </sect1>
 

Modified: trunk/src/nb/book/appc.xml
==============================================================================
--- trunk/src/nb/book/appc.xml	(original)
+++ trunk/src/nb/book/appc.xml	Tue Jan  3 17:17:46 2006
@@ -8,16 +8,11 @@
       language bindings (as described in <xref
       linkend="svn.developer.usingapi.otherlangs"/>) make it a likely
       candidate for use as an extension or backend to other pieces of
-      software.  In this appendix, we'll briefly introduce you to some
-      of the many third-party tools that are using Subversion
-      functionality under-the-hood.</para>
+      software.  For a listing of many third-party tools that are using
+      Subversion functionality under-the-hood, check out the Links page on the
+      Subversion website (<ulink
+        url="http://subversion.tigris.org/project_links.html"/>).</para>
 
-    <para>For a more recently updated version of this information,
-      check out the Links page on the Subversion website (<systemitem
-      class="url">http://subversion.tigris.org/project_links.html</systemitem>).</para>
-
-    <para><emphasis>THIS APPENDIX IS UNDER CONSTRUCTION</emphasis></para>
-    
   </simplesect>
 
 </appendix>

Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml	(original)
+++ trunk/src/nb/book/book.xml	Tue Jan  3 17:17:46 2006
@@ -116,16 +116,16 @@
     <!-- @ENGLISH {{{
     <legalnotice><para>This work is licensed under the Creative
       Commons Attribution License. To view a copy of this license,
-      visit http://creativecommons.org/licenses/by/2.0/ or send a
-      letter to Creative Commons, 559 Nathan Abbott Way, Stanford,
-      California 94305, USA.</para></legalnotice>
+      visit <ulink url="http://creativecommons.org/licenses/by/2.0/"/>
+      or send a letter to Creative Commons, 559 Nathan Abbott Way,
+      Stanford, California 94305, USA.</para></legalnotice>
     @ENGLISH }}} -->
     <legalnotice>
       <para>Dette verket er lisensiert under Creative Commons 
         Attribution License.
-        For å se en kopi av denne lisensen, gå til 
-        http://creativecommons.org/licenses/by/2.0/ eller send et brev 
-        til Creative Commons, 559 Nathan Abbott Way, Stanford, 
+        For å se en kopi av denne lisensen, gå til <ulink 
+        url="http://creativecommons.org/licenses/by/2.0/"/> eller send 
+        et brev til Creative Commons, 559 Nathan Abbott Way, Stanford, 
         California 94305, USA.</para>
     </legalnotice>
 

Modified: trunk/src/nb/book/ch00.xml
==============================================================================
--- trunk/src/nb/book/ch00.xml	(original)
+++ trunk/src/nb/book/ch00.xml	Tue Jan  3 17:17:46 2006
@@ -140,13 +140,13 @@
       eksemplene i Unix-emuleringsmiljøet Cygwin.</para>
 
     <!-- @ENGLISH {{{
-    <para>Most readers are probably programmers or sysadmins who need
-      to track changes to source code.  This is the most common use
-      for Subversion, and therefore it is the scenario underlying all
-      of the book's examples.  But Subversion can be used to manage
-      changes to any sort of information: images, music, databases,
-      documentation, and so on.  To Subversion, all data is just
-      data.</para>
+    <para>Most readers are probably programmers or system
+      administrators who need to track changes to source code.  This
+      is the most common use for Subversion, and therefore it is the
+      scenario underlying all of the book's examples.  But Subversion
+      can be used to manage changes to any sort of information:
+      images, music, databases, documentation, and so on.  To
+      Subversion, all data is just data.</para>
     @ENGLISH }}} -->
     <para>De fleste leserne er sannsynligvis programmerere eller 
       systemadministratorer som har behov for å følge forandringer i 
@@ -188,10 +188,11 @@
     <!-- @ENGLISH {{{
     <para>This book aims to be useful to people of widely different
       backgrounds—from people with no previous experience in
-      version control to experienced sysadmins.  Depending on your own
-      background, certain chapters may be more or less important to
-      you.  The following can be considered a <quote>recommended
-      reading list</quote> for various types of readers:</para>
+      version control to experienced system administrators.  Depending
+      on your own background, certain chapters may be more or less
+      important to you.  The following can be considered a
+      <quote>recommended reading list</quote> for various types of
+      readers:</para>
     @ENGLISH }}} -->
     <para>Denne boken tar sikte på å være nyttig for folk med varierende 
       bakgrunn – fra folk med ingen tidligere erfaring fra 
@@ -204,24 +205,27 @@
     <variablelist>
       <varlistentry>
         <!-- @ENGLISH {{{
-        <term>Experienced sysadmins</term>
+        <term>Experienced System Administrators</term>
         @ENGLISH }}} -->
         <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.  Chapters 5 and 6 will show you how to create
+            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, chapter 3 and appendix A are
-            the fastest routes to learning the Subversion client while
-            drawing on your CVS experience.</para>
+            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>
           @ENGLISH }}} -->
           <para>Antakelsen her er at du sannsynligvis har brukt CVS før, 
             og klør i fingrene etter å få en Subversiontjener opp og gå 
             så fort som mulig.
-            Kapittel 5 og 6 vil vise deg hvordan du lager ditt første 
-            depot og gjør det tilgjengelig over nettverket.
+            <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>
@@ -238,14 +242,16 @@
           <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 chapters 2 and 3 are a vital introduction.  If you're
+            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>
           @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 kapitlene 2 og 3 en vital introduksjon.
+            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>
         </listitem>
@@ -261,20 +267,21 @@
           <para>Whether you're a user or administrator, eventually
             your project will grow larger.  You're going to want to
             learn how to do more advanced things with Subversion, such
-            as how to use branches and perform merges (chapter 4),
-            how to use Subversion's property support, how to configure
-            runtime options (chapter 7), and other things.  Chapters 4
-            and 7 aren't vital at first, but be sure to read them once
-            you're comfortable with the basics.</para>
+            as how to use branches and perform merges (<xref
+              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
+            once you're comfortable with the basics.</para>
           @ENGLISH }}} -->
           <para>Enten du er en bruker eller administrator, vil 
             prosjektet ditt etterhvert vokse seg større.
             Du vil ønske å lære hvordan man gjør mer avanserte ting med 
             Subversion, som å bruke forgreninger og utføre flettinger 
-            (kapittel 4), hvordan bruke Subversions støtte for 
-            egenskaper, hvordan konfigurere valg for kjøring (kapittel 
-            7) og andre ting.
-            Kapitlene 4 og 7 er ikke absolutt nødvendige til å begynne 
+            (<xref linkend="svn.branchmerge"/>), hvordan bruke 
+            Subversions støtte for egenskaper, hvordan konfigurere valg 
+            for kjøring (<xref linkend="svn.advanced"/>) og andre ting.
+            Disse to kapitlene er ikke absolutt nødvendige til å begynne 
             med, men pass på å lese dem når du er komfortabel med det 
             grunnleggende.</para>
         </listitem>
@@ -289,26 +296,27 @@
           <!-- @ENGLISH {{{
           <para>Presumably, you're already familiar with Subversion,
             and now want to either extend it or build new software on
-            top of its many APIs.  Chapter 8 is just for you.</para>
+            top of its many APIs.  <xref linkend="svn.developer"/> is
+            just for you.</para>
           @ENGLISH }}} -->
           <para>Antagelig er du allerede kjent med Subversion, og vil nå 
             enten utvide den eller lage ny programvare på toppen av dens 
             mange programmeringsgrensesnitt.
-            Kapittel 8 er bare for deg.</para>
+            <xref linkend="svn.developer"/> er bare for deg.</para>
         </listitem>
       </varlistentry>
     </variablelist>
 
     <!-- @ENGLISH {{{
-    <para>The book ends with reference material—chapter 9 is a
-      reference guide for all Subversion commands, and the appendices
-      cover a number of useful topics.  These are the chapters you're
-      mostly likely to come back to after you've finished the
-      book.</para>
-    @ENGLISH }}} -->
-    <para>Boken slutter med referansemateriale – kapittel 9 er en 
-      referanseguide for alle Subversionkommandoer, og tilleggene dekker 
-      en rekke nyttige emner.
+    <para>The book ends with reference material—<xref
+        linkend="svn.ref"/> is a reference guide for all Subversion
+      commands, and the appendices cover a number of useful topics.
+      These are the chapters you're mostly likely to come back to after
+      you've finished the book.</para>
+    @ENGLISH }}} -->
+    <para>Boken slutter med referansemateriale – <xref 
+      linkend="svn.ref"/> er en referanseguide for alle 
+      Subversionkommandoer, og tilleggene dekker en rekke nyttige emner.
       Dette er kapitlene du mest sannsynlig vil komme tilbake til når du 
       er ferdig med boken.</para>
 
@@ -452,14 +460,14 @@
         
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 1, <emphasis>Introduction</emphasis></term>
+          <term><xref linkend="svn.intro"/></term>
           <listitem>
             <para>Covers the history of Subversion as well as its
               features, architecture, components, and install
               methods.  Also includes a quick-start guide.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 1, <emphasis>Introduksjon</emphasis></term>
+          <term><xref linkend="svn.intro"/></term>
           <listitem>
             <para>Dekker historien til Subversion så vel som funksjoner, 
               arkitektur, komponenter og installasjonsmetoder.
@@ -469,15 +477,14 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 2, <emphasis>Basic Concepts</emphasis></term>
+          <term><xref linkend="svn.basic"/></term>
           <listitem>
             <para>Explains the basics of version control and different
               versioning models, along with Subversion's repository,
               working copies, and revisions.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 2, <emphasis>Grunnleggende 
-            konsepter</emphasis></term>
+          <term><xref linkend="svn.basic"/></term>
           <listitem>
             <para>Forklarer det grunnleggende om versjonskontroll og 
               forskjellige versjoneringsmodeller, sammen med Subversions 
@@ -487,14 +494,14 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 3, <emphasis>Guided Tour</emphasis></term>
+          <term><xref linkend="svn.tour"/></term>
           <listitem>
             <para>Walks you through a day in the life of a Subversion
               user.  It demonstrates how to use Subversion to obtain,
               modify, and commit data.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 3, <emphasis>Guidet tur</emphasis></term>
+          <term><xref linkend="svn.tour"/></term>
           <listitem>
             <para>Tar deg med gjennom en dag i livet til en 
               Subversionbruker.
@@ -505,7 +512,7 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 4, <emphasis>Branching and Merging</emphasis></term>
+          <term><xref linkend="svn.branchmerge"/></term>
           <listitem>
             <para>Discusses branches, merges, and tagging, including
               best practices for branching and merging, common
@@ -513,8 +520,7 @@
               from one branch to the next.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 4, <emphasis>Forgreninger og 
-            fletting</emphasis></term>
+          <term><xref linkend="svn.branchmerge"/></term>
           <listitem>
             <para>Diskuterer forgreninger, fletting og merking, 
               inkludert beste praksiser for å lage forgreninger og 
@@ -526,16 +532,14 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 5, <emphasis>Repository
-            Administration</emphasis></term>
+          <term><xref linkend="svn.reposadmin"/></term>
           <listitem>
             <para>Describes the basics of the Subversion repository,
               how to create, configure, and maintain a repository, and
               the tools you can use to do all of this.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 5, 
-            <emphasis>Depotadministrasjon</emphasis></term>
+          <term><xref linkend="svn.reposadmin"/></term>
           <listitem>
             <para>Beskriver det grunnleggende ved et Subversiondepot, 
               hvordan man lager, konfigurerer og vedlikeholder et depot, 
@@ -545,7 +549,7 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 6, <emphasis>Server Configuration</emphasis></term>
+          <term><xref linkend="svn.serverconfig"/></term>
           <listitem>
             <para>Explains how to configure your Subversion server and
               the three ways to access your repository:
@@ -555,8 +559,7 @@
               access.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 6, 
-            <emphasis>Tjenerkonfigurasjon</emphasis></term>
+          <term><xref linkend="svn.serverconfig"/></term>
           <listitem>
             <para>Forklarer hvordan du konfigurerer Subversiontjeneren 
               din og de tre måtene å få tilgang til depotet ditt:
@@ -569,7 +572,7 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 7, <emphasis>Advanced Topics</emphasis></term>
+          <term><xref linkend="svn.advanced"/></term>
           <listitem>
             <para>Explores the Subversion client configuration files,
               file and directory properties, how to
@@ -578,7 +581,7 @@
               lastly, how to handle vendor branches.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 7, <emphasis>Avanserte emner</emphasis></term>
+          <term><xref linkend="svn.advanced"/></term>
           <listitem>
             <para>Utforsker Subversion-klientens konfigurasjonsfiler, 
               fil- og katalogegenskaper, hvordan 
@@ -590,7 +593,7 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 8, <emphasis>Developer Information</emphasis></term>
+          <term><xref linkend="svn.developer"/></term>
           <listitem>
             <para>Describes the internals of Subversion, the
               Subversion filesystem, and the working copy
@@ -600,8 +603,7 @@
               to contribute to the development of Subversion.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 8, 
-          <emphasis>Utviklerinformasjon</emphasis></term>
+          <term><xref linkend="svn.developer"/></term>
           <listitem>
             <para>Beskriver den interne funksjonaliteten til Subversion, 
               Subversions filsystem, og de administrative områdene i 
@@ -615,8 +617,7 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Chapter 9, <emphasis>Subversion Complete
-            Reference</emphasis></term>
+          <term><xref linkend="svn.ref"/></term>
           <listitem>
             <para>Explains in great detail every subcommand of
               <command>svn</command>, <command>svnadmin</command>, and
@@ -624,8 +625,7 @@
               the whole family!</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Kapittel 9, <emphasis>Komplett referanse for 
-            Subversion</emphasis></term>
+          <term><xref linkend="svn.ref"/></term>
           <listitem>
             <para>Forklarer i stor detalj hver eneste delkommando i 
               <command>svn</command>, <command>svnadmin</command> og 
@@ -636,8 +636,7 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Appendix A, <emphasis>Subversion for CVS
-            Users</emphasis></term>
+          <term><xref linkend="svn.forcvs"/></term>
           <listitem>
             <para>Covers the similarities and differences between
               Subversion and CVS, with numerous suggestions on how to
@@ -649,8 +648,7 @@
               conflict resolution, and authentication.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Tillegg A, <emphasis>Subversion for 
-            CVS-brukere</emphasis></term>
+          <term><xref linkend="svn.forcvs"/></term>
           <listitem>
             <para>Dekker likheter og forskjeller mellom Subversion og 
               CVS, med flere forslag om hvordan du kan bryte alle de 
@@ -666,16 +664,14 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Appendix B, <emphasis>WebDAV and
-            Autoversioning</emphasis></term>
+          <term><xref linkend="svn.webdav"/></term>
           <listitem>
             <para>Describes the details of WebDAV and DeltaV, and how
               you can configure your Subversion repository to be
               mounted read/write as a DAV share.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Tillegg B, <emphasis>WebDAV og 
-            autoversjonering</emphasis></term>
+          <term><xref linkend="svn.webdav"/></term>
           <listitem>
             <para>Beskriver detaljene om WebDAV og DeltaV, og hvordan du 
               kan konfigurere Subversiondepotet til å være montert som 
@@ -685,15 +681,14 @@
 
         <varlistentry>
           <!-- @ENGLISH {{{
-          <term>Appendix C, <emphasis>Third Party Tools</emphasis></term>
+          <term><xref linkend="svn.3rdparty"/></term>
           <listitem>
             <para>Discusses tools that support or use Subversion,
               including alternative client programs, repository
               browser tools, and so on.</para>
           </listitem>
           @ENGLISH }}} -->
-          <term>Tillegg C, <emphasis>Tredjeparts 
-            verktøy</emphasis></term>
+          <term><xref linkend="svn.3rdparty"/></term>
           <listitem>
             <para>Diskuterer verktøy som støtter eller bruker 
               Subversion, inkludert alternative klientprogrammer, 
@@ -763,20 +758,22 @@
     </itemizedlist>
     
     <!-- @ENGLISH {{{
+    <!-ﳢ- O'Reilly Hardcopy Only
     <para>You can send publishing comments and questions to O'Reilly
-      here: ###insert boilerplate.</para>
+      here: <remark>###insert boilerplate.</remark></para>
+    -ﳢ->
     @ENGLISH }}} -->
+    <!-- Gjelder bare for O’Reilly-boka
     <para>Du kan sende publiseringskommentarer og spørsmål til O’Reilly 
-      her: ###insert boilerplate.</para>
+      her: <remark>###insert boilerplate.</remark></para>
+    -->
 
     <!-- @ENGLISH {{{
     <para>A relatively recent online version of this book can be found
-      at <systemitem
-      class="url">http://svnbook.red-bean.com</systemitem>.</para>
+      at <ulink url="http://svnbook.red-bean.com"/>.</para>
     @ENGLISH }}} -->
-    <para>En relativt fersk versjon av boken finner du online på 
-      <systemitem 
-      class="url">http://svnbook.red-bean.com</systemitem>.</para>
+    <para>En relativt fersk versjon av boken finner du online på <ulink 
+      url="http://svnbook.red-bean.com"/>.</para>
 
   </sect1>
 

Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml	(original)
+++ trunk/src/nb/book/ch01.xml	Tue Jan  3 17:17:46 2006
@@ -139,11 +139,11 @@
     <title>Subversions historie</title>
 
     <!-- @ENGLISH {{{
-    <para>In early 2000, CollabNet, Inc. (<systemitem
-      class="url">http://www.collab.net</systemitem>) began seeking
+    <para>In early 2000, CollabNet,
+      Inc. (<ulink url="http://www.collab.net"/>) began seeking
       developers to write a replacement for CVS.  CollabNet offers a
-      collaboration software suite called CollabNet Enterprise
-      Edition (CEE)
+      collaboration software suite called CollabNet Enterprise Edition
+      (CEE)
       <footnote>
         <para>There's also a CollabNet Team Edition (CTE)
           offering aimed at smaller groups.</para>
@@ -159,9 +159,9 @@
       write a new version control system from scratch, retaining the
       basic ideas of CVS, but without the bugs and misfeatures.</para>
     @ENGLISH }}} -->
-    <para>Tidlig i år 2000 startet CollabNet, Inc. (<systemitem
-      class="url">http://www.collab.net</systemitem>) letingen etter 
-      utviklere for å lage en erstatning for CVS.
+    <para>Tidlig i år 2000 startet CollabNet, Inc. (<ulink 
+      url="http://www.collab.net"/>) letingen etter utviklere for å lage 
+      en erstatning for CVS.
       CollabNet tilbyr programvare for å muliggjøre samarbeid – 
       CollabNet Enterprise Edition (CEE)<footnote>
         <para>Det finnes også en versjon kalt <!-- ¤ Denne taggen er 
@@ -633,20 +633,19 @@
     <!-- @ENGLISH {{{
     <para>The easiest way to get Subversion is to download a binary
       package built for your operating system.  Subversion's website
-      (<systemitem
-      class="url">http://subversion.tigris.org</systemitem>) often has
-      these packages available for download, posted by volunteers.
-      The site usually contains graphical installer packages for users
-      of Microsoft operating systems.  If you run a Unix-like
-      operating system, you can use your system's native package
-      distribution system (RPMs, DEBs, the ports tree, etc.) to get
+      (<ulink url="http://subversion.tigris.org"/>) often has these
+      packages available for download, posted by volunteers.  The site
+      usually contains graphical installer packages for users of
+      Microsoft operating systems.  If you run a Unix-like operating
+      system, you can use your system's native package distribution
+      system (RPMs, DEBs, the ports tree, etc.) to get
       Subversion.</para>
     @ENGLISH }}} -->
     <para>Den letteste måten å få tak i Subversion er å hente en binær 
       pakke bygget for ditt operativsystem.
-      Subversions hjemmeside (<systemitem
-      class="url">http://subversion.tigris.org</systemitem>) har ofte 
-      disse pakkene tilgjengelig for nedlasting, lagt ut av frivillige.
+      Subversions hjemmeside (<ulink 
+      url="http://subversion.tigris.org"/>) har ofte disse pakkene 
+      tilgjengelig for nedlasting, lagt ut av frivillige.
       Denne plassen inneholder vanligvis grafiske installasjonspakker 
       for brukere av operativsystemer fra Microsoft.
       Hvis du kjører et Unix-lignende operativsystem, kan du bruke 
@@ -978,20 +977,20 @@
 /tmp/myproject/branches/
 /tmp/myproject/tags/
 /tmp/myproject/trunk/
-                    foo.c
-                    bar.c
-                    Makefile
-                    …
+                     foo.c
+                     bar.c
+                     Makefile
+                     …
 </screen>
     @ENGLISH }}} -->
     <screen>
 /tmp/mittprosjekt/branches/
 /tmp/mittprosjekt/tags/
 /tmp/mittprosjekt/trunk/
-                    foo.c
-                    bar.c
-                    Makefile
-                    …
+                     foo.c
+                     bar.c
+                     Makefile
+                     …
 </screen>
 
     <!-- @ENGLISH {{{

Modified: trunk/src/nb/book/ch02.xml
==============================================================================
--- trunk/src/nb/book/ch02.xml	(original)
+++ trunk/src/nb/book/ch02.xml	Tue Jan  3 17:17:46 2006
@@ -732,10 +732,10 @@
 
       <screen>
 $ svn checkout http://svn.example.com/repos/calc
-A  calc
-A  calc/Makefile
-A  calc/integer.c
-A  calc/button.c
+A    calc/Makefile
+A    calc/integer.c
+A    calc/button.c
+Checked out revision 56.
 
 $ ls -A calc
 Makefile  integer.c  button.c  .svn/
@@ -946,7 +946,8 @@
 .svn/ Makefile integer.c button.c
 
 $ svn update
-U button.c
+U    button.c
+Updated to revision 57.
 </screen>
 
       <!-- @ENGLISH {{{
@@ -1069,7 +1070,7 @@
           <quote><filename>foo.c</filename> as it appears in revision
           5.</quote> Notice that in general, revisions N and M of a
           file do <emphasis>not</emphasis> necessarily differ!  Because
-          CVS uses per-file revisions numbers, CVS users might want to
+          CVS uses per-file revision numbers, CVS users might want to
           see <xref linkend="svn.forcvs"/> for more details.</para>
         @ENGLISH }}} -->
         <para>Ulikt mange av de andre versjonskontrollsystemene, gjelder 

Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml	(original)
+++ trunk/src/nb/book/ch05.xml	Tue Jan  3 17:17:46 2006
@@ -3291,8 +3291,8 @@
           regular Berkeley DB environment directory, and can therefore
           be used in conjunction with any of the Berkeley database
           tools (you can see the documentation for these tools at
-          SleepyCat's website, <systemitem
-          class="url">http://www.sleepycat.com/</systemitem>).</para>
+          SleepyCat's website,
+          <ulink url="http://www.sleepycat.com/"/>).</para>
         @ENGLISH }}} -->
         <para>Hvis du bruker et Berkeley DB-depot, vil alle strukturer 
           og data være i et sett med databasetabeller i katalogen 
@@ -3300,8 +3300,8 @@
           Denne underkatalogen er en vanlig Berkeley DB miljøkatalog, og 
           kan derfor bli brukt i forbindelse med alle Berkeley 
           databaseverktøy (du kan se dokumentasjonen for disse 
-          verktøyene på SleepyCats hjemmeside, <systemitem 
-          class="url">http://www.sleepycat.com/</systemitem>).</para>
+          verktøyene på SleepyCats hjemmeside, <ulink 
+          url="http://www.sleepycat.com/"/>).</para>
 
         <!-- @ENGLISH {{{
         <para>For day-to-day Subversion use, these tools are

Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml	(original)
+++ trunk/src/nb/book/ch06.xml	Tue Jan  3 17:17:46 2006
@@ -2046,8 +2046,7 @@
       network server that Subversion can leverage.  Via a custom
       module, <command>httpd</command> makes Subversion repositories
       available to clients via the WebDAV/DeltaV protocol, which is an
-      extension to HTTP 1.1
-      (see <systemitem class="url">http://www.webdav.org/</systemitem>
+      extension to HTTP 1.1 (see <ulink url="http://www.webdav.org/"/>
       for more information). This protocol takes the ubiquitous HTTP
       protocol that is the core of the World Wide Web, and adds
       writing—specifically, versioned
@@ -2068,8 +2067,7 @@
       Ved hjelp av en spesiallaget modul gjør <command>httpd</command> 
       Subversiondepoter tilgjengelig for klienter via 
       WebDAV/DeltaV-protokollen, som er en utvidelse av HTTP 1.1 (se 
-      <systemitem class="url">http://www.webdav.org</systemitem> for mer 
-      informasjon).
+      <ulink url="http://www.webdav.org/"/> for mer informasjon).
       Denne protokollen tar HTTP-protokollen som vi finner over alt, 
       kjernen av <!-- ¤ -->World Wide Web, og legger til muligheter for 
       skriving – mer spesifikt, versjonert skriving.
@@ -2091,10 +2089,9 @@
       of the use of these directives, describing them in full is
       outside the scope of this chapter.  The Apache team maintains
       excellent documentation, publicly available on their website at
-      <systemitem class="url">http://httpd.apache.org</systemitem>.
-      For example, a general reference for the configuration
-      directives is located at <systemitem class="url">
-      http://httpd.apache.org/docs-2.0/mod/directives.html</systemitem>.</para>
+      <ulink url="http://httpd.apache.org"/>.  For example, a general
+      reference for the configuration directives is located at <ulink url="
+      http://httpd.apache.org/docs-2.0/mod/directives.html"/>.</para>
     @ENGLISH }}} -->
     <para>Mye av den følgende diskusjonen inneholder referanser til 
       konfigurasjonsdirektiver for Apache.
@@ -2102,11 +2099,11 @@
       det å beskrive dem i full detalj utenfor det som dette kapittelet 
       dekker.
       Utviklerne bak Apache vedlikeholder fortreffelig dokumentasjon, 
-      offentlig tilgjengelig på hjemmesiden <systemitem 
-      class="url">http://httpd.apache.org</systemitem>.
+      offentlig tilgjengelig på hjemmesiden <ulink 
+      url="http://httpd.apache.org"/>.
       En generell oversikt over konfigurasjonsdirektivene er for 
-      eksempel tilgjengelig på <systemitem 
-      class="url">http://httpd.apache.org/docs-2.0/mod/directives.html</systemitem>.</para>
+      eksempel tilgjengelig på <ulink 
+      url="http://httpd.apache.org/docs-2.0/mod/directives.html"/>.</para>
     
     <!-- @ENGLISH {{{
     <para>Also, as you make changes to your Apache setup, it is likely
@@ -3319,27 +3316,25 @@
         <!-- @ENGLISH {{{
         <para>Sometimes you don't need to run such a tight ship.  For
           example, Subversion's own source code repository at
-          <systemitem
-          class="url">http://svn.collab.net/repos/svn</systemitem>
-          allows anyone in the world to perform read-only repository
-          tasks (like checking out working copies and browsing the
-          repository with a web browser), but restricts all write
-          operations to authenticated users.  To do this type of
-          selective restriction, you can use the
-          <literal>Limit</literal> and <literal>LimitExcept</literal>
-          configuration directives.  Like the
-          <literal>Location</literal> directive, these blocks have
-          starting and ending tags, and you would nest them inside
-          your <literal><Location></literal> block.</para>
+          <ulink url="http://svn.collab.net/repos/svn"/> allows anyone
+          in the world to perform read-only repository tasks (like
+          checking out working copies and browsing the repository with
+          a web browser), but restricts all write operations to
+          authenticated users.  To do this type of selective
+          restriction, you can use the <literal>Limit</literal> and
+          <literal>LimitExcept</literal> configuration directives.
+          Like the <literal>Location</literal> directive, these blocks
+          have starting and ending tags, and you would nest them
+          inside your <literal><Location></literal>
+          block.</para>
         @ENGLISH }}} -->
         <para>Noen ganger trenger du ikke å <!-- ¤ -->ha en like streng 
           adgangskontroll.
-          Depotet til Subversions kildekodedepot på <systemitem 
-          class="url">http://svn.collab.net/repos/svn</systemitem> 
-          tillater alle i verden å utføre leseoperasjoner i depotet (som 
-          å hente ut arbeidskopier og bla gjennom depotet med en 
-          nettleser), men begrenser alle skriveoperasjoner til 
-          autentiserte brukere.
+          Depotet til Subversions kildekodedepot på <ulink 
+          url="http://svn.collab.net/repos/svn"/> tillater alle i verden 
+          å utføre leseoperasjoner i depotet (som å hente ut 
+          arbeidskopier og bla gjennom depotet med en nettleser), men 
+          begrenser alle skriveoperasjoner til autentiserte brukere.
           For å få til denne typen selektiv begrensning kan du bruke 
           konfigurasjonsdirektivene <literal>Limit</literal> og 
           <literal>LimitExcept</literal>.
@@ -3416,15 +3411,15 @@
           information about Apache access control and the
           <literal>Require</literal> directive, take a look at the
           <literal>Security</literal> section of the Apache
-          documentation's tutorials collection at <systemitem
-          class="url">http://httpd.apache.org/docs-2.0/misc/tutorials.html</systemitem>.</para>
+          documentation's tutorials collection at <ulink
+           url="http://httpd.apache.org/docs-2.0/misc/tutorials.html"/>.</para>
         @ENGLISH }}} -->
         <para>Dette er bare noen få enkle eksempler.
           For informasjon som går mer i dybden om Apaches 
           adgangskontroll og <literal>Require</literal>-direktivet, ta 
           en kikk på <literal>Security</literal>-seksjonen i 
-          dokmentasjonssamlingen for Apache på <systemitem 
-          class="url">http://httpd.apache.org/docs-2.0/misc/tutorials.html</systemitem>.</para>
+          dokmentasjonssamlingen for Apache på <ulink
+          url="http://httpd.apache.org/docs-2.0/misc/tutorials.html"/>.</para>
               
 
       </sect3>
@@ -4347,8 +4342,7 @@
             list</command> and <command>svn cat</command> commands.
             To browse old revisions with your web browser, however,
             you can use third-party software.  A good example of this
-            is ViewCVS (<systemitem
-            class="url">http://viewcvs.sourceforge.net/</systemitem>).
+            is ViewCVS (<ulink url="http://viewvc.tigris.org/"/>).
             ViewCVS was originally written to display CVS repositories
             through the web, and the latest bleeding-edge versions (at
             the time of writing) are able to understand Subversion
@@ -4360,8 +4354,8 @@
             <command>svn list</command> og <command>svn cat</command>.
             Men for å bla gjennom gamle revisjoner med nettleseren må du 
             bruke tredjeparts programvare.
-            Et godt eksempel på dette er ViewCVS (<systemitem 
-            class="url">http://viewcvs.sourceforge.net</systemitem>).
+            Et godt eksempel på dette er ViewCVS (<ulink 
+            url="http://viewvc.tigris.org/"/>).
             ViewCVS ble egentlig skrevet for å vise CVS-depoter på <!-- 
             ¤ Merkes fordi den er kontroversiell. -->web, og de aller 
             siste <!-- ¤ bleeding-edge --> versjonene (når dette 

Modified: trunk/src/nb/book/ch08.xml
==============================================================================
--- trunk/src/nb/book/ch08.xml	(original)
+++ trunk/src/nb/book/ch08.xml	Tue Jan  3 17:17:46 2006
@@ -58,11 +58,15 @@
           </row>
           <row>
             <entry>libsvn_delta</entry>
-            <entry>Tree and text differencing routines</entry>
+            <entry>Tree and byte-stream differencing routines</entry>
+          </row>
+          <row>
+            <entry>libsvn_diff</entry>
+            <entry>Contextual differencing and merging routines</entry>
           </row>
           <row>
             <entry>libsvn_fs</entry>
-            <entry>The Subversion filesystem library</entry>
+            <entry>Filesystem commons and module loader</entry>
           </row>
           <row>
             <entry>libsvn_fs_base</entry>
@@ -86,7 +90,7 @@
           </row>
           <row>
             <entry>libsvn_ra_svn</entry>
-            <entry>A custom protocol Repository Access module</entry>
+            <entry>The custom protocol Repository Access module</entry>
           </row>
           <row>
             <entry>libsvn_repos</entry>
@@ -131,7 +135,9 @@
       libsvn_ra_local, and libsvn_ra_svn all implement the same
       interface.  And all three communicate with the Repository
       Layer—libsvn_ra_dav and libsvn_ra_svn do so across a
-      network, and libsvn_ra_local connects to it directly.</para>
+      network, and libsvn_ra_local connects to it directly.  The
+      libsvn_fs_base and libsvn_fs_fs libraries are another example of
+      this.</para>
 
     <para>The client itself also highlights modularity in the
       Subversion design.  While Subversion currently comes with only a
@@ -346,7 +352,7 @@
         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
+        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>
 
@@ -433,7 +439,7 @@
       <para>In the previous code segment, calls were made to both the
         repository and filesystem interfaces.  We could just as easily
         have committed the transaction using
-        <function>svn_fs_commit_txn</function>.  But the filesystem
+        <function>svn_fs_commit_txn()</function>.  But the filesystem
         API knows nothing about the repository library's hook
         mechanism.  If you want your Subversion repository to
         automatically perform some set of non-Subversion tasks every
@@ -441,7 +447,7 @@
         email that describes all the changes made in that transaction
         to your developer mailing list), you need to use the
         libsvn_repos-wrapped version of that
-        function—<function>svn_repos_fs_commit_txn</function>.
+        function—<function>svn_repos_fs_commit_txn()</function>.
         This function will actually first run the
         <literal>pre-commit</literal> hook script if one exists, then
         commit the transaction, and finally will run a
@@ -518,22 +524,23 @@
      
       <screen>
 $ svn --version
-svn, version 1.0.1 (r9023)
-   compiled Mar 17 2004, 09:31:13
+svn, version 1.2.3 (r15833)
+   compiled Sep 13 2005, 22:45:22
 
-Copyright (C) 2000-2004 CollabNet.
+Copyright (C) 2000-2005 CollabNet.
 Subversion is open source software, see http://subversion.tigris.org/
 This product includes software developed by CollabNet (http://www.Collab.Net/).
 
 The following repository access (RA) modules are available:
 
 * ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
-  - handles 'http' schema
-  - handles 'https' schema
-* ra_local : Module for accessing a repository on local disk.
-  - handles 'file' schema
+  - handles 'http' scheme
+  - handles 'https' scheme
 * ra_svn : Module for accessing a repository using the svn network protocol.
-  - handles 'svn' schema
+  - handles 'svn' scheme
+* ra_local : Module for accessing a repository on local disk.
+  - handles 'file' scheme
+
 </screen>
     
       <sect3 id="svn.developer.layerlib.ra.dav">
@@ -559,9 +566,9 @@
           optimizations like network pipelining and caching.  By using
           Apache as a server, Subversion gets all of these features
           for free.  And since most firewalls already allow HTTP
-          traffic to pass through, sysadmins typically don't even have
-          to change their firewall configurations to allow Subversion
-          to work.</para>
+          traffic to pass through, system administrators typically
+          don't even have to change their firewall configurations to
+          allow Subversion to work.</para>
   
         <para>Subversion uses HTTP and WebDAV (with DeltaV) to
           communicate with an Apache server.  You can read more about
@@ -585,14 +592,14 @@
           receives these requests (exactly as it does generic HTTP
           requests that your web browser might make), notices that the
           requests are directed at a URL that is configured as a DAV
-          location (using the <sgmltag>Location</sgmltag> directive in
-          <filename>httpd.conf</filename>), and hands the request off
-          to its own mod_dav module.  When properly configured,
-          mod_dav knows to use Subversion's mod_dav_svn for any
-          filesystem-related needs, as opposed to the generic
-          mod_dav_fs that comes with Apache.  So ultimately, the
-          client is communicating with mod_dav_svn, which binds
-          directly to the Subversion Repository Layer.</para>
+          location (using the <literal><Location></literal>
+          directive in <filename>httpd.conf</filename>), and hands the
+          request off to its own mod_dav module.  When properly
+          configured, mod_dav knows to use Subversion's mod_dav_svn for
+          any filesystem-related needs, as opposed to the generic
+          mod_dav_fs that comes with Apache.  So ultimately, the client
+          is communicating with mod_dav_svn, which binds directly to the
+          Subversion Repository Layer.</para>
   
         <para>That was a simplified description of the actual
           exchanges taking place, though.  For example, the Subversion
@@ -652,15 +659,16 @@
 
         <para>This RA implementation lacks most of the advantages of
           Apache mentioned in the previous section; however, it may be
-          appealing to some sysadmins nonetheless.  It is dramatically
-          easier to configure and run; setting up an
+          appealing to some system administrators nonetheless.  It is
+          dramatically easier to configure and run; setting up an
           <filename>svnserve</filename> process is nearly
           instantaneous.  It is also much smaller (in terms of lines
           of code) than Apache, making it much easier to audit, for
-          security reasons or otherwise.  Furthermore, some sysadmins
-          may already have an SSH security infrastructure in place,
-          and want Subversion to use it.  Clients using ra_svn can
-          easily tunnel the protocol over SSH.</para>
+          security reasons or otherwise.  Furthermore, some system
+          administrators may already have an SSH security
+          infrastructure in place, and want Subversion to use it.
+          Clients using ra_svn can easily tunnel the protocol over
+          SSH.</para>
 
       </sect3>
 
@@ -748,7 +756,7 @@
         Repository Access Layer, and then to provide the highest-level
         API to any application that wishes to perform general revision
         control actions.  For example, the function
-        <function>svn_client_checkout</function> takes a URL as an
+        <function>svn_client_checkout()</function> takes a URL as an
         argument.  It passes this URL to the RA layer and opens an
         authenticated session with a particular repository.  It then
         asks the repository for a certain tree, and sends this tree
@@ -833,7 +841,7 @@
     <sect2 id="svn.developer.usingapi.apr">
       <title>The Apache Portable Runtime Library</title>
 
-      <para>Along with Subversion's own datatype, you will see many
+      <para>Along with Subversion's own datatypes, you will see many
         references to datatypes that begin with
         <literal>apr_</literal>—symbols from the Apache
         Portable Runtime (APR) library.  APR is Apache's portability
@@ -861,7 +869,7 @@
         uses these types extensively throughout the codebase.  But
         perhaps the most pervasive APR datatype, found in nearly every
         Subversion API prototype, is the
-        <literal>apr_pool_t</literal>—the APR memory pool.
+        <structname>apr_pool_t</structname>—the APR memory pool.
         Subversion uses pools internally for all its memory allocation
         needs (unless an external library requires a different memory
         management schema for data passed through its API),
@@ -909,8 +917,8 @@
         class="url">file:///home/username/My%20File.txt</systemitem>.
         Again, Subversion supplies helper functions that your
         application can
-        use—<function>svn_path_uri_encode</function> and
-        <function>svn_path_uri_decode</function>, for URI encoding and
+        use—<function>svn_path_uri_encode()</function> and
+        <function>svn_path_uri_decode()</function>, for URI encoding and
         decoding, respectively.</para>
     </sect2>
 
@@ -920,15 +928,14 @@
 
       <para>If you are interested in using the Subversion libraries in
         conjunction with something other than a C program—say a
-        Python script or Java application—Subversion has some
-        initial support for this via the Simplified Wrapper and
-        Interface Generator (SWIG).  The SWIG bindings for Subversion
-        are located in <filename>subversion/bindings/swig</filename>
-        and are slowly maturing into a usable state.  These bindings
-        allow you to call Subversion API functions indirectly, using
-        wrappers that translate the datatypes native to your
-        scripting language into the datatypes needed by Subversion's
-        C libraries.</para>
+        Python or Perl script—Subversion has some support for this
+        via the Simplified Wrapper and Interface Generator (SWIG).  The
+        SWIG bindings for Subversion are located in
+        <filename>subversion/bindings/swig</filename> and whilst still
+        maturing, they are in a usable state.  These bindings allow you
+        to call Subversion API functions indirectly, using wrappers that
+        translate the datatypes native to your scripting language into
+        the datatypes needed by Subversion's C libraries.</para>
 
       <para>There is an obvious benefit to accessing the Subversion
         APIs via a language binding—simplicity.  Generally
@@ -1148,16 +1155,15 @@
       <para>Subversion's language bindings unfortunately tend to lack
         the level of attention given to the core Subversion modules.
         However, there have been significant efforts towards creating
-        functional bindings for Python, Perl, and Java.  Once you have
-        the SWIG interface files properly configured, generation of
-        the specific wrappers for all the supported SWIG languages
-        (which currently includes versions of C#, Guile, Java,
-        MzScheme, OCaml, Perl, PHP, Python, Ruby, and Tcl) should
-        theoretically be trivial.  Still, some extra programming is
-        required to compensate for complex APIs that SWIG needs some
-        help generalizing.  For more information on SWIG itself, see
-        the project's website at <systemitem
-        class="url">http://www.swig.org/</systemitem>.</para>
+        functional bindings for Python, Perl, and Ruby.  To some extent,
+        the work done preparing the SWIG interface files for the these
+        languages is reusable in efforts to generate bindings for other
+        languages supported by SWIG (which includes versions of C#,
+        Guile, Java, MzScheme, OCaml, PHP, Tcl, and others).
+        However, some extra programming is required to compensate for
+        complex APIs that SWIG needs some help interfacing with.  For
+        more information on SWIG itself, see the project's website at
+        <ulink url="http://www.swig.org/"/>.</para>
 
     </sect2>
   </sect1>
@@ -1243,30 +1249,34 @@
 <entry
    committed-rev="1"
    name=""
-   committed-date="2002-09-24T17:12:44.064475Z"
-   url="http://svn.red-bean.com/tests/.greek-repo/A/D"
+   committed-date="2005-04-04T13:32:28.526873Z"
+   url="http://svn.red-bean.com/repos/greek-tree/A/D"
+   last-author="jrandom"
    kind="dir"
+   uuid="4e820d15-a807-0410-81d5-aa59edf69161"
    revision="1"/>
 <entry
+   name="lambda"
+   copied="true"
+   kind="file"
+   copyfrom-rev="1"
+   schedule="add"
+   copyfrom-url="http://svn.red-bean.com/repos/greek-tree/A/B/lambda"/>
+<entry
    committed-rev="1"
    name="gamma"
-   text-time="2002-09-26T21:09:02.000000Z"
-   committed-date="2002-09-24T17:12:44.064475Z"
-   checksum="QSE4vWd9ZM0cMvr7/+YkXQ=="
+   text-time="2005-12-11T16:32:46.000000Z"
+   committed-date="2005-04-04T13:32:28.526873Z"
+   checksum="ada10d942b1964d359e048dbacff3460"
+   last-author="jrandom"
    kind="file"
-   prop-time="2002-09-26T21:09:02.000000Z"/>
+   prop-time="2005-12-11T16:32:45.000000Z"/>
 <entry
    name="zeta"
    kind="file"
    schedule="add"
    revision="0"/>
 <entry
-   url="http://svn.red-bean.com/tests/.greek-repo/A/B/delta"
-   name="delta"
-   kind="file"
-   schedule="add"
-   revision="0"/>
-<entry
    name="G"
    kind="dir"/>
 <entry
@@ -1378,8 +1388,7 @@
       both readable and writable objects—over the web.  RFCs
       2518 and 3253 describe the WebDAV/DeltaV extensions to HTTP, and
       are available (along with a lot of other useful information) at
-      <systemitem
-      class="url">http://www.webdav.org/</systemitem>.</para>
+      <ulink url="http://www.webdav.org/"/>.</para>
 
     <para>A number of operating system file browsers are already able
       to mount networked directories using WebDAV.  On Win32, the
@@ -1594,14 +1603,13 @@
     <title>Contributing to Subversion</title>
     
     <para>The official source of information about the Subversion
-      project is, of course, the project's website at <systemitem
-      class="url">http://subversion.tigris.org/</systemitem>.  There
-      you can find information about getting access to the source code
-      and participating on the discussion lists.  The Subversion
-      community always welcomes new members.  If you are
-      interested in participating in this community by contributing
-      changes to the source code, here are some hints on how to get
-      started.</para>
+      project is, of course, the project's website at
+      <ulink url="http://subversion.tigris.org/"/>.  There you can
+      find information about getting access to the source code and
+      participating on the discussion lists.  The Subversion community
+      always welcomes new members.  If you are interested in
+      participating in this community by contributing changes to the
+      source code, here are some hints on how to get started.</para>
 
     <!-- =============================================================== -->
     <sect2 id="svn.developer.contrib.join">
@@ -1657,8 +1665,8 @@
 
       <para>After you have a working Subversion client, you are now
         poised to checkout a working copy of the Subversion source
-        repository from <systemitem
-        class="url">http://svn.collab.net/repos/svn/trunk/</systemitem>:
+        repository from <ulink
+         url="http://svn.collab.net/repos/svn/trunk/"/>:
         <footnote>
           <para>Note that the URL checked out in the example above
             ends not with <literal>svn</literal>, but with a
@@ -1669,11 +1677,11 @@
 
       <screen>
 $ svn checkout http://svn.collab.net/repos/svn/trunk subversion
-A  subversion/HACKING
-A  subversion/INSTALL
-A  subversion/README
-A  subversion/autogen.sh
-A  subversion/build.conf
+A    subversion/HACKING
+A    subversion/INSTALL
+A    subversion/README
+A    subversion/autogen.sh
+A    subversion/build.conf
 …
 </screen>
 
@@ -1696,15 +1704,18 @@
       
       <para>Now that you have a working copy containing the latest
         Subversion source code, you will most certainly want to take a
-        cruise through the <filename>HACKING</filename> file in that
-        working copy's top-level directory.  The
-        <filename>HACKING</filename> file contains general
-        instructions for contributing to Subversion, including how to
-        properly format your source code for consistency with the rest
-        of the codebase, how to describe your proposed changes with an
-        effective change log message, how to test your changes, and so
-        on.  Commit privileges on the Subversion source repository are
-        earned—a government by meritocracy.
+        cruise through the <quote>Hacker's Guide to Subversion</quote>,
+        which is available either as the
+        <filename>www/hacking.html</filename> file in the working copy,
+        or on the Subversion website at <ulink
+          url="http://subversion.tigris.org/hacking.html"/>.  This guide
+        contains general instructions for contributing to Subversion,
+        including how to properly format your source code for
+        consistency with the rest of the codebase, how to describe your
+        proposed changes with an effective change log message, how to
+        test your changes, and so on.  Commit privileges on the
+        Subversion source repository are earned—a government by
+        meritocracy.
         <footnote>
           <para>While this may superficially appear as some sort of
             elitism, this <quote>earn your commit privileges</quote>
@@ -1714,10 +1725,10 @@
             potential costs of undoing changes that are
             dangerous.</para>
         </footnote>
-        The <filename>HACKING</filename> file is an invaluable
-        resource when it comes to making sure that your proposed
-        changes earn the praises they deserve without being rejected
-        on technicalities.</para>
+        The <quote>Hacker's Guide</quote> is an invaluable resource when
+        it comes to making sure that your proposed changes earn the
+        praises they deserve without being rejected on
+        technicalities.</para>
 
     </sect2>
 




More information about the svnbook-dev mailing list