[gentoo-commits] proj/devmanual:master commit in: appendices/contributing/devbook-guide/

[Ulrich Müller]

commit:     6a1c35efce4347c22c94680e39a84d3f1df794d0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 17:25:41 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 11:32:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6a1c35ef

devbook-guide: Don't mention caption as attribute of <pre>.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 appendices/contributing/devbook-guide/text.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/appendices/contributing/devbook-guide/text.xml 
b/appendices/contributing/devbook-guide/text.xml
index 5aa5525..672a083 100644
--- a/appendices/contributing/devbook-guide/text.xml
+++ b/appendices/contributing/devbook-guide/text.xml
@@ -189,7 +189,7 @@ This is a paragraph.  &lt;path&gt;/etc/passwd&lt;/path&gt; 
is a file.
 Type &lt;c&gt;ls&lt;/c&gt; if you feel like it.  I &lt;e&gt;really&lt;/e&gt; 
want to go to sleep now.
 &lt;/p&gt;
 
-&lt;pre caption="Code Sample"&gt;
+&lt;pre&gt;
 This is text output or code.
 # &lt;i&gt;this is user input&lt;/i&gt;
 
@@ -257,12 +257,11 @@ only tags that should appear immediately inside a 
<c>&lt;body&gt;</c> element.
 Another thing -- these tags <e>should not</e> be stacked -- in other words,
 don't put a <c>&lt;note&gt;</c> element inside a <c>&lt;p&gt;</c> element. As
 you might guess, the <c>&lt;pre&gt;</c> element preserves its whitespace
-exactly, making it well-suited for code excerpts.  You must name the
-<c>&lt;pre&gt;</c> tag with a <c>caption</c> attribute:
+exactly, making it well-suited for code excerpts:
 </p>
 
 <codesample lang="sgml"><!-- Named &lt;pre&gt; -->
-&lt;pre caption="Output of uptime"&gt;
+&lt;pre&gt;
 # &lt;i&gt;uptime&lt;/i&gt;
 16:50:47 up 164 days,  2:06,  5 users,  load average: 0.23, 0.20, 0.25
 &lt;/pre&gt;
@@ -551,8 +550,8 @@ and the attribute value. As an example:
 </p>
 
 <codesample lang="sgml"><!-- Attributes -->
-Wrong  :     &lt;pre caption = "Attributes"&gt;
-Correct:     &lt;pre caption="Attributes"&gt;
+Wrong  :     &lt;uri link = "https://forums.gentoo.org/"&gt;
+Correct:     &lt;uri link="https://forums.gentoo.org/"&gt;
 </codesample>
 
 </body>
@@ -580,10 +579,6 @@ with a capital letter.
 &lt;/ul&gt;
 </codesample>
 
-<p>
-Code Listings should <e>always</e> have a <c>caption</c>.
-</p>
-
 <p>
 Try to use <c>&lt;uri&gt;</c> with the <c>link</c> attribute as much as
 possible. In other words, the <uri link="https://forums.gentoo.org";>Gentoo