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

sunny256 noreply at red-bean.com
Mon Jul 24 16:25:49 CDT 2006


Author: sunny256
Date: Mon Jul 24 16:25:48 2006
New Revision: 2349

Modified:
   trunk/src/nb/LAST_UPDATED
   trunk/src/nb/book/ch02.xml
   trunk/src/nb/book/ch04.xml
   trunk/src/nb/book/ch06.xml
   trunk/src/nb/book/ch07.xml
   trunk/src/nb/book/ch09.xml

Log:
Sync the Norwegian book against the English version, r2331:2348.

* src/nb/LAST_UPDATED: Updated by make sync.

* src/nb/book/ch02.xml
* src/nb/book/ch04.xml
* src/nb/book/ch06.xml
* src/nb/book/ch07.xml
* src/nb/book/ch09.xml
  Merged and updated r2347, r2348.


Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED	(original)
+++ trunk/src/nb/LAST_UPDATED	Mon Jul 24 16:25:48 2006
@@ -1 +1 @@
-2331
+2348

Modified: trunk/src/nb/book/ch02.xml
==============================================================================
--- trunk/src/nb/book/ch02.xml	(original)
+++ trunk/src/nb/book/ch02.xml	Mon Jul 24 16:25:48 2006
@@ -1560,20 +1560,21 @@
           <para>If your project is sufficiently complex, you'll
             discover that it's sometimes nice to forcibly
             <quote>backdate</quote> portions of your working copy to
-            an earlier revision; you'll learn how to do that in
-            Chapter 3.  Perhaps you'd like to test an earlier version
-            of a sub-module contained in a subdirectory, or perhaps
-            you'd like to figure out when a bug first came into
-            existence in a specific file.  This is the <quote>time
-            machine</quote> aspect of a version control system —
-            the feature which allows you to move any portion of your
-            working copy forward and backward in history.</para>
+            an earlier revision; you'll learn how to do that in <xref
+            linkend="svn.tour"/>.  Perhaps you'd like to test an
+            earlier version of a sub-module contained in a
+            subdirectory, or perhaps you'd like to figure out when a
+            bug first came into existence in a specific file.  This is
+            the <quote>time machine</quote> aspect of a version
+            control system — the feature which allows you to
+            move any portion of your working copy forward and backward
+            in history.</para>
           @ENGLISH }}} -->
           <para>Forutsatt at prosjektet ditt er komplekst nok, vil du 
             oppdage at det noen ganger er fint å kunne 
             <quote>tilbakedatere</quote> deler av arbeidskopien til en 
             tidligere revisjon; du vil lære hvordan du gjør dette i 
-            kapittel 3.
+            <xref linkend="svn.tour"/>.
             Kanskje vil du prøve en tidligere versjon av en delmodul som 
             ligger i en underkatalog lagret i en underkatalog, eller 
             kanskje du vil finne ut når en feil først oppsto i en 
@@ -1619,17 +1620,18 @@
           <para>Second, you cannot commit a metadata change to a
             directory unless it's fully up-to-date.  You'll learn
             about attaching
-            <quote>properties</quote> to items in Chapter 6.  A
-            directory's working revision defines a specific set of
-            entries and properties, and thus committing a property
-            change to an out-of-date directory may destroy properties
-            you've not yet seen.</para>
+            <quote>properties</quote> to items in <xref
+            linkend="svn.serverconfig"/>.  A directory's working
+            revision defines a specific set of entries and properties,
+            and thus committing a property change to an out-of-date
+            directory may destroy properties you've not yet
+            seen.</para>
           @ENGLISH }}} -->
           <para>For det andre kan du ikke legge inn en 
             metadata-forandring til en katalog hvis den ikke er 
             fullstendig oppdatert.
             Du vil få lære om å legge til <quote>egenskaper</quote> til 
