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

sunny256 noreply at red-bean.com
Thu Jul 20 16:06:07 CDT 2006


Author: sunny256
Date: Thu Jul 20 16:06:06 2006
New Revision: 2332

Modified:
   trunk/src/nb/LAST_UPDATED
   trunk/src/nb/book/book.xml
   trunk/src/nb/book/ch00.xml
   trunk/src/nb/book/ch03.xml
   trunk/src/nb/book/ch07.xml
   trunk/src/nb/book/ch09.xml

Log:
Sync the Norwegian and English book at r2331.

* src/nb/LAST_UPDATED
  Updated by make sync.

* src/nb/book/book.xml
* src/nb/book/ch00.xml
* src/nb/book/ch03.xml
* src/nb/book/ch07.xml
* src/nb/book/ch09.xml
  Merged and updated r2142, r2147, r2155, r2160, r2215, r2269, r2271, 
  r2272, r2274.


Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED	(original)
+++ trunk/src/nb/LAST_UPDATED	Thu Jul 20 16:06:06 2006
@@ -1 +1 @@
-2139
+2331

Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml	(original)
+++ trunk/src/nb/book/book.xml	Thu Jul 20 16:06:06 2006
@@ -71,7 +71,7 @@
 
   <!-- Using revnumber would be more appropriate, but our stylesheets -->
   <!-- don't seem to render it. -->
-  <subtitle>For Subversion 1.2</subtitle>
+  <subtitle>For Subversion 1.3</subtitle>
   <!-- @ENGLISH {{{
   <subtitle>(book compiled from &svn.version;)</subtitle>
   @ENGLISH }}} -->

Modified: trunk/src/nb/book/ch00.xml
==============================================================================
--- trunk/src/nb/book/ch00.xml	(original)
+++ trunk/src/nb/book/ch00.xml	Thu Jul 20 16:06:06 2006
@@ -66,7 +66,7 @@
       meget kraftig, brukbart og veldig fleksibelt.</para>
 
     <!-- @ENGLISH {{{
-    <para>This book is written to document the 1.2 series of the
+    <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
@@ -75,7 +75,7 @@
       notes in this book.
     </para>
     @ENGLISH }}} -->
-    <para>Denne boken er skrevet for å dokumentere 1.2-serien av 
+    <para>Denne boken er skrevet for å dokumentere 1.3-serien av 
       versjonskontrollsystemet Subversion.
       Vi har gjort hva vi kan for å være grundig i dekningen av 
       systemet.

Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml	(original)
+++ trunk/src/nb/book/ch03.xml	Thu Jul 20 16:06:06 2006
@@ -4123,7 +4123,7 @@
         Subversion writes its intentions to a log file.  Next it
         executes the commands in the log file to apply the requested
         change, holding a lock on the relevant part of the working
-        copy while it works — to prevent othe Subversion clients
+        copy while it works — to prevent other Subversion clients
         from accessing the working copy in mid-change.  Finally,
         Subversion removes the log file.  Architecturally, this is
         similar to a journaled filesystem.  If a Subversion operation

Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml	(original)
+++ trunk/src/nb/book/ch07.xml	Thu Jul 20 16:06:06 2006
@@ -4591,8 +4591,8 @@
         in an asynchronous fashion (or <quote>backgrounded</quote>),
         you might have several instances of it all running
         simultaneously.  Finally, Subversion expects that your program
-        return an errorcode of 0 if your program detected differences,
-        or 1 if it did not—any other errorcode is considered a
+        return an errorcode of 1 if your program detected differences,
+        or 0 if it did not—any other errorcode is considered a
         fatal error.
         <footnote>
           <para>The GNU diff manual page puts it this way: <quote>An

Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml	(original)
+++ trunk/src/nb/book/ch09.xml	Thu Jul 20 16:06:06 2006
@@ -508,7 +508,9 @@
               not only includes the version number of the client,
               but also a listing of all repository access modules
               that the client can use to access a Subversion
-              repository.</para>
+              repository.  With <option>--quiet</option>
+              (<option>-q</option>) it prints only the version number
+              in a compact form.</para>
           </listitem>
         </varlistentry>
         
@@ -1745,6 +1747,9 @@
         <refsect1>
           <title>Alternate Names</title>
           <para>?, h</para>
+          <para>The options <option>-?</option>, <option>-h</option>
+            and <option>--help</option> have the same effect as using the
+            <command>help</command> subcommand.</para>
         </refsect1>
 
         <refsect1>
@@ -1763,6 +1768,7 @@
           <screen>
 --version
 --quiet (-q)
