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: appendices/devbook-guide/
Date: Fri, 06 Mar 2020 16:30:59
Message-Id: 1583511813.d7fd191af16b7ebe32ea13d5bef2c7ef1f0da538.ulm@gentoo
1 commit: d7fd191af16b7ebe32ea13d5bef2c7ef1f0da538
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 6 16:23:33 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 6 16:23:33 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d7fd191a
7
8 devbook-guide: Restore example for nested lists.
9
10 This partially reverts commit 491304c.
11
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 appendices/devbook-guide/text.xml | 40 ++++++++++++++++++++++++++++++++++-----
15 1 file changed, 35 insertions(+), 5 deletions(-)
16
17 diff --git a/appendices/devbook-guide/text.xml b/appendices/devbook-guide/text.xml
18 index 26de10e..51e8a8d 100644
19 --- a/appendices/devbook-guide/text.xml
20 +++ b/appendices/devbook-guide/text.xml
21 @@ -465,18 +465,48 @@ that you must close all tags including list items unlike in HTML.
22
23 <p>
24 Definition lists (<c>&lt;dl&gt;</c>) are also supported. Please note that
25 -neither the definition term tag (<c>&lt;dt&gt;</c>) nor the definition data tag
26 -(<c>&lt;dd&gt;</c>) accept any other block level tag such as paragraphs or
27 -admonitions. A definition list comprises:
28 +the definition term tag (<c>&lt;dt&gt;</c>) does not accept any other block
29 +level tag such as paragraphs or admonitions. A definition list comprises:
30 </p>
31
32 <dl>
33 <dt><c>&lt;dl&gt;</c></dt>
34 <dd>A <b>D</b>efinition <b>L</b>ist Tag containing</dd>
35 <dt><c>&lt;dt&gt;</c></dt>
36 - <dd><b>D</b>efinition <b>T</b>erm Tags,</dd>
37 + <dd><b>D</b>efinition <b>T</b>erm Tags</dd>
38 <dt><c>&lt;dd&gt;</c></dt>
39 - <dd>each followed by one or more <b>D</b>efinition <b>D</b>ata Tags.</dd>
40 + <dd>and <b>D</b>efinition <b>D</b>ata Tags.</dd>
41 +</dl>
42 +
43 +<p>
44 +The following example copied from
45 +<uri link="https://www.w3.org/TR/REC-html40/struct/lists.html">w3.org</uri>
46 +shows that lists may also be nested and different list types may be used
47 +together:
48 +</p>
49 +
50 +<dl>
51 + <dt>The ingredients:</dt>
52 + <dd>
53 + <ul>
54 + <li>100 g flour</li>
55 + <li>10 g sugar</li>
56 + <li>1 cup water</li>
57 + <li>2 eggs</li>
58 + <li>salt, pepper</li>
59 + </ul>
60 + </dd>
61 + <dt>The procedure:</dt>
62 + <dd>
63 + <ol>
64 + <li>Mix dry ingredients thoroughly.</li>
65 + <li>Pour in wet ingredients.</li>
66 + <li>Mix for 10 minutes.</li>
67 + <li>Bake for one hour at 300 degrees.</li>
68 + </ol>
69 + </dd>
70 + <dt>Notes:</dt>
71 + <dd>The recipe may be improved by adding raisins.</dd>
72 </dl>
73
74 </body>