Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/misc-files/metadata/
Date: Wed, 12 Jan 2022 06:34:10
Message-Id: 1641968936.434e6c60110c6bde6edbfd2081f2a6a913cb67e1.ulm@gentoo
1 commit: 434e6c60110c6bde6edbfd2081f2a6a913cb67e1
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 12 05:00:05 2022 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 12 06:28:56 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=434e6c60
7
8 ebuild-writing/misc-files/metadata: fix formatting, use <c> tags consistently
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11 [Whitespace changes]
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 ebuild-writing/misc-files/metadata/text.xml | 41 +++++++++++++++--------------
15 1 file changed, 21 insertions(+), 20 deletions(-)
16
17 diff --git a/ebuild-writing/misc-files/metadata/text.xml b/ebuild-writing/misc-files/metadata/text.xml
18 index 416167c..a961821 100644
19 --- a/ebuild-writing/misc-files/metadata/text.xml
20 +++ b/ebuild-writing/misc-files/metadata/text.xml
21 @@ -132,7 +132,8 @@ metadata.xml:
22 <ti>
23 This tag describes the
24 <uri link="::general-concepts/slotting">slots</uri> of a package.
25 - It has two optional subtags: &lt;slot&gt; and &lt;subslots&gt;.
26 + It has two optional subtags:
27 + <c>&lt;slot&gt;</c> and <c>&lt;subslots&gt;</c>.
28 </ti>
29 </tr>
30 <tr>
31 @@ -172,17 +173,17 @@ metadata.xml:
32 <ti><c>&lt;upstream&gt;</c></ti>
33 <ti>
34 This tag contains information about the upstream developers/project.
35 - It supports multiple optional subtags: &lt;maintainer&gt;,
36 - &lt;changelog&gt;, &lt;doc&gt;, &lt;bugs-to&gt;,
37 - and &lt;remote-id&gt;.
38 + It supports multiple optional subtags: <c>&lt;maintainer&gt;</c>,
39 + <c>&lt;changelog&gt;</c>, <c>&lt;doc&gt;</c>,
40 + <c>&lt;bugs-to&gt;,</c>, and <c>&lt;remote-id&gt;</c>.
41 </ti>
42 </tr>
43 <tr>
44 <ti><c>&lt;maintainer&gt;</c></ti>
45 <ti>
46 Provides information about the upstream maintainer. It requires a
47 - &lt;name&gt; subtag to be specified, supports an optional
48 - &lt;email&gt; subtag and an optional <c>status</c> attribute.
49 + <c>&lt;name&gt;</c> subtag to be specified, supports an optional
50 + <c>&lt;email&gt;</c> subtag and an optional <c>status</c> attribute.
51 Note that the <c>type</c> attribute <e>must not</e> be specified
52 for upstream maintainers.
53 </ti>
54 @@ -217,7 +218,7 @@ metadata.xml:
55 found. The link must not point to any third party documentation and must be
56 version independent. If the documentation is available in more than one language,
57 a lang attribute can be used which follows the same rules as the one for
58 - &lt;longdescription&gt;.
59 + <c>&lt;longdescription&gt;</c>.
60 </ti>
61 </tr>
62 <tr>
63 @@ -301,12 +302,12 @@ There are also some attributes that can be used with these tags:
64 <c>&lt;flag&gt;</c>, <c>&lt;slot&gt;</c>
65 </ti>
66 <ti>
67 - When this attribute is required on the &lt;flag&gt; tag, it
68 + When this attribute is required on the <c>&lt;flag&gt;</c> tag, it
69 simply contains the name of the USE flag. For the
70 - &lt;slot&gt; tag, it specifies the
71 + <c>&lt;slot&gt;</c> tag, it specifies the
72 <uri link="::general-concepts/slotting/#Slot Names">
73 slot name</uri> to which it applies. A slot name of <c>*</c>
74 - allows for a single &lt;slot&gt; tag to match all the slots of a
75 + allows for a single <c>&lt;slot&gt;</c> tag to match all the slots of a
76 package, in which case no other slot tags may be present.
77 </ti>
78 </tr>
79 @@ -320,7 +321,7 @@ There are also some attributes that can be used with these tags:
80 one of <c>"active"</c> or <c>"inactive"</c>. This attribute is not
81 mandatory. The absence of it shall be interpreted as
82 <c>"unknown"</c>. Please note that this attribute is only allowed
83 - for the &lt;maintainer&gt; subtags of the &lt;upstream&gt;
84 + for the <c>&lt;maintainer&gt;</c> subtags of the <c>&lt;upstream&gt;</c>
85 element!
86 </ti>
87 </tr>
88 @@ -405,7 +406,7 @@ presented. It is a simplified version of <c>metadata.xml</c> for
89 the package <c>app-office/libreoffice</c>. The package
90 maintainer is identified by the email address <c>office@g.o</c>
91 with the name <c>Gentoo Office Project</c> as specified in the
92 -optional &lt;name&gt; subtag. It also provides a long package
93 +optional <c>&lt;name&gt;</c> subtag. It also provides a long package
94 description.
95 </p>
96
97 @@ -470,9 +471,9 @@ The second example is formed after the <c>metadata.xml</c> of
98 is a developer and the other is a project. It illustrates how local
99 USE flag descriptions are specified and also contains an upstream
100 element. It is also worth pointing out the use of <c>mailto:</c>
101 -prefix in &lt;bugs-to&gt; tag due to the presence of an email address
102 +prefix in <c>&lt;bugs-to&gt;</c> tag due to the presence of an email address
103 as opposed to a URL. Conversely, email addresses specified in the
104 -&lt;email&gt; tags require no such prefix.
105 +<c>&lt;email&gt;</c> tags require no such prefix.
106 </p>
107
108 <codesample lang="sgml">
109 @@ -524,9 +525,9 @@ project. Note the use of "&amp;gt;" as opposed to "&gt;" in
110 <p>
111 The example also uses the <c>&lt;pkg&gt;</c> tag in USE flag
112 descriptions. Slot dependency specifiers are not allowed inside
113 -&lt;pkg&gt;, therefore the notation
114 -&lt;pkg&gt;sys-boot/grub&lt;/pkg&gt;<c>:2</c> is adopted as opposed to
115 -&lt;pkg&gt;sys-boot/grub<c>:2</c>&lt;/pkg&gt;.
116 +<c>&lt;pkg&gt;</c>, therefore the notation
117 +<c>&lt;pkg&gt;sys-boot/grub&lt;/pkg&gt;:2</c> is adopted as opposed to
118 +<c>&lt;pkg&gt;sys-boot/grub:2&lt;/pkg&gt;</c>.
119 </p>
120
121 <p>
122 @@ -635,9 +636,9 @@ specified in the <c>&lt;subslots&gt;</c> tag.
123 Maintainer-needed, or orphaned, packages have no maintainers
124 responsible for them. Per
125 <uri link="https://www.gentoo.org/glep/glep-0067.html#case-of-maintainer-needed-packages">
126 -GLEP 67</uri>, these packages must not contain any &lt;maintainer&gt;
127 -subtags under &lt;pkgmetadata&gt; in their <c>metadata.xml</c>. A strict test
128 -for this condition would be:
129 +GLEP 67</uri>, these packages must not contain any <c>&lt;maintainer&gt;</c>
130 +subtags under <c>&lt;pkgmetadata&gt;</c> in their <c>metadata.xml</c>. A strict
131 +test for this condition would be:
132 </p>
133
134 <pre>