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

sunny256 svnbook-dev at red-bean.com
Thu Aug 4 23:33:50 CDT 2005


Author: sunny256
Date: Thu Aug  4 23:33:49 2005
New Revision: 1588

Modified:
   trunk/src/nb/LAST_UPDATED
   trunk/src/nb/book/ch00.xml
   trunk/src/nb/book/ch03.xml
   trunk/src/nb/book/ch07.xml
Log:
Sync the Norwegian and English book, r1569:1587.

* src/nb/LAST_UPDATED
  Updated by make sync.

* src/nb/book/ch00.xml
  Updated r1587.

* src/nb/book/ch03.xml
  Updated r1578.

* src/nb/book/ch07.xml
  Updated r1571.


Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED	(original)
+++ trunk/src/nb/LAST_UPDATED	Thu Aug  4 23:33:49 2005
@@ -1 +1 @@
-1569
+1587

Modified: trunk/src/nb/book/ch00.xml
==============================================================================
--- trunk/src/nb/book/ch00.xml	(original)
+++ trunk/src/nb/book/ch00.xml	Thu Aug  4 23:33:49 2005
@@ -66,7 +66,7 @@
       meget kraftig, brukbart og veldig fleksibelt.</para>
 
     <!-- @ENGLISH {{{
-    <para>This book is written to document the 1.1 series of the
+    <para>This book is written to document the 1.2 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.1-serien av 
+    <para>Denne boken er skrevet for å dokumentere 1.2-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 Aug  4 23:33:49 2005
@@ -3502,6 +3502,19 @@
 ------------------------------------------------------------------------
 </screen>
 
+      <!-- @ENGLISH {{{
+      <para>
+        <command>svn log</command> also takes a <option>-ﳢ-quiet</option>
+        (<option>-q</option>) switch, which suppresses the body of the
+        log message. When combined with <option>-ﳢ-verbose</option>, it
+        gives just the names of the changed files.</para>
+      @ENGLISH }}} -->
+      <para><command>svn log</command> tar også et 
+        <option>--quiet</option>-parameter (<option>-q</option>) som lar 
+        være å skrive ut kroppen på loggmeldinga.
+        Når det kombineres med <option>--verbose</option> lister det kun 
+        navnet på filene som har forandret seg.</para>
+
       <sidebar>
         <!-- @ENGLISH {{{
         <title>Why Does <command>svn log</command> Give Me an Empty

Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml	(original)
+++ trunk/src/nb/book/ch07.xml	Thu Aug  4 23:33:49 2005
@@ -2051,12 +2051,15 @@
         objects in the working copy, it can also be used to examine
         objects in the repository.  If the main argument to
         <command>svn info</command> is a working copy path, then all
-        of the working copy's cached information is displayed;  any
+        of the working copy's cached information is displayed; any
         mention of a lock means that the working copy is holding a
-        lock token.  If the main argument to <command>svn
-        info</command> is a URL, then the information reflects the
-        latest version of an object in the repository;  any mention of
-        a lock describes the current lock on the object.</para>
+        lock token (if a file is locked by another user or in another
+        working copy, <command>svn info</command> on a working copy
+        path will show no lock information at all).  If the main
+        argument to <command>svn info</command> is a URL, then the
+        information reflects the latest version of an object in the
+        repository; any mention of a lock describes the current lock
+        on the object.</para>
 
       <para>So in this particular example, Sally can see that Harry
         locked the file on Feburary 16th to <quote>make a quick



More information about the svnbook-dev mailing list