+--config-dir DIR
 </screen>
         </refsect1>
       </refentry>
@@ -1875,26 +1881,41 @@
         <refsect1>
           <title>Description</title>
 
-          <para>Print information about both working copy paths and
-            URLs, including:</para>
+          <para>Print information about the working copy paths or
+           URLs specified.  The information shown for both may
+           include:</para>
 
           <itemizedlist>
             <listitem><para>Path</para></listitem>
             <listitem><para>Name</para></listitem>
             <listitem><para>URL</para></listitem>
-            <listitem><para>Revision</para></listitem>
             <listitem><para>Repository Root</para></listitem>
             <listitem><para>Repository UUID</para></listitem>
+            <listitem><para>Revision</para></listitem>
             <listitem><para>Node Kind</para></listitem>
             <listitem><para>Last Changed Author</para></listitem>
             <listitem><para>Last Changed Revision</para></listitem>
             <listitem><para>Last Changed Date</para></listitem>
+            <listitem><para>Lock Token</para></listitem>
+            <listitem><para>Lock Owner</para></listitem>
+            <listitem><para>Lock Created (date)</para></listitem>
+            <listitem><para>Lock Expires (date)</para></listitem>
+          </itemizedlist>
+
+          <para>Additional kinds of information available only for
+            working copy paths are:</para>
+
+          <itemizedlist>
+            <listitem><para>Schedule</para></listitem>
+            <listitem><para>Copied From URL</para></listitem>
+            <listitem><para>Copied From Rev</para></listitem>
             <listitem><para>Text Last Updated</para></listitem>
             <listitem><para>Properties Last Updated</para></listitem>
             <listitem><para>Checksum</para></listitem>
-            <listitem><para>Lock Token</para></listitem>
-            <listitem><para>Lock Owner</para></listitem>
-            <listitem><para>Lock Creation Date</para></listitem>
+            <listitem><para>Conflict Previous Base File</para></listitem>
+            <listitem><para>Conflict Previous Working File</para></listitem>
+            <listitem><para>Conflict Current Base File</para></listitem>
+            <listitem><para>Conflict Properties File</para></listitem>
           </itemizedlist>
         </refsect1>
 
@@ -1917,9 +1938,15 @@
           <title>Switches</title>
 
           <screen>
---targets FILENAME
---recursive (-R)
 --revision (-r)
+--recursive (-R)
+--targets FILENAME
+--incremental
+--xml
+--username ARG
+--password ARG
+--no-auth-cache
+--non-interactive
 --config-dir DIR
 </screen>
         </refsect1>
@@ -1946,7 +1973,7 @@
 Last Changed Date: 2003-01-13 16:43:13 -0600 (Mon, 13 Jan 2003)
 Text Last Updated: 2003-01-16 21:18:16 -0600 (Thu, 16 Jan 2003)
 Properties Last Updated: 2003-01-13 21:50:19 -0600 (Mon, 13 Jan 2003)
-Checksum: /3L38YwzhT93BWvgpdF6Zw==
+Checksum: d6aeb60b0662ccceb6bce4bac344cb66
 </screen>
 
           <para>It will also show information for directories:</para>
@@ -1963,6 +1990,7 @@
 Last Changed Author: harry
 Last Changed Rev: 19
 Last Changed Date: 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003)
+Properties Last Updated: 2003-01-16 23:39:02 -0600 (Thu, 16 Jan 2003)
 </screen>
 
            <para><command>svn info</command> also acts on URLs (also
@@ -1982,11 +2010,11 @@
 Last Changed Author: sally
 Last Changed Rev: 42
 Last Changed Date: 2003-01-14 23:21:19 -0600 (Tue, 14 Jan 2003)
-Text Last Updated: 2003-01-14 23:21:19 -0600 (Tue, 14 Jan 2003)
-Checksum: d41d8cd98f00b204e9800998ecf8427e
 Lock Token: opaquelocktoken:14011d4b-54fb-0310-8541-dbd16bd471b2
 Lock Owner: harry
 Lock Created: 2003-01-15 17:35:12 -0600 (Wed, 15 Jan 2003)
+Lock Comment (1 line):
+My test lock comment
 </screen>
 
 
@@ -6252,8 +6280,7 @@
   <!-- ================================================================= -->
   <sect1 id="svn.ref.properties">
 
-    <title><command>Subversion properties</command></title>
-
+    <title>Subversion properties</title>
 
     <refentry id="svn.ref.svnprops">
       <refnamediv>




More information about the svnbook-dev mailing list