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

sunny256 svnbook-dev at red-bean.com
Fri Apr 15 14:09:44 CDT 2005


Author: sunny256
Date: Fri Apr 15 14:09:42 2005
New Revision: 1212

Modified:
   trunk/src/nb/LAST_UPDATED
   trunk/src/nb/Makefile
   trunk/src/nb/TODO
   trunk/src/nb/book/appc.xml
   trunk/src/nb/book/appd.xml
   trunk/src/nb/book/ch03.xml
   trunk/src/nb/book/ch04.xml
   trunk/src/nb/book/ch06.xml
   trunk/src/nb/book/ch07.xml
   trunk/src/nb/book/images/info.png
   trunk/src/nb/book/images/note.png
   trunk/src/nb/book/images/warning.png
   trunk/src/nb/book/styles.css
Log:
Merge and update changes between r1160:1211 from the English book into 
the Norwegian version.

* src/nb/TODO
  Merged r1208.

* src/nb/LAST_UPDATED
  Updated by make sync.

* src/nb/book/appc.xml
  Merged r1189.

* src/nb/book/appd.xml
  Merged r1208.

* src/nb/book/ch03.xml
  Merged and updated r1202.

* src/nb/book/ch04.xml
  Merged r1163.

* src/nb/book/ch06.xml
  Merged r1186, r1202.

* src/nb/book/ch07.xml
  Merged r1203, r1206.

* src/nb/book/images/info.png
* src/nb/book/images/note.png
* src/nb/book/images/warning.png
* src/nb/book/styles.css
  Merged r1211.

* src/nb/Makefile
  Merged r1205, r1209.


Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED	(original)
+++ trunk/src/nb/LAST_UPDATED	Fri Apr 15 14:09:42 2005
@@ -1 +1 @@
-1160
+1211

Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile	(original)
+++ trunk/src/nb/Makefile	Fri Apr 15 14:09:42 2005
@@ -1,4 +1,3 @@
-ENSURE_XSL = if ! test -e "$(TOOLS_DIR)/xsl"; then $(TOOLS_DIR)/find-xsl.py; fi
 XSLTPROC = xsltproc
 INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
 INSTALL = install
@@ -26,6 +25,8 @@
 XSL_HTML = $(TOOLS_DIR)/html-stylesheet.xsl
 XSL_HTML_CHUNK = $(TOOLS_DIR)/chunk-stylesheet.xsl
 
+ENSURE_XSL = if ! test -e "$(TOOLS_DIR)/xsl"; \
+	     then $(TOOLS_DIR)/bin/find-xsl.py; fi
 RUN_FOP = $(TOOLS_DIR)/bin/run-fop.sh
 
 # Book xsltproc options for HTML output
@@ -135,6 +136,13 @@
 	rm -rf $(BOOK_HTML_CHUNK_DIR)
 	rm -f $(BOOK_PDF_TARGET) $(BOOK_PS_TARGET) 
 
+# The path to xml.soc is going to vary wildly from system to system.
+# I suppose we need another find-foo script - unless anyone has a better idea?
+valid:
+	SP_CHARSET_FIXED=YES SP_ENCODING=XML \
+	SGML_CATALOG_FILES="/usr/share/OpenSP/xml.soc" \
+	onsgmls -wxml -ges book/book.xml
+
 # Stuff below here is added for building the Norwegian version.
 
 COLLAB=http://svn.red-bean.com/svnbook

Modified: trunk/src/nb/TODO
==============================================================================
--- trunk/src/nb/TODO	(original)
+++ trunk/src/nb/TODO	Fri Apr 15 14:09:42 2005
@@ -32,6 +32,8 @@
   - Chapter 8 Section 1.1 "Repository Layer" documents the pre-FSFS state
     of affairs.
 
+  - Appendix D should be reviewed and updated from project_links.html
+
 --------------------------------------------------------------
 
 To be fixed by fitz:

Modified: trunk/src/nb/book/appc.xml
==============================================================================
--- trunk/src/nb/book/appc.xml	(original)
+++ trunk/src/nb/book/appc.xml	Fri Apr 15 14:09:42 2005
@@ -193,7 +193,7 @@
           <listitem>
             <para>DeltaV allows you define flexible collections of
               VCRs called <quote>configurations</quote>, which don't
-              necessarily respond to particular directories.  Each VCR's
+              necessarily correspond to particular directories.  Each VCR's
               contents can be made to point to a specific VR using the
               <literal>UPDATE</literal> method.  Once the configuration
               is perfect, the client can create a

Modified: trunk/src/nb/book/appd.xml
==============================================================================
--- trunk/src/nb/book/appd.xml	(original)
+++ trunk/src/nb/book/appd.xml	Fri Apr 15 14:09:42 2005
@@ -188,10 +188,12 @@
     <variablelist>
 
       <varlistentry>
