[svnbook commit] r1557 - trunk/src/nb

sunny256 svnbook-dev at red-bean.com
Tue Jul 19 12:02:12 CDT 2005


Author: sunny256
Date: Tue Jul 19 12:02:11 2005
New Revision: 1557

Modified:
   trunk/src/nb/METHOD
Log:
Norwegian documentation tweaks.

* src/nb/METHOD
  Fix some typos and add the rest of the make rules.


Modified: trunk/src/nb/METHOD
==============================================================================
--- trunk/src/nb/METHOD	(original)
+++ trunk/src/nb/METHOD	Tue Jul 19 12:02:11 2005
@@ -21,8 +21,8 @@
       brief list of pointers to major 1.1 changes.</para>
     @ENGLISH }}} -->
     <para>Denne utgaven av boken er blitt oppdatert for å dekke nye 
-      funksjoner og forandringer i oppførselen for Subversion 1.1. Her 
-      er en rask oversikt over pekere til store forandringer i 
+      funksjoner og forandringer i oppførselen for Subversion 1.1.
+      Her er en rask oversikt over pekere til store forandringer i 
       1.1.</para>
 
 It may look as a tedious task to add those markers, but this is taken 
@@ -59,8 +59,8 @@
 
 Normally you don’t have to think about running these make commands, 
 except when you’ve translated text that contains double hyphens. If 
-there are some double slashes which needs escaping, the make process 
-(you always make before checkin, right?) will return errors like
+there are some double dashes which needs escaping, the make process (you 
+always make before checkin, right?) will return errors like
 
   book/ch03.xml:327: parser error : Comment must not contain '--' 
   (double-hyphen)
@@ -79,14 +79,14 @@
 Mark the paragraph with Shift-V in Vim and press <F5>. The macro expects 
 the dings_it script to exist at ~/bin/dings_it, and if it does, the 
 block is automatically commented out and all the elements with the 
-attributes intact is copied after the block, and the cursor is placed in 
-the right position ready for writing. Repeat this process through the 
+attributes intact are copied after the block, and the cursor is placed 
+in the right position ready for writing. Repeat this process through the 
 file.
 
 Some conventions exists, much to the lack of protests, and to keep 
 things consistent, over to some formatting rules:
 
-  * Width of text lines are 72 characters.
+  * Width of text lines is 72 characters.
   * As usual, use no TABs, only spaces.
   * When marking and commenting out English paragraphs, don’t break the 
     element structure, for example by including a </listitem> without 
@@ -169,7 +169,7 @@
 messy after the merge, you have the option to do the merge in smaller 
 steps. Let’s say that a file rename happens in r1000 and there are lots 
 of file changes before and after this rename. What you can do, is to 
-first merge in all the changes from when the last syncronisation was 
+first merge in all the changes from when the last synchronisation was 
 done (stored in the LAST_UPDATED file) up to r999, and then take the 
 following merges in decent steps:
 
@@ -196,22 +196,31 @@
 * make engdir
     Create a book/eng/ directory which is nice to have around if it’s 
     necessary to diff against the master files.
+* make sync
+    Merge new changes from the English book into the translation.
+* make commitmode
+    Prepare the files for commit.
+* make editmode
+    Remove the ﳢ entities to make it easier to compare the files 
+    against the original version, for example the files in 
+    src/nb/book/eng/ which is created by make engdir.
 
 Scripts
 =======
 
 * src/nb/bin/clean_files
-  Converts between editmode and commitmode.
+    Converts between editmode and commitmode.
 * src/nb/bin/dings_it
-  Used during the translation. Takes care of commenting out the English 
-  text and copies all the XML elements.
+    Used during the translation. Takes care of commenting out the 
+    English text and copies all the XML elements. Called from the <F5> 
+    macro in svnbook.vim and is expected to exist as ~/bin/dings_it .
 * src/nb/bin/h2u
 * src/nb/bin/u2h
-  Two scripts which is not used anymore, converts to/from numerical 
-  entities to/from UTF-8.
+    Two scripts which is not used anymore, converts to/from numerical 
+    entities to/from UTF-8.
 * src/nb/bin/strip_english
-  Removes the @ENGLISH markers with the English text from the XML files, 
-  useful if the XML source is going to be distributed and duplication of 
-  the English text is not a good thing.
+    Removes the @ENGLISH markers with the English text from the XML 
+    files, useful if the XML source is going to be distributed and 
+    duplication of the English text is not a good thing.
 
 vim: set fo=tcq2w tw=72 fenc=utf8 ts=2 sw=2 sts=2 com=b\:#,fb\:-,fb\:*,n\:> et :



More information about the svnbook-dev mailing list