[svnbook commit] r1162 - in trunk/src/nb: . book
sunny256 at red-bean.com
sunny256 at red-bean.com
Wed Mar 9 02:21:31 CST 2005
Author: sunny256
Date: Wed Mar 9 02:21:30 2005
New Revision: 1162
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/Makefile
trunk/src/nb/README
trunk/src/nb/book/ch04.xml
trunk/src/nb/book/ch09.xml
Log:
Merge changes between r1145:1160 from the English book into the
Norwegian version.
* src/nb/LAST_UPDATED
Updated by make sync.
* src/nb/Makefile
Merged r1159 and enabled generation of Postscript in A4 format.
* src/nb/README
Merged r1148.
* src/nb/book/ch04.xml
Merged r1150.
* src/nb/book/ch09.xml
Merged r1160.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Wed Mar 9 02:21:30 2005
@@ -1 +1 @@
-1145
+1160
Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Wed Mar 9 02:21:30 2005
@@ -37,8 +37,9 @@
# BOOK_PDF_XSLTPROC_OPTS = --stringparam page.height 9in --stringparam page.width 6.4in
# BOOK_PS_XSLTPROC_OPTS = --stringparam page.height 9in --stringparam page.width 6.4in
-# Uncomment the following line if you'd like to print on A4 paper
+# Uncomment the following lines if you'd like to print on A4 paper
BOOK_PDF_XSLTPROC_OPTS = --stringparam paper.type A4
+BOOK_PS_XSLTPROC_OPTS = --stringparam paper.type A4
all: all-html all-pdf all-ps
Modified: trunk/src/nb/README
==============================================================================
--- trunk/src/nb/README (original)
+++ trunk/src/nb/README Wed Mar 9 02:21:30 2005
@@ -37,7 +37,7 @@
II. COMPILING THE DOCS
-1. Fetch XSL stylesheets for Docbook and place them in tools/xsl
+1. Fetch XSL stylesheets for Docbook and place them in src/tools/xsl
The "Docbook Open Repository" on Sourceforge has a large collection
of XSL stylesheets that specifically operate on Docbook. Download
@@ -45,15 +45,15 @@
http://sourceforge.net/project/showfiles.php?group_id=21935
- Download the latest version of docbook-xsl, unpack it, then
- rename the unpacked directory to tools/xsl, something like this:
+ Download the latest version of docbook-xsl, unpack it, then rename
+ the unpacked directory to src/tools/xsl, something like this:
- $ cd doc/book/tools
+ $ cd src/tools
$ tar zxvf docbook-xsl-X.YY.Z.tar.gz
$ mv docbook-xsl-X.YY.Z xsl
The default build process expects to the stylesheets to be in
- tools/xsl/.
+ src/tools/xsl/.
2. Use XSLT to transform the book.
@@ -82,8 +82,8 @@
make all-html
- This produces an HTML version of the book in book/book.html, and
- HTML for the miscellaneous docs in misc-docs/misc-docs.html.
+ This produces a single-page HTML version of the book in
+ book/book.html, and a multi-page version in book/html-chunk/.
3. Make a PDF file.
@@ -105,16 +105,16 @@
fop-0.20.4-bin.tar.gz. Just get a binary distribution,
there's no need for the Java source.
- 2. Unpack it into tools/fop/
+ 2. Unpack it into src/tools/fop/
- $ cd doc/book/tools
+ $ cd src/tools
$ tar zxvf fop-0.20.4-bin.tar.gz
$ mv fop-0.20.4 fop
That should be enough. The Makefile will actually invoke
- tools/bin/run-fop.sh. That script attempts to find FOP already
+ src/tools/bin/run-fop.sh. That script attempts to find FOP already
installed on your system, but falls back to the FOP unpacked into
- tools/fop/ if there's no other FOP available.
+ src/tools/fop/ if there's no other FOP available.
Of course, to run FOP at all, you also need a Java runtime
environment. Try java.sun.com or www.blackdown.org if you don't
@@ -136,7 +136,7 @@
http://java.sun.com/products/jimi/, then cp the jar file into the
same place as the FOP jar files:
- $ cd doc/book/tools/
+ $ cd src/tools
$ tar zxvf jimi1_0.tar.Z
$ cp Jimi/examples/AppletDemo/JimiProClasses.jar fop/lib/
@@ -146,8 +146,7 @@
make all-pdf
- This produces PDF for the book in book/book.pdf, and
- PDF for the miscellaneous docs in misc-docs/misc-docs.pdf.
+ This produces PDF for the book in book/book.pdf.
III. HACKING ON THE DOCS
@@ -174,7 +173,7 @@
2. Get a validating parser.
We recommend nsgmls, a parser written by James Clark:
- http://www.jclark.com/sp/nsgmls. It's nice to check that the XML
+ http://www.jclark.com/sp/. It's nice to check that the XML
you write has matching tags, and follows the DTD correctly.
Here is one command you can use to validate your xml:
Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml (original)
+++ trunk/src/nb/book/ch04.xml Wed Mar 9 02:21:30 2005
@@ -1577,7 +1577,7 @@
large potential for human error. Users will sometimes
compare the wrong two trees, creating a delta that doesn't
apply cleanly. <command>svn merge</command> will do its
- best to apply has much of the delta as possible, but some
+ best to apply as much of the delta as possible, but some
parts may be impossible. Just like the Unix
<command>patch</command> command sometimes complains about
<quote>failed hunks</quote>, <command>svn merge</command>
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Wed Mar 9 02:21:30 2005
@@ -4213,7 +4213,7 @@
<title>Example</title>
<para>This shows the beginning of loading a repository from
- a backup file (made, of course, with <command>svn
+ a backup file (made, of course, with <command>svnadmin
dump</command>):</para>
<screen>
More information about the svnbook-dev
mailing list