-        <term>Kwiki (<systemitem
-          class="url">http://www.kwiki.org/</systemitem>)</term>
-        <listitem><para>Wiki with a Subversion backup
-          backend</para></listitem>
+        <term>Trac (<systemitem
+          class="url">http://projects.edgewall.com/trac</systemitem>)</term>
+        <listitem><para>Minimalistic web-based software project
+          management and bug/issue tracking system with version
+          control interfaces and integrated Wiki
+          support</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -262,15 +264,6 @@
           browser</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>Trac (<systemitem
-          class="url">http://projects.edgewall.com/trac</systemitem>)</term>
-        <listitem><para>Minimalistic web-based software project
-          management and bug/issue tracking system with version
-          control interfaces and integrated Wiki
-          support</para></listitem>
-      </varlistentry>
-
     </variablelist>
   </sect1>
 </appendix>

Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml	(original)
+++ trunk/src/nb/book/ch03.xml	Fri Apr 15 14:09:42 2005
@@ -1490,6 +1490,7 @@
 D      stuff/fish.c        # this file is scheduled for deletion
 A      stuff/loot/bloo.h   # this file is scheduled for addition
 C      stuff/loot/lump.c   # this file has conflicts from an update
+R      xyz.c               # this file is scheduled for replacement
     S  stuff/squawk        # this file or dir has been switched to a branch
 </screen>
         @ENGLISH }}} -->
@@ -1512,6 +1513,7 @@
 D      stuff/fish.c        # denne filen er klargjort for sletting
 A      stuff/loot/bloo.h   # denne filen er klargjort for tillegging
 C      stuff/loot/lump.c   # denne filen inneholder en konflikt fra en 
+R      xyz.c               # denne filen er klargjort for erstatning
                            # oppdatering
     S  stuff/squawk        # denne filen eller katalogen er byttet til 
                            # en annen plassering i depotet ved hjelp av 
@@ -1553,7 +1555,7 @@
 
           <varlistentry>
             <!-- @ENGLISH {{{
-            <term><computeroutput>C     item</computeroutput></term>
+            <term><computeroutput>C      item</computeroutput></term>
             <listitem>
               <para>The file <filename>item</filename> is in a state
                 of conflict.  That is, changes received from the
@@ -1563,7 +1565,7 @@
                 repository.</para>
             </listitem>
             @ENGLISH }}} -->
-            <term><computeroutput>C     element</computeroutput></term>
+            <term><computeroutput>C      element</computeroutput></term>
             <listitem>
               <para>Filen <filename>element</filename> er i en tilstand 
                 av konflikt.