-            elementer i kapittel 6.
+            elementer i <xref linkend="svn.serverconfig"/>.
             En katalogs arbeidsrevisjon definerer et spesifikt sett med 
             poster og egenskaper, og en innlegging av forandringer i en 
             egenskap for en utdatert katalog kan ødelegge egenskaper som 

Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml	(original)
+++ trunk/src/nb/book/ch04.xml	Mon Jul 24 16:25:48 2006
@@ -159,16 +159,17 @@
 
     <!-- @ENGLISH {{{
     <para>For this chapter, we'll go back to the same example from
-      Chapter 2.  Remember that you and your collaborator, Sally, are
-      sharing a repository that contains two projects,
-      <filename>paint</filename> and <filename>calc</filename>.
-      Notice that in <xref linkend="svn.branchmerge.using.dia-1"/>, however, each
-      project directory now contains subdirectories named
+      <xref linkend="svn.basic"/>.  Remember that you and your
+      collaborator, Sally, are sharing a repository that contains two
+      projects, <filename>paint</filename> and
+      <filename>calc</filename>.  Notice that in <xref
+      linkend="svn.branchmerge.using.dia-1"/>, however, each project
+      directory now contains subdirectories named
       <filename>trunk</filename> and <filename>branches</filename>.
       The reason for this will soon become clear.</para>
     @ENGLISH }}} -->
     <para>I dette kapittelet skal vi gå tilbake til det samme eksempelet 
-      fra kapittel 2.
+      fra <xref linkend="svn.basic"/>.
       Du husker at du og din kollega Sally deler et depot som inneholder 
       to prosjekter – <filename>paint</filename> og 
       <filename>calc</filename>.
@@ -1038,16 +1039,17 @@
       <para>It's time to use the <command>svn merge</command> command.
         This command, it turns out, is a very close cousin to the
         <command>svn diff</command> command (which you read about in
-        Chapter 3).  Both commands are able to compare any two objects
-        in the repository and describe the differences.  For example,
-        you can ask <command>svn diff</command> to show you the exact
-        change made by Sally in revision 344:</para>
+        <xref linkend="svn.tour"/>).  Both commands are able to
+        compare any two objects in the repository and describe the
+        differences.  For example, you can ask <command>svn
+        diff</command> to show you the exact change made by Sally in
+        revision 344:</para>
       @ENGLISH }}} -->
       <para>Det er på tide å bruke kommandoen <command>svn 
         merge</command>.
         Det skal vise seg at denne kommandoen er en veldig nær slektning 
         av <command>svn diff</command>-kommandoen (som du leste om i 
-        kapittel 3).
+        <xref linkend="svn.tour"/>).
         Begge kommandoene er i stand til å sammenligne to vilkårlige 
         objekter i depotet og beskrive forskjellene.
         For eksempel kan du spørre <command>svn diff</command> om å vise 
@@ -1188,17 +1190,19 @@
       <para>In another scenario, it's possible that things may not have
         gone so well, and that <filename>integer.c</filename> may have
         entered a conflicted state.  You might need to resolve the
-        conflict using standard procedures (see Chapter 3), or if you
-        decide that the merge was a bad idea altogether, simply give up
-        and <command>svn revert</command> the local change.</para>
+        conflict using standard procedures (see <xref
+        linkend="svn.tour"/>), or if you decide that the merge was a
+        bad idea altogether, simply give up and <command>svn
+        revert</command> the local change.</para>
       @ENGLISH }}} -->
       <para>I et annet scenario er det mulig at ting ikke gikk så bra og 
         at <filename>integer.c</filename> gikk inn i en 
         konflikttilstand.
         Du må kanskje løse konflikten ved hjelp av standard prosedyrer 
