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

sunny256 at red-bean.com sunny256 at red-bean.com
Thu Feb 24 14:03:45 CST 2005 

Author: sunny256
Date: Thu Feb 24 14:03:44 2005
New Revision: 1114

Modified:
   trunk/src/nb/LAST_UPDATED
   trunk/src/nb/Makefile
   trunk/src/nb/TODO
   trunk/src/nb/book/book.xml
   trunk/src/nb/book/ch07.xml
   trunk/src/nb/book/ch09.xml
Log:
Norwegian svnbook: Updated changes between r1067:1113 from the English 
book to the Norwegian version to get things working after the changes in 
en/Makefile r1113.

* src/nb/LAST_UPDATED
  Updated by make sync.

* src/nb/TODO
  Merged r1072.

* src/nb/book/book.xml
  Merged r1089.

* src/nb/book/ch07.xml
  Merged r1081.

* src/nb/book/ch09.xml
  Merged r1076.

* src/nb/Makefile
  Merged r1113.


Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED	(original)
+++ trunk/src/nb/LAST_UPDATED	Thu Feb 24 14:03:44 2005
@@ -1 +1 @@
-1067
+1113

Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile	(original)
+++ trunk/src/nb/Makefile	Thu Feb 24 14:03:44 2005
@@ -20,15 +20,6 @@
 BOOK_IMAGES = $(BOOK_DIR)/images/*.png
 BOOK_INSTALL_DIR = $(INSTALL_DIR)/book
 
-MDOCS_DIR = ${BOOK_TOP}/misc-docs
-MDOCS_HTML_TARGET = $(MDOCS_DIR)/misc-docs.html
-MDOCS_PDF_TARGET = $(MDOCS_DIR)/misc-docs.pdf
-MDOCS_PS_TARGET = $(MDOCS_DIR)/misc-docs.ps
-MDOCS_FO_TARGET = $(MDOCS_DIR)/misc-docs.fo
-MDOCS_XML_SOURCE = $(MDOCS_DIR)/misc-docs.xml
-MDOCS_ALL_SOURCE = $(MDOCS_DIR)/*.xml
-MDOCS_INSTALL_DIR = $(INSTALL_DIR)/misc-docs
-
 XSL_FO = ${BOOK_TOP}/../en/tools/fo-stylesheet.xsl
 XSL_HTML = $(BOOK_TOP)/../en/tools/html-stylesheet.xsl
 XSL_HTML_CHUNK = $(BOOK_TOP)/../en/tools/chunk-stylesheet.xsl
@@ -49,24 +40,19 @@
 
 all: all-html all-pdf all-ps
 
-install: install-book install-misc-docs
+install: install-book
 
-all-html: book-html book-html-chunk misc-docs-html
+all-html: book-html book-html-chunk
 
-all-pdf: book-pdf misc-docs-pdf
+all-pdf: book-pdf
 
-all-ps: book-ps misc-docs-ps
+all-ps: book-ps
 
 all-book: book-html book-html-chunk book-pdf book-ps
 
 install-book: install-book-html install-book-html-chunk install-book-pdf install-book-ps
 
-all-misc-docs: misc-docs-html misc-docs-pdf book-ps
-
-install-misc-docs: install-misc-html install-misc-pdf \
-                   install-misc-ps
-
-clean: book-clean misc-docs-clean
+clean: book-clean
 
 $(BOOK_VERSION_SOURCE): book-version
 
@@ -142,39 +128,6 @@
 	rm -rf $(BOOK_HTML_CHUNK_DIR)
 	rm -f $(BOOK_PDF_TARGET) $(BOOK_PS_TARGET) 
 
-misc-docs-html: $(MDOCS_HTML_TARGET)
-
-$(MDOCS_HTML_TARGET): $(MDOCS_ALL_SOURCE)
-	$(XSLTPROC) $(XSL_HTML) $(MDOCS_XML_SOURCE) > $(MDOCS_HTML_TARGET)
-
-misc-docs-pdf: $(MDOCS_PDF_TARGET)
-
-misc-docs-ps: $(MDOCS_PS_TARGET)
-
-$(MDOCS_PDF_TARGET): $(MDOCS_ALL_SOURCE)
-	$(XSLTPROC) $(XSL_FO) $(MDOCS_XML_SOURCE) > $(MDOCS_FO_TARGET)
-	$(RUN_FOP) $(BOOK_TOP) -fo $(MDOCS_FO_TARGET) -pdf $(MDOCS_PDF_TARGET)
-
-$(MDOCS_PS_TARGET): $(MDOCS_ALL_SOURCE)
-	$(XSLTPROC) $(XSL_FO) $(MDOCS_XML_SOURCE) > $(MDOCS_FO_TARGET)
-	$(RUN_FOP) $(BOOK_TOP) -fo $(MDOCS_FO_TARGET) -ps $(MDOCS_PS_TARGET)
-
-misc-docs-clean:
-	rm -f $(MDOCS_HTML_TARGET) $(MDOCS_FO_TARGET)
-	rm -f $(MDOCS_PDF_TARGET) $(MDOCS_PS_TARGET)
-
-$(MDOCS_INSTALL_DIR):
-	$(INSTALL) -d $(MDOCS_INSTALL_DIR)
-
-install-misc-html: $(MDOCS_HTML_TARGET) $(MDOCS_INSTALL_DIR)
-	$(INSTALL) $(MDOCS_HTML_TARGET) $(MDOCS_INSTALL_DIR)
-
-install-misc-pdf: $(MDOCS_PDF_TARGET) $(MDOCS_INSTALL_DIR)
-	$(INSTALL) $(MDOCS_PDF_TARGET) $(MDOCS_INSTALL_DIR)
-
-install-misc-ps: $(MDOCS_PS_TARGET) $(MDOCS_INSTALL_DIR)
-	$(INSTALL) $(MDOCS_PS_TARGET) $(MDOCS_INSTALL_DIR)
-
 # 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	Thu Feb 24 14:03:44 2005
@@ -29,6 +29,9 @@
 
   - Use either 'use case' or 'use-case', not a mixture of both.
 
+  - Chapter 8 Section 1.1 "Repository Layer" documents the pre-FSFS state
+    of affairs.
+
 --------------------------------------------------------------
 
 To be fixed by fitz:

Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml	(original)
+++ trunk/src/nb/book/book.xml	Thu Feb 24 14:03:44 2005
@@ -59,12 +59,11 @@
 
   <!-- Using revnumber would be more appropriate, but our stylesheets -->
   <!-- don't seem to render it. -->
-  <subtitle><para>For Subversion 1.1</para>
-            <!-- @ENGLISH {{{
-            <para>(book compiled from &svn.version;)</para>
-            @ENGLISH }}} -->
-            <para>(Boken kompilert fra &svn.version;)</para>
-  </subtitle>
+  <subtitle>For Subversion 1.1</subtitle>
+  <!-- @ENGLISH {{{
+  <subtitle>(book compiled from &svn.version;)</subtitle>
+  @ENGLISH }}} -->
+  <subtitle>(Boken kompilert fra &svn.version;)</subtitle>
 
   <bookinfo>
 

Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml	(original)
+++ trunk/src/nb/book/ch07.xml	Thu Feb 24 14:03:44 2005
@@ -97,13 +97,14 @@
         configuration area override those in the system-wide one, and
         command-line arguments supplied to the <command>svn</command>
         program have the final word on behavior.  On Unix-like
-        platforms, the system-wide configuration area is expected to be
-        the <filename>/etc/subversion</filename> directory; on Windows
-        machines, it looks for a <filename>Subversion</filename>
-        directory inside the common Application Data location (again,
-        as specified by the Windows Registry).  Unlike the per-user
-        case, the <command>svn</command> program does not attempt to
-        create the system-wide configuration area.</para>
+        platforms, the system-wide configuration area is
+        expected to be the <filename>/etc/subversion</filename>
+        directory; on Windows machines, it looks for a
+        <filename>Subversion</filename> directory inside the common
+        <filename>Application Data</filename> location (again, as
+        specified by the Windows Registry).  Unlike the per-user
+        case, the <command>svn</command> program does not attempt
+        to create the system-wide configuration area.</para>
 
       <para>The configuration area currently contains three
         files—two configuration files (<filename>config</filename> and

Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml	(original)
+++ trunk/src/nb/book/ch09.xml	Thu Feb 24 14:03:44 2005
@@ -5110,7 +5110,7 @@
             but this time showing the property values as well:</para>
 
           <screen>
-$ svnlook proplist /usr/local/svn/repos /trunk/README
+$ svnlook --verbose proplist /usr/local/svn/repos /trunk/README
   original-author : fitz
   svn:mime-type : text/plain
 </screen>

More information about the svnbook-dev mailing list