@@ -1609,6 +1611,29 @@
 
           <varlistentry>
             <!-- @ENGLISH {{{
+            <term><computeroutput>R      item</computeroutput></term>
+            <listitem>
+              <para>The file, directory, or symbolic link
+                <filename>item</filename> has been scheduled to
+                replace <filename>item</filename> in the repository.
+                This means that the object is first deleted, then
+                another object of the same name is added, all within a
+                single revision.</para>
+            </listitem>
+            @ENGLISH }}} -->
+            <term><computeroutput>R      element</computeroutput></term>
+            <listitem>
+              <para>Filen, katalogen, eller den symbolske lenken 
+                <filename>element</filename> er blitt klargjort for å 
+                erstatte <filename>element</filename> i depotet.
+                Dette betyr at objektet først blir slettet, deretter 
+                blir et annet element lagt til, alt innenfor en enkelt 
+                revisjon.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <!-- @ENGLISH {{{
             <term><computeroutput>X      item</computeroutput></term>
             <listitem>
               <para>The directory <filename>item</filename> is
@@ -1692,7 +1717,7 @@
 
           <varlistentry>
             <!-- @ENGLISH {{{
-            <term><computeroutput>~     item</computeroutput></term>
+            <term><computeroutput>~      item</computeroutput></term>
             <listitem>
               <para>The file, directory, or symbolic link
                 <filename>item</filename> is in the repository as one
@@ -1704,7 +1729,7 @@
                 <command>svn add</command> command.</para>
             </listitem>
             @ENGLISH }}} -->
-            <term><computeroutput>~     element</computeroutput></term>
+            <term><computeroutput>~      element</computeroutput></term>
             <listitem>
               <para>Filen, katalogen eller den symbolske lenken 
                 <filename>element</filename> er lagret i depotet som en 

Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml	(original)
+++ trunk/src/nb/book/ch04.xml	Fri Apr 15 14:09:42 2005
@@ -1457,7 +1457,7 @@
 
         <!-- @ENGLISH {{{
         <para>Everyone seems to have a slightly different definition
-          of <quote>changeset</quote>, or a least a different
+          of <quote>changeset</quote>, or at least a different
           expectation of what it means for a version control system to
           have <quote>changeset features</quote>.  For our purpose,
           let's say that a changeset is just a collection of changes

Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml	(original)
+++ trunk/src/nb/book/ch06.xml	Fri Apr 15 14:09:42 2005
@@ -394,7 +394,7 @@
     <sect2 id="svn-ch-6-sect-3.1">
       <title>Invoking the Server</title>
 
-      <para>There a few different ways to invoke the
+      <para>There are a few different ways to invoke the
         <command>svnserve</command> program.  If invoked with no
         options, you'll see nothing but a help message.  However, if
         you're planning to have <command>inetd</command> launch the
@@ -1172,7 +1172,7 @@
 New password: ***** 
 Re-type new password: *****
 Adding password for user harry
-$ htpasswd /etc/svn-auth-file -m sally
+$ htpasswd -m /etc/svn-auth-file sally
 New password: *******
 Re-type new password: *******
 Adding password for user sally

Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml	(original)
+++ trunk/src/nb/book/ch07.xml	Fri Apr 15 14:09:42 2005
@@ -1343,42 +1343,48 @@
           formatted as
           <literal>$</literal><replaceable>KeywordName</replaceable><literal>$</literal>.</para>
 
+        <para>All keywords are case-sensitive where they appear as
+          anchors in files: you must use the correct capitalization in
+          order for the keyword to be expanded.  You should consider the
+          value of the <literal>svn:keywords</literal> property to be
+          case-sensitive too—certain keyword names will be recognized
+          regardless of case, but this behaviour is deprecated.</para>
+
         <para>Subversion defines the list of keywords available for
-          substitution.  That list contains the following five
-          keywords, some of which have shorter aliases that you can
-          also use:</para>
+          substitution.  That list contains the following five keywords, 
+          some of which have aliases that you can also use:</para>
 
         <variablelist>
           <varlistentry>
-            <term><literal>LastChangedDate</literal></term>
+            <term><literal>Date</literal></term>
             <listitem>
               <para>This keyword describes the last time the file was
                 known to have been changed in the repository, and
-                looks something like <literal>$LastChangedDate:
+                looks something like <literal>$Date:
                 2002-07-22 21:42:37 -0700 (Mon, 22 Jul 2002)
-                $</literal>.  It may be abbreviated as
-                <literal>Date</literal>.</para>
+                $</literal>.  It may also be specified as
+                <literal>LastChangedDate</literal>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>LastChangedRevision</literal></term>
+            <term><literal>Revision</literal></term>
             <listitem>
               <para>This keyword describes the last known revision in
                 which this file changed in the repository, and looks
-                something like <literal>$LastChangedRevision: 144
-                $</literal>.  It may be abbreviated as
-                <literal>Revision</literal> or
+                something like <literal>$Revision: 144 $</literal>.  
+                It may also be specified as
+                <literal>LastChangedRevision</literal> or
                 <literal>Rev</literal>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>LastChangedBy</literal></term>
+            <term><literal>Author</literal></term>
             <listitem>
               <para>This keyword describes the last known user to
                 change this file in the repository, and looks
-                something like <literal>$LastChangedBy: harry
-                $</literal>.  It may be abbreviated as
-                <literal>Author</literal>.</para>
+                something like <literal>$Author: harry $</literal>.  
+                It may also be specified as 
+                <literal>LastChangedBy</literal>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
@@ -1443,7 +1449,7 @@
           <literal>LastChangedDate</literal> keyword.</para>
 
         <screen>
-$ svn propset svn:keywords "LastChangedDate Author" weather.txt
+$ svn propset svn:keywords "Date Author" weather.txt
 property 'svn:keywords' set on 'weather.txt'
 $
 </screen>        
@@ -1488,6 +1494,11 @@
           <literal>Rev</literal> keyword was not substituted because
           we didn't ask for it to be.</para>
 
+        <para>Note also that we set the <literal>svn:keywords</literal>
+          property to "Date Author" yet the keyword anchor used the
+          alias <literal>$LastChangedDate$</literal> and still
+          expanded correctly.</para>
+
         <screen>
 Here is the latest report from the front lines.
 $LastChangedDate: 2002-07-22 21:42:37 -0700 (Mon, 22 Jul 2002) $

Modified: trunk/src/nb/book/images/info.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/nb/book/images/note.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/nb/book/images/warning.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/nb/book/styles.css
==============================================================================
--- trunk/src/nb/book/styles.css	(original)
+++ trunk/src/nb/book/styles.css	Fri Apr 15 14:09:42 2005
@@ -2,14 +2,14 @@
 /* Custom style-sheet stuffs for the Subversion book in HTML form.      */
 /************************************************************************/
 
-BODY
+body
 {
     background: white;
     margin: 0.5in;
     font-family: arial,helvetica,sans-serif;
 }
 
-H1.title
+h1.title
 {
     font-size: 250%;
     font-style: normal;
@@ -17,14 +17,14 @@
     color: black;
 }
 
-H2.subtitle
+h2.subtitle
 {
     font-size: 150%;
     font-style: italic;
     color: black;
 }
 
-H2.title
+h2.title
 {
     font-size: 150%;
     font-style: normal;
@@ -32,7 +32,7 @@
     color: black;
 }
 
-H3.title
+h3.title
 {
     font-size: 125%;
     font-style: normal;
@@ -40,7 +40,7 @@
     color: black;
 }
 
-H4.title
+h4.title
 {
     font-size: 100%;
     font-style: normal;
@@ -48,7 +48,7 @@
     color: black;
 }
 
-.toc B
+.toc b
 {
     font-size: 125%;
     font-style: normal;
@@ -56,14 +56,14 @@
     color: black;
 }
 
-P,LI,UL,OL,DD,DT
+p,li,ul,ol,dd,dt
 {
     font-style: normal;
     font-weight: normal;
     color: black;
 }
 
-TT,PRE
+tt,pre
 {
     font-family: courier new,courier,fixed;
 }
@@ -81,26 +81,26 @@
     font-style: italic;
 }
 
-A
+a
 {
     color: blue;
     text-decoration: underline;
-}	
+}    
 
-A:hover 
+a:hover 
 {
     background: rgb(75%,75%,100%);
     color: blue;
     text-decoration: underline;
 }
 
-A:visited 
+a:visited 
 {
     color: purple;
     text-decoration: underline;
 }
 
-IMG
+img
 {
     border: none;
 }
@@ -110,24 +110,24 @@
     margin: 0.125in 0.5in;
 }
 
-.table TABLE
+.table table
 {
-    border: 1px rgb(180,180,200) solid;
+    border: 1px rgb(180,180,180) solid;
     border-spacing: 0px;
 }
 
-.table TD
+.table td
 {
-    border: 1px rgb(180,180,200) solid;
+    border: 1px rgb(180,180,180) solid;
 }
 
-.table TH
+.table th
 {
-    background: rgb(180,180,200);
-    border: 1px rgb(180,180,200) solid;
+    background: rgb(180,180,180);
+    border: 1px rgb(180,180,180) solid;
 }
 
-.table P.title, .figure P.title, .example P.title
+.table p.title, .figure p.title, .example p.title
 {
     text-align: left !important;
     font-size: 100% !important;
@@ -143,38 +143,38 @@
 
 .sidebar 
 {
-    border: 2px black solid;
-    background: rgb(230,230,235);
+    border: solid 2px rgb(180,180,180);
     padding: 0.12in;
-    margin: 0 0.5in;
+    margin: 1em 0.5in;
 }
 
-.sidebar P.title
+.sidebar p.title
 {
     text-align: center;
     font-size: 125%;
+    background: rgb(180,180,180);
 }
 
-.tip
+.note
 {
     border: black solid 1px;
-    background: url(./images/info.png) no-repeat;
+    background: url(./images/note.png) no-repeat rgb(252,246,220);
     margin: 0.12in 0;
     padding: 0 55px;
 }
 
-.warning
+.tip
 {
     border: black solid 1px;
-    background: url(./images/warning.png) no-repeat;
+    background: url(./images/info.png) no-repeat rgb(224,244,255);
     margin: 0.12in 0;
     padding: 0 55px;
 }
 
-.note
+.warning
 {
     border: black solid 1px;
-    background: url(./images/note.png) no-repeat;
+    background: url(./images/warning.png) no-repeat rgb(255,210,210);
     margin: 0.12in 0;
     padding: 0 55px;
 }
@@ -186,7 +186,13 @@
     font-weight: normal;
     font-size: 90%;
     color: black;
-    margin: 0 0.5in;
+    margin: 1em 0.5in;
+    padding: 0.5em;
+    background: rgb(240,240,240);
+    border-top: black dotted 1px;
+    border-left: black dotted 1px;
+    border-right: black solid 2px;
+    border-bottom: black solid 2px;
 }
 
 .navheader, .navfooter
@@ -195,7 +201,7 @@
     background: rgb(180,180,200);
 }
 
-.navheader HR, .navfooter HR
+.navheader hr, .navfooter hr
 {
     display: none;
 }



More information about the svnbook-dev mailing list