-        (se kapittel 3), eller hvis du finner ut at flettingen egentlig 
-        var en dårlig idé, kan du rett og slett gi opp og kjøre 
-        <command>svn revert</command> på den lokale forandringen.</para>
+        (se <xref linkend="svn.tour"/>), eller hvis du finner ut at 
+        flettingen egentlig var en dårlig idé, kan du rett og slett gi 
+        opp og kjøre <command>svn revert</command> på den lokale 
+        forandringen.</para>
 
       <!-- @ENGLISH {{{
       <para>But assuming that you've reviewed the merged change, you can
@@ -1351,19 +1355,19 @@
       <para>A word of warning: while <command>svn diff</command> and
         <command>svn merge</command> are very similar in concept, they
         do have different syntax in many cases.  Be sure to read about
-        them in Chapter 9 for details, or ask <command>svn
-        help</command>.  For example, <command>svn merge</command>
-        requires a working-copy path as a target, i.e. a place where
-        it should apply the tree-changes.  If the target isn't
-        specified, it assumes you are trying to perform one of the
-        following common operations:</para>
+        them in <xref linkend="svn.ref"/> for details, or ask
+        <command>svn help</command>.  For example, <command>svn
+        merge</command> requires a working-copy path as a target, i.e.
+        a place where it should apply the tree-changes.  If the target
+        isn't specified, it assumes you are trying to perform one of
+        the following common operations:</para>
       @ENGLISH }}} -->
       <para>En liten advarsel:
         Selv om <command>svn diff</command> og <command>svn 
         merge</command> er veldig like i konsept, har de i mange 
         tilfeller forskjellig syntaks.
-        Vær sikker på at du får lest om dem i kapittel 9 for detaljer, 
-        eller spør <command>svn help</command>.
+        Vær sikker på at du får lest om dem i <xref linkend="svn.ref"/> 
+        for detaljer, eller spør <command>svn help</command>.
         For eksempel krever <command>svn merge</command> en arbeidskopi 
         som et mål, det vil si en plass hvor den skal legge inn 
         treforandringene.
@@ -3984,18 +3988,18 @@
         work here.  In this case, you want to make a snapshot of your
         exact working copy arrangement and store it in the repository.
         Luckily, <command>svn copy</command> actually has four
-        different uses (which you can read about in Chapter 9),
-        including the ability to copy a working-copy tree to the
-        repository:</para>
+        different uses (which you can read about in <xref
+        linkend="svn.ref"/>), including the ability to copy a
+        working-copy tree to the repository:</para>
       @ENGLISH }}} -->
       <para>På tide å lagre et øyeblikksbilde.
         Det å kopiere en URL til en annen vil ikke fungere her.
         I dette tilfellet ønsker du å lage et øyeblikksbilde av din 
         eksakte arbeidskopi og lagre den i depotet.
         Heldigvis har <command>svn copy</command> faktisk fire 
