1 |
commit: 02a6c2a31a74d492d4df38947341dea6636a5a82 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 18 15:05:42 2020 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 18 15:05:42 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=02a6c2a3 |
7 |
|
8 |
Replace ">" by ">" throughout. |
9 |
|
10 |
Most instances are already being escaped, so convert the few remaining |
11 |
ones for consistency throughout the document. |
12 |
|
13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
14 |
|
15 |
appendices/devbook-guide/text.xml | 4 ++-- |
16 |
archs/amd64/text.xml | 22 +++++++++++----------- |
17 |
devbook.xsl | 2 +- |
18 |
ebuild-writing/functions/src_install/text.xml | 2 +- |
19 |
ebuild-writing/functions/src_test/text.xml | 4 ++-- |
20 |
ebuild-writing/using-eclasses/text.xml | 2 +- |
21 |
general-concepts/autotools/text.xml | 2 +- |
22 |
general-concepts/dependencies/text.xml | 14 +++++++------- |
23 |
general-concepts/mirrors/text.xml | 2 +- |
24 |
general-concepts/portage-cache/text.xml | 2 +- |
25 |
general-concepts/use-flags/text.xml | 4 ++-- |
26 |
general-concepts/virtuals/text.xml | 2 +- |
27 |
quickstart/text.xml | 8 ++++---- |
28 |
tools-reference/find/text.xml | 2 +- |
29 |
tools-reference/sed/text.xml | 6 +++--- |
30 |
xsl/lang.highlight.c.xsl | 2 +- |
31 |
xsl/lang.highlight.ebuild.xsl | 2 +- |
32 |
17 files changed, 41 insertions(+), 41 deletions(-) |
33 |
|
34 |
diff --git a/appendices/devbook-guide/text.xml b/appendices/devbook-guide/text.xml |
35 |
index 72e51e9..1a3d538 100644 |
36 |
--- a/appendices/devbook-guide/text.xml |
37 |
+++ b/appendices/devbook-guide/text.xml |
38 |
@@ -334,14 +334,14 @@ EAPI=7 |
39 |
|
40 |
DESCRIPTION="MicroGnuEmacs, a port from the BSDs" |
41 |
HOMEPAGE="https://homepage.boetes.org/software/mg/" |
42 |
-SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
43 |
+SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
44 |
|
45 |
LICENSE="public-domain" |
46 |
SLOT="0" |
47 |
KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86" |
48 |
|
49 |
RDEPEND="sys-libs/ncurses:0= |
50 |
- >=dev-libs/libbsd-0.7.0" |
51 |
+ >=dev-libs/libbsd-0.7.0" |
52 |
DEPEND="${RDEPEND}" |
53 |
BDEPEND="virtual/pkgconfig" |
54 |
|
55 |
|
56 |
diff --git a/archs/amd64/text.xml b/archs/amd64/text.xml |
57 |
index 73264df..057d92c 100644 |
58 |
--- a/archs/amd64/text.xml |
59 |
+++ b/archs/amd64/text.xml |
60 |
@@ -183,13 +183,13 @@ configurations. |
61 |
2004.3 |
62 |
</ti> |
63 |
<ti> |
64 |
- *l->emul* |
65 |
+ *l->emul* |
66 |
</ti> |
67 |
<ti> |
68 |
d64 |
69 |
</ti> |
70 |
<ti> |
71 |
- *l->lib* |
72 |
+ *l->lib* |
73 |
</ti> |
74 |
</tr> |
75 |
<tr> |
76 |
@@ -197,10 +197,10 @@ configurations. |
77 |
2004.3/lib64 |
78 |
</ti> |
79 |
<ti> |
80 |
- *l->emul* |
81 |
+ *l->emul* |
82 |
</ti> |
83 |
<ti> |
84 |
- *l->64* |
85 |
+ *l->64* |
86 |
</ti> |
87 |
<ti> |
88 |
d64 |
89 |
@@ -208,13 +208,13 @@ configurations. |
90 |
</tr> |
91 |
<tr> |
92 |
<ti> |
93 |
- >=2005.0 |
94 |
+ >=2005.0 |
95 |
</ti> |
96 |
<ti> |
97 |
d32 |
98 |
</ti> |
99 |
<ti> |
100 |
- *l->64* |
101 |
+ *l->64* |
102 |
</ti> |
103 |
<ti> |
104 |
d64 |
105 |
@@ -222,13 +222,13 @@ configurations. |
106 |
</tr> |
107 |
<tr> |
108 |
<ti> |
109 |
- >=2005.0/no-multilib |
110 |
+ >=2005.0/no-multilib |
111 |
</ti> |
112 |
<ti> |
113 |
d32 |
114 |
</ti> |
115 |
<ti> |
116 |
- *l->64* |
117 |
+ *l->64* |
118 |
</ti> |
119 |
<ti> |
120 |
d64 |
121 |
@@ -236,7 +236,7 @@ configurations. |
122 |
</tr> |
123 |
<tr> |
124 |
<ti> |
125 |
- >=2005.0/no-symlink |
126 |
+ >=2005.0/no-symlink |
127 |
</ti> |
128 |
<ti> |
129 |
d32 |
130 |
@@ -250,7 +250,7 @@ configurations. |
131 |
</tr> |
132 |
<tr> |
133 |
<ti> |
134 |
- >=2005.0/no-symlink/no-lib32 |
135 |
+ >=2005.0/no-symlink/no-lib32 |
136 |
</ti> |
137 |
<ti> |
138 |
inexistant |
139 |
@@ -278,7 +278,7 @@ configurations. |
140 |
Directory containing XXbit objects |
141 |
</dd> |
142 |
<dt> |
143 |
- l->foo |
144 |
+ l->foo |
145 |
</dt> |
146 |
<dd> |
147 |
Link to foo |
148 |
|
149 |
diff --git a/devbook.xsl b/devbook.xsl |
150 |
index 7a8af1b..0fd8766 100644 |
151 |
--- a/devbook.xsl |
152 |
+++ b/devbook.xsl |
153 |
@@ -413,7 +413,7 @@ |
154 |
</xsl:call-template> |
155 |
</xsl:variable> |
156 |
<xsl:variable name="extraction_counter" select="count(exslt:node-set($extraction_counter_node)//*[@value != 0]) + count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])"/> |
157 |
- <xsl:if test="string($extraction) = '' or $extraction_counter > 0"> |
158 |
+ <xsl:if test="string($extraction) = '' or $extraction_counter > 0"> |
159 |
<li> |
160 |
<a class="reference" href="{concat($path_rel, @href, 'index.html')}"><xsl:value-of select="document(concat($path, @href, 'text.xml'))/guide/chapter[1]/title"/></a> |
161 |
<xsl:if test="$extraction != ''"> |
162 |
|
163 |
diff --git a/ebuild-writing/functions/src_install/text.xml b/ebuild-writing/functions/src_install/text.xml |
164 |
index 010638b..1dd1bac 100644 |
165 |
--- a/ebuild-writing/functions/src_install/text.xml |
166 |
+++ b/ebuild-writing/functions/src_install/text.xml |
167 |
@@ -41,7 +41,7 @@ src_install() { |
168 |
emake DESTDIR="${D}" install |
169 |
fi |
170 |
|
171 |
- if ! declare -p DOCS >/dev/null 2>&1 ; then |
172 |
+ if ! declare -p DOCS >/dev/null 2>&1 ; then |
173 |
local d |
174 |
for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \ |
175 |
FAQ CREDITS CHANGELOG ; do |
176 |
|
177 |
diff --git a/ebuild-writing/functions/src_test/text.xml b/ebuild-writing/functions/src_test/text.xml |
178 |
index 135eb39..c278aa0 100644 |
179 |
--- a/ebuild-writing/functions/src_test/text.xml |
180 |
+++ b/ebuild-writing/functions/src_test/text.xml |
181 |
@@ -34,9 +34,9 @@ |
182 |
<p>The default test phase in EAPI 6 is equivalent to the following:</p> |
183 |
<codesample lang="ebuild"> |
184 |
src_test() { |
185 |
- if emake check -n &> /dev/null; then |
186 |
+ if emake check -n &> /dev/null; then |
187 |
emake check |
188 |
- elif emake test -n &> /dev/null; then |
189 |
+ elif emake test -n &> /dev/null; then |
190 |
emake test |
191 |
fi |
192 |
} |
193 |
|
194 |
diff --git a/ebuild-writing/using-eclasses/text.xml b/ebuild-writing/using-eclasses/text.xml |
195 |
index b957ca2..a1b7f08 100644 |
196 |
--- a/ebuild-writing/using-eclasses/text.xml |
197 |
+++ b/ebuild-writing/using-eclasses/text.xml |
198 |
@@ -48,7 +48,7 @@ SLOT="0" |
199 |
KEYWORDS="alpha ~amd64 ~x86 ~x86-fbsd" |
200 |
|
201 |
RDEPEND="sys-libs/ncurses:0= |
202 |
- >=sys-libs/readline:0=" |
203 |
+ >=sys-libs/readline:0=" |
204 |
DEPEND="${RDEPEND}" |
205 |
|
206 |
src_prepare() { |
207 |
|
208 |
diff --git a/general-concepts/autotools/text.xml b/general-concepts/autotools/text.xml |
209 |
index c6a9aa8..b7170ba 100644 |
210 |
--- a/general-concepts/autotools/text.xml |
211 |
+++ b/general-concepts/autotools/text.xml |
212 |
@@ -479,7 +479,7 @@ man_MANS = glep31check.1 |
213 |
EXTRA_DIST = glep31check.in |
214 |
|
215 |
%.1 : %.in |
216 |
- @regex_cmd@ -e "s,\@VERSION\@,$(VERSION),g" $? > $@ |
217 |
+ @regex_cmd@ -e "s,\@VERSION\@,$(VERSION),g" $? > $@ |
218 |
</codesample> |
219 |
|
220 |
<p> |
221 |
|
222 |
diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml |
223 |
index ff198fb..1a1d970 100644 |
224 |
--- a/general-concepts/dependencies/text.xml |
225 |
+++ b/general-concepts/dependencies/text.xml |
226 |
@@ -171,7 +171,7 @@ should be specified. A simple example: |
227 |
</p> |
228 |
|
229 |
<codesample lang="ebuild"> |
230 |
-DEPEND=">=dev-libs/openssl-0.9.7d" |
231 |
+DEPEND=">=dev-libs/openssl-0.9.7d" |
232 |
</codesample> |
233 |
|
234 |
<p> |
235 |
@@ -193,11 +193,11 @@ Available version specifiers are: |
236 |
<th>Meaning</th> |
237 |
</tr> |
238 |
<tr> |
239 |
- <ti><c>>=app-misc/foo-1.23</c></ti> |
240 |
+ <ti><c>>=app-misc/foo-1.23</c></ti> |
241 |
<ti>Version 1.23 or later is required.</ti> |
242 |
</tr> |
243 |
<tr> |
244 |
- <ti><c>>app-misc/foo-1.23</c></ti> |
245 |
+ <ti><c>>app-misc/foo-1.23</c></ti> |
246 |
<ti>A version strictly later than 1.23 is required.</ti> |
247 |
</tr> |
248 |
<tr> |
249 |
@@ -366,7 +366,7 @@ To depend on a specific version or version-range within a SLOT we use: |
250 |
|
251 |
<codesample lang="ebuild"> |
252 |
DEPEND="qt3? ( ~x11-libs/qt-3.3.8:3 ) |
253 |
- gtk? ( >=x11-libs/gtk+-2.24.9:2 ) |
254 |
+ gtk? ( >=x11-libs/gtk+-2.24.9:2 ) |
255 |
</codesample> |
256 |
</body> |
257 |
|
258 |
@@ -453,12 +453,12 @@ DEPEND="!build? ( |
259 |
x11-libs/libXtst |
260 |
x11-proto/xproto |
261 |
x11-proto/xextproto |
262 |
- >=x11-libs/gtk+-2.2 |
263 |
+ >=x11-libs/gtk+-2.2 |
264 |
x11-libs/pango |
265 |
) |
266 |
- >=media-libs/libart_lgpl-2.1 |
267 |
+ >=media-libs/libart_lgpl-2.1 |
268 |
) |
269 |
- >=sys-libs/ncurses-5.2-r2 |
270 |
+ >=sys-libs/ncurses-5.2-r2 |
271 |
nls? ( sys-devel/gettext ) |
272 |
)" |
273 |
</codesample> |
274 |
|
275 |
diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml |
276 |
index 0d67e6a..61b8618 100644 |
277 |
--- a/general-concepts/mirrors/text.xml |
278 |
+++ b/general-concepts/mirrors/text.xml |
279 |
@@ -59,7 +59,7 @@ is necessary, please use <c>SRC_URI</c> arrow to rename the file. For example: |
280 |
|
281 |
<codesample lang="ebuild"> |
282 |
# upstream updated the distfile in place, so suffix it with _YYYYMMDD |
283 |
-SRC_URI="https://example.com/badupstream/${P}.tar.gz -> ${P}_20191016.tar.gz" |
284 |
+SRC_URI="https://example.com/badupstream/${P}.tar.gz -> ${P}_20191016.tar.gz" |
285 |
</codesample> |
286 |
|
287 |
<p> |
288 |
|
289 |
diff --git a/general-concepts/portage-cache/text.xml b/general-concepts/portage-cache/text.xml |
290 |
index 13dcfae..ba9c0fa 100644 |
291 |
--- a/general-concepts/portage-cache/text.xml |
292 |
+++ b/general-concepts/portage-cache/text.xml |
293 |
@@ -19,7 +19,7 @@ So, the following will not work: |
294 |
# DO NOT DO THIS! |
295 |
if ! has_version "x11-libs/gtk+" ; then |
296 |
DEPEND="${DEPEND} |
297 |
- gtk? ( >=x11-libs/gtk+-2 ) |
298 |
+ gtk? ( >=x11-libs/gtk+-2 ) |
299 |
!gtk? ( =x11-libs/gtk+-1.2* )" |
300 |
fi |
301 |
</codesample> |
302 |
|
303 |
diff --git a/general-concepts/use-flags/text.xml b/general-concepts/use-flags/text.xml |
304 |
index 295bb8f..c591aaa 100644 |
305 |
--- a/general-concepts/use-flags/text.xml |
306 |
+++ b/general-concepts/use-flags/text.xml |
307 |
@@ -140,7 +140,7 @@ handle this by doing something like: |
308 |
</p> |
309 |
|
310 |
<codesample lang="ebuild"> |
311 |
-RDEPEND="x86? ( fakemedia? ( >=media-libs/fakemedia-1.1 ) )" |
312 |
+RDEPEND="x86? ( fakemedia? ( >=media-libs/fakemedia-1.1 ) )" |
313 |
</codesample> |
314 |
|
315 |
<p> |
316 |
@@ -175,7 +175,7 @@ and wouldn't break anything: |
317 |
</p> |
318 |
|
319 |
<codesample lang="ebuild"> |
320 |
-RDEPEND="fakemedia? ( >=media-libs/fakemedia-1-1 )" |
321 |
+RDEPEND="fakemedia? ( >=media-libs/fakemedia-1-1 )" |
322 |
</codesample> |
323 |
|
324 |
<p> |
325 |
|
326 |
diff --git a/general-concepts/virtuals/text.xml b/general-concepts/virtuals/text.xml |
327 |
index bcea98d..b9889aa 100644 |
328 |
--- a/general-concepts/virtuals/text.xml |
329 |
+++ b/general-concepts/virtuals/text.xml |
330 |
@@ -30,7 +30,7 @@ DESCRIPTION="Virtual for C++ tr1 <type_traits>" |
331 |
SLOT="0" |
332 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd" |
333 |
|
334 |
-RDEPEND="|| ( >=sys-devel/gcc-4.1 dev-libs/boost )" |
335 |
+RDEPEND="|| ( >=sys-devel/gcc-4.1 dev-libs/boost )" |
336 |
</codesample> |
337 |
|
338 |
<p> |
339 |
|
340 |
diff --git a/quickstart/text.xml b/quickstart/text.xml |
341 |
index 1655f8d..4cab04a 100644 |
342 |
--- a/quickstart/text.xml |
343 |
+++ b/quickstart/text.xml |
344 |
@@ -373,17 +373,17 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" |
345 |
IUSE="crypt imlib ipv6 ldap nls pda ssl xface" |
346 |
|
347 |
RDEPEND="=x11-libs/gtk+-2* |
348 |
- crypt? ( >=app-crypt/gpgme-0.4.5 ) |
349 |
+ crypt? ( >=app-crypt/gpgme-0.4.5 ) |
350 |
imlib? ( media-libs/imlib2 ) |
351 |
- ldap? ( >=net-nds/openldap-2.0.11 ) |
352 |
+ ldap? ( >=net-nds/openldap-2.0.11 ) |
353 |
pda? ( app-pda/jpilot ) |
354 |
ssl? ( dev-libs/openssl ) |
355 |
- xface? ( >=media-libs/compface-1.4 ) |
356 |
+ xface? ( >=media-libs/compface-1.4 ) |
357 |
app-misc/mime-types |
358 |
x11-misc/shared-mime-info" |
359 |
DEPEND="${RDEPEND} |
360 |
dev-util/pkgconfig |
361 |
- nls? ( >=sys-devel/gettext-0.12.1 )" |
362 |
+ nls? ( >=sys-devel/gettext-0.12.1 )" |
363 |
|
364 |
src_prepare() { |
365 |
eapply "${FILESDIR}"/${PN}-namespace.diff \ |
366 |
|
367 |
diff --git a/tools-reference/find/text.xml b/tools-reference/find/text.xml |
368 |
index 1746a72..e5942b2 100644 |
369 |
--- a/tools-reference/find/text.xml |
370 |
+++ b/tools-reference/find/text.xml |
371 |
@@ -124,7 +124,7 @@ Useful rules include: |
372 |
</table> |
373 |
|
374 |
<note> |
375 |
-EAPI>=5 assumes GNU find, so it is safe to use GNU extensions in |
376 |
+EAPI>=5 assumes GNU find, so it is safe to use GNU extensions in |
377 |
ebuild context for those EAPIs. |
378 |
</note> |
379 |
|
380 |
|
381 |
diff --git a/tools-reference/sed/text.xml b/tools-reference/sed/text.xml |
382 |
index fc0e78e..46e0a2e 100644 |
383 |
--- a/tools-reference/sed/text.xml |
384 |
+++ b/tools-reference/sed/text.xml |
385 |
@@ -50,7 +50,7 @@ from the plugin files and convert it to Vim help format. |
386 |
# problems for us during the unmerge. Fortunately, sed can fix this |
387 |
# for us. First, we extract the documentation: |
388 |
sed -e '1,/^" HelpExtractorDoc:$/d' \ |
389 |
- "${S}"/plugin/ZoomWin.vim > ${S}/doc/ZoomWin.txt \ |
390 |
+ "${S}"/plugin/ZoomWin.vim > ${S}/doc/ZoomWin.txt \ |
391 |
|| die "help extraction failed" |
392 |
# Then we remove the help extraction code from the plugin file: |
393 |
sed -i -e '/^" HelpExtractor:$/,$d' "${S}"/plugin/ZoomWin.vim \ |
394 |
@@ -65,7 +65,7 @@ constructs are specific to <c>GNU sed 4</c> <d/> on non-GNU userland archs, the |
395 |
guaranteed to be installed as part of <c>@system</c>. This was not |
396 |
always the case, |
397 |
which is why some packages, particularly those which use <c>sed -i</c>, have |
398 |
-<c>DEPEND</c> s upon <c>>=sys-apps/sed-4</c>. |
399 |
+<c>DEPEND</c> s upon <c>>=sys-apps/sed-4</c>. |
400 |
</p> |
401 |
</body> |
402 |
|
403 |
@@ -82,7 +82,7 @@ sed [ option flags ] \ |
404 |
-e 'first command' \ |
405 |
-e 'second command' \ |
406 |
-e 'and so on' \ |
407 |
- input-file > output-file \ |
408 |
+ input-file > output-file \ |
409 |
|| die "Oops, sed didn't work!" |
410 |
</codesample> |
411 |
|
412 |
|
413 |
diff --git a/xsl/lang.highlight.c.xsl b/xsl/lang.highlight.c.xsl |
414 |
index 730182c..089de50 100644 |
415 |
--- a/xsl/lang.highlight.c.xsl |
416 |
+++ b/xsl/lang.highlight.c.xsl |
417 |
@@ -59,7 +59,7 @@ |
418 |
</span> |
419 |
</xsl:when> |
420 |
|
421 |
- <xsl:when test="$commentOpen != $commentClosed and position() > $commentOpen"> |
422 |
+ <xsl:when test="$commentOpen != $commentClosed and position() > $commentOpen"> |
423 |
<span class="Comment"><xsl:value-of select="."/></span> |
424 |
</xsl:when> |
425 |
|
426 |
|
427 |
diff --git a/xsl/lang.highlight.ebuild.xsl b/xsl/lang.highlight.ebuild.xsl |
428 |
index 9f90fb1..bbf9c64 100644 |
429 |
--- a/xsl/lang.highlight.ebuild.xsl |
430 |
+++ b/xsl/lang.highlight.ebuild.xsl |
431 |
@@ -390,7 +390,7 @@ |
432 |
<!-- See if we should be processing comments by now; we need to test for |
433 |
two possible cases: * commentSeeker != 0 (so we have a comment), or, |
434 |
* the first token is a "#" --> |
435 |
- <xsl:when test="($commentSeeker != 0 and position() > $commentSeeker) or substring(../*[position()=1], 1, 1) = $lang.highlight.ebuild.commentChar or |
436 |
+ <xsl:when test="($commentSeeker != 0 and position() > $commentSeeker) or substring(../*[position()=1], 1, 1) = $lang.highlight.ebuild.commentChar or |
437 |
. = $lang.highlight.ebuild.commentChar"> |
438 |
<span class="Comment"><xsl:value-of select="."/></span> |
439 |
</xsl:when> |