Gentoo Archives: gentoo-doc-cvs

From: Xavier Neys <neysx@×××××××××××.org>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] cvs commit: doc-tipsntricks.xml
Date: Tue, 06 Sep 2005 13:57:43
Message-Id: 200509061354.j86Ds8CQ029047@robin.gentoo.org
1 neysx 05/09/06 13:57:15
2
3 Modified: xml/htdocs/proj/en/gdp/doc doc-tipsntricks.xml
4 Log:
5 Fixed prompts & added a word about rewriteURI
6
7 Revision Changes Path
8 1.11 +51 -26 xml/htdocs/proj/en/gdp/doc/doc-tipsntricks.xml
9
10 file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/proj/en/gdp/doc/doc-tipsntricks.xml?rev=1.11&content-type=text/x-cvsweb-markup&cvsroot=gentoo
11 plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/proj/en/gdp/doc/doc-tipsntricks.xml?rev=1.11&content-type=text/plain&cvsroot=gentoo
12 diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/proj/en/gdp/doc/doc-tipsntricks.xml.diff?r1=1.10&r2=1.11&cvsroot=gentoo
13
14 Index: doc-tipsntricks.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-tipsntricks.xml,v
17 retrieving revision 1.10
18 retrieving revision 1.11
19 diff -u -r1.10 -r1.11
20 --- doc-tipsntricks.xml 8 Apr 2005 09:52:49 -0000 1.10
21 +++ doc-tipsntricks.xml 6 Sep 2005 13:57:15 -0000 1.11
22 @@ -1,10 +1,11 @@
23 <?xml version='1.0' encoding="UTF-8"?>
24 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
25
26 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-tipsntricks.xml,v 1.10 2005/04/08 09:52:49 swift Exp $ -->
27 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-tipsntricks.xml,v 1.11 2005/09/06 13:57:15 neysx Exp $ -->
28
29 <guide link="doc-tipsntricks.xml">
30 <title>Documentation Development Tips &amp; Tricks</title>
31 +
32 <author title="Author">
33 <mail link="swift@g.o">Sven Vermeulen</mail>
34 </author>
35 @@ -19,8 +20,8 @@
36
37 <license/>
38
39 -<version>0.15</version>
40 -<date>2005-04-08</date>
41 +<version>0.16</version>
42 +<date>2005-09-06</date>
43
44 <chapter>
45 <title>Setting up your local environment</title>
46 @@ -40,7 +41,7 @@
47 </p>
48
49 <pre caption="Downloading the English documentation">
50 -# <i>wget http://www.gentoo.org/dyn/doc-snapshots/docs-latest-en.tar.bz2</i>
51 +$ <i>wget http://www.gentoo.org/dyn/doc-snapshots/docs-latest-en.tar.bz2</i>
52 </pre>
53
54 <p>
55 @@ -51,7 +52,7 @@
56 </p>
57
58 <pre caption="Updating an English document">
59 -# <i>wget http://www.gentoo.org/doc/en/alsa-guide.xml?passthru=1 -O alsa-guide.xml</i>
60 +$ <i>wget http://www.gentoo.org/doc/en/alsa-guide.xml?passthru=1 -O alsa-guide.xml</i>
61 </pre>
62
63 <p>
64 @@ -60,10 +61,10 @@
65 </p>
66
67 <pre caption="Downloading the snapshot for your language">
68 -# <i>mkdir </i><comment>${LANG}</comment>
69 -# <i>cd </i><comment>${LANG}</comment>
70 -# <i>wget http://www.gentoo.org/dyn/doc-snapshots/docs-latest-</i><comment>${LANG}</comment><i>.tar.bz2</i>
71 -# <i>tar xvjf docs-latest-*.tar.bz2</i>
72 +$ <i>mkdir </i><comment>${LANG}</comment>
73 +$ <i>cd </i><comment>${LANG}</comment>
74 +$ <i>wget http://www.gentoo.org/dyn/doc-snapshots/docs-latest-</i><comment>${LANG}</comment><i>.tar.bz2</i>
75 +$ <i>tar xvjf docs-latest-*.tar.bz2</i>
76 </pre>
77
78 <p>
79 @@ -74,7 +75,7 @@
80 </p>
81
82 <pre caption="Creating a patch for an update">
83 -# <i>diff -uNt </i><comment>${LANG}</comment><i>/alsa-guide.xml alsa-guide.xml</i> > alsa-guide.diff
84 +$ <i>diff -uNt </i><comment>${LANG}</comment><i>/alsa-guide.xml alsa-guide.xml</i> > alsa-guide.diff
85 </pre>
86
87 </body>
88 @@ -104,9 +105,9 @@
89 </p>
90
91 <pre caption="Getting the CVS snapshot">
92 -# <i>mkdir cvs; cd cvs/</i>
93 -# <i>export CVSROOT=</i><comment>&lt;your nick&gt;</comment><i>@cvs.gentoo.org:/var/cvsroot</i>
94 -# <i>cvs co doc</i>
95 +$ <i>mkdir cvs; cd cvs/</i>
96 +$ <i>export CVSROOT=</i><comment>&lt;your nick&gt;</comment><i>@cvs.gentoo.org:/var/cvsroot</i>
97 +$ <i>cvs co doc</i>
98 </pre>
99
100 <p>
101 @@ -129,11 +130,11 @@
102 </p>
103
104 <pre caption="Creating the test environment">
105 -# <i>mkdir test</i>
106 -# <i>cd test</i>
107 -# <i>mkdir css images</i>
108 -# <i>wget -P css/ http://www.gentoo.org/css/main.css</i>
109 -# <i>wget -P images/ http://www.gentoo.org/images/gbot-s.gif \
110 +$ <i>mkdir test</i>
111 +$ <i>cd test</i>
112 +$ <i>mkdir css images</i>
113 +$ <i>wget -P css/ http://www.gentoo.org/css/main.css</i>
114 +$ <i>wget -P images/ http://www.gentoo.org/images/gbot-s.gif \
115 http://www.gentoo.org/images/gridtest.gif \
116 http://www.gentoo.org/images/gtop-s.jpg \
117 http://www.gentoo.org/images/line.gif \
118 @@ -148,15 +149,39 @@
119 </p>
120
121 <pre caption="Downloading guide.xsl">
122 -# <i>wget http://dev.gentoo.org/~swift/gentoo/downloads/guide.xsl</i>
123 +$ <i>wget http://dev.gentoo.org/~swift/gentoo/downloads/guide.xsl</i>
124 </pre>
125
126 <p>
127 -Finally, edit <path>/etc/xml/catalog</path> and add the following line:
128 +Finally, edit <path>/etc/xml/catalog</path> as root and add the following line:
129 </p>
130
131 <pre caption="/etc/xml/catalog addendum">
132 -&lt;rewriteURI uriStartString="/dtd" rewritePrefix="<i>/usr/portage/metadata/dtd/</i>"/&gt;
133 +&lt;rewriteURI uriStartString="/dtd/" rewritePrefix="<i>/usr/portage/metadata/dtd/</i>"/&gt;
134 +</pre>
135 +
136 +<p>
137 +If your <path>/etc/xml/catalog</path> is empty or does not contain any entry,
138 +you need to <e>insert</e> the <c>&lt;rewriteURI&gt;</c> element <e>inside</e>
139 +the <c>&lt;catalog&gt;</c> element:
140 +</p>
141 +
142 +<pre caption="Minimal /etc/xml/catalog">
143 +&lt;?xml version="1.0"?&gt;
144 +&lt;DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"&gt;
145 +&lt;catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"&gt;
146 + &lt;rewriteURI uriStartString="/dtd/" rewritePrefix="<i>/usr/portage/metadata/dtd/</i>"/&gt;
147 +&lt;catalog&gt;
148 +</pre>
149 +
150 +<p>
151 +Besides, some files may specify the on-line DTD with an uri like
152 +<path>http://www.gentoo.org/dtd/guide.dtd</path>. You can also rewrite those
153 +references and avoid slow accesses to the net:
154 +</p>
155 +
156 +<pre caption="Extra /etc/xml/catalog addendum">
157 +&lt;rewriteURI uriStartString="http://www.gentoo.org/dtd/" rewritePrefix="<i>/usr/portage/metadata/dtd/</i>"/&gt;
158 </pre>
159
160 </body>
161 @@ -170,7 +195,7 @@
162 </p>
163
164 <pre caption="Using xmllint to verify guides">
165 -# <i>xmllint --valid --noout alsa-guide.xml</i>
166 +$ <i>xmllint --valid --noout alsa-guide.xml</i>
167 </pre>
168
169 <p>
170 @@ -180,7 +205,7 @@
171 </p>
172
173 <pre caption="Converting to HTML">
174 -# <i>xsltproc --novalid test/guide.xsl alsa-guide.xml &gt; test/alsa-guide.html</i>
175 +$ <i>xsltproc --novalid test/guide.xsl alsa-guide.xml &gt; test/alsa-guide.html</i>
176 </pre>
177
178 <p>
179 @@ -205,9 +230,9 @@
180 </p>
181
182 <pre caption="Validating hb-install-about.xml">
183 -# <i>xmllint --valid --noout handbook-x86.xml</i>
184 -# <i>xmllint --valid --noout hb-install-about.xml</i>
185 -# <i>xsltproc --stringparam part 1 --stringparam chap 1 test/guide.xsl handbook-x86.xml &gt; test/hb-install-about.html</i>
186 +$ <i>xmllint --valid --noout handbook-x86.xml</i>
187 +$ <i>xmllint --valid --noout hb-install-about.xml</i>
188 +$ <i>xsltproc --stringparam part 1 --stringparam chap 1 test/guide.xsl handbook-x86.xml &gt; test/hb-install-about.html</i>
189 </pre>
190
191 </body>
192
193
194
195 --
196 gentoo-doc-cvs@g.o mailing list