-        forskjellige bruksmåter (som du kan lese om i kapittel 9), 
-        inkludert muligheten til å kopiere et tre av en arbeidskopi til 
-        depotet:</para>
+        forskjellige bruksmåter (som du kan lese om i <xref 
+        linkend="svn.ref"/>), inkludert muligheten til å kopiere et tre 
+        av en arbeidskopi til depotet:</para>
 
       <!-- @ENGLISH {{{
       <screen>

Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml	(original)
+++ trunk/src/nb/book/ch06.xml	Mon Jul 24 16:25:48 2006
@@ -74,11 +74,12 @@
     <!-- @ENGLISH {{{
     <para>Apache is an extremely popular webserver; using the
       <command>mod_dav_svn</command> module, Apache can access a
-      repository and make it available to clients via the WebDAV/DeltaV
-      protocol, which is an extension of HTTP.  In the other corner is
-      <command>svnserve</command>: a small, standalone server
-      program that speaks a custom protocol with clients.  Table 6-1
-      presents a comparison of the two servers.</para>
+      repository and make it available to clients via the
+      WebDAV/DeltaV protocol, which is an extension of HTTP.  In the
+      other corner is <command>svnserve</command>: a small, standalone
+      server program that speaks a custom protocol with clients.
+      <xref linkend="svn.serverconfig.overview.tbl-1"/> presents a
+      comparison of the two servers.</para>
     @ENGLISH }}} -->
     <para>Apache er en ekstremt populær web&server;. Ved å bruke 
       <command>mod_dav_svn</command>-modulen kan Apache aksessere et 
@@ -87,8 +88,8 @@
       I det andre hjørnet er <command>svnserve</command>:
       Et lite, enkeltstående &server;program som kommuniserer med 
       klientene ved hjelp av en egendefinert protokoll.
-      Tabell 6-1 viser en sammenligning av de to 
-      &server;modellene.</para>
+      <xref linkend="svn.serverconfig.overview.tbl-1"/> viser en 
+      sammenligning av de to &server;modellene.</para>
 
     <!-- @ENGLISH {{{
     <para>Note that Subversion, as an open-source project, does not
@@ -1839,11 +1840,11 @@
 
         <!-- @ENGLISH {{{
         <screen>
-  ssh-dsa AAAABtce9euch.... user at example.com
+  ssh-dsa AAAABtce9euch… user at example.com
 </screen>
         @ENGLISH }}} -->
         <screen>
-  ssh-dsa AAAABtce9euch.... bruker at example.com
+  ssh-dsa AAAABtce9euch… bruker at example.com
 </screen>
           
         <!-- @ENGLISH {{{
@@ -1861,11 +1862,11 @@
 
         <!-- @ENGLISH {{{
         <screen>
-  command="program" ssh-dsa AAAABtce9euch.... user at example.com
+  command="program" ssh-dsa AAAABtce9euch… user at example.com
 </screen>
         @ENGLISH }}} -->
         <screen>
-  command="program" ssh-dsa AAAABtce9euch.... bruker at example.com
+  command="program" ssh-dsa AAAABtce9euch… bruker at example.com
 </screen>
 
         <!-- @ENGLISH {{{
@@ -2633,7 +2634,7 @@
 </screen>
 
       <!-- @ENGLISH {{{
-      <para>...then your repository is <quote>anonymously</quote>
+      <para>…then your repository is <quote>anonymously</quote>
         accessible to the world.  Until you configure some
         authentication and authorization policies, the Subversion
         repositories you make available via the
@@ -4017,7 +4018,7 @@
 </screen>
 
         <!-- @ENGLISH {{{
-        <para>...and that's pretty much all there is to it.</para>
+        <para>…and that's pretty much all there is to it.</para>
         @ENGLISH }}} -->
         <para>…og det er omtrent det som er å si om den saken.</para>
 

Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml	(original)
+++ trunk/src/nb/book/ch07.xml	Mon Jul 24 16:25:48 2006
@@ -3722,7 +3722,7 @@
 $ svn <replaceable>command</replaceable> -r <replaceable>OPERATIVE-REV</replaceable> item@<replaceable>PEG-REV</replaceable>
 </screen>
       
-      <para>...it performs the following algorithm:</para>
+      <para>…it performs the following algorithm:</para>
 
       <itemizedlist>
         

Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml	(original)
+++ trunk/src/nb/book/ch09.xml	Mon Jul 24 16:25:48 2006
@@ -2375,10 +2375,10 @@
           <screen>
 $ svn log -r 14:15
 ------------------------------------------------------------------------
-r14 | ... 
+r14 | …
 
 ------------------------------------------------------------------------
-r15 | ... 
+r15 | …
 
 ------------------------------------------------------------------------
 </screen>
@@ -2393,15 +2393,15 @@
 $ svn log -r 27 >> mylog
 $ cat mylog
 ------------------------------------------------------------------------
-r14 | ... 
+r14 | …
 
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
-r19 | ... 
+r19 | …
 
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
-r27 | ... 
+r27 | …
 
 ------------------------------------------------------------------------
 </screen>
@@ -2416,13 +2416,13 @@
 $ svn log --incremental -r 27 >> mylog
 $ cat mylog
 ------------------------------------------------------------------------
-r14 | ... 
+r14 | …
 
 ------------------------------------------------------------------------
-r19 | ... 
+r19 | …
 
 ------------------------------------------------------------------------
-r27 | ... 
+r27 | …
 </screen>
 
           <para>The <option>--incremental</option> switch provides
@@ -4802,7 +4802,7 @@
 $ svnadmin recover /usr/local/svn/repos --wait
 Waiting on repository lock; perhaps another process has it open?
 
-### time goes by...
+### time goes by…
 
 Repository lock acquired.
 Please wait; recovering the repository may take some time...




More information about the svnbook-dev mailing list