* [gentoo-commits] proj/devmanual:master commit in: appendices/devbook-guide/, ebuild-writing/functions/src_unpack/, ...
@ 2024-11-12 18:20 Ulrich Müller
0 siblings, 0 replies; only message in thread
From: Ulrich Müller @ 2024-11-12 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 754d52d8106c20ca8034ee22dbb4865e7f91d776
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 16:56:17 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 06:56:59 2024 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=754d52d8
Rename "contentsTree" element to "contents"
For consistency; this was the only element using camelCase.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
appendices/devbook-guide/text.xml | 4 ++--
appendices/editor-configuration/text.xml | 2 +-
appendices/text.xml | 2 +-
appendices/todo-list/text.xml | 2 +-
archs/text.xml | 2 +-
depend.xsl | 2 +-
devbook.rnc | 4 ++--
devbook.rng | 6 +++---
devbook.xsl | 12 ++++++------
ebuild-maintenance/text.xml | 2 +-
ebuild-writing/functions/src_compile/text.xml | 2 +-
ebuild-writing/functions/src_configure/text.xml | 2 +-
ebuild-writing/functions/src_install/text.xml | 2 +-
ebuild-writing/functions/src_prepare/text.xml | 2 +-
ebuild-writing/functions/src_unpack/text.xml | 2 +-
ebuild-writing/functions/text.xml | 2 +-
ebuild-writing/misc-files/text.xml | 2 +-
ebuild-writing/text.xml | 2 +-
function-reference/text.xml | 2 +-
general-concepts/text.xml | 2 +-
profiles/text.xml | 2 +-
tasks-reference/text.xml | 2 +-
text.xml | 4 ++--
tools-reference/text.xml | 2 +-
24 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/appendices/devbook-guide/text.xml b/appendices/devbook-guide/text.xml
index ca0dfae..b8f62e2 100644
--- a/appendices/devbook-guide/text.xml
+++ b/appendices/devbook-guide/text.xml
@@ -125,7 +125,7 @@ tag. Note that the trailing slash in the <c>href</c> value is mandatory.
</p>
<p>
-A table of contents can be generated with <c><contentsTree></c>.
+A table of contents can be generated with <c><contents/></c>.
Typically, this would be the only element in its own section body, as in
the following example:
</p>
@@ -134,7 +134,7 @@ the following example:
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</codesample>
diff --git a/appendices/editor-configuration/text.xml b/appendices/editor-configuration/text.xml
index 5ceaf86..687bf01 100644
--- a/appendices/editor-configuration/text.xml
+++ b/appendices/editor-configuration/text.xml
@@ -14,7 +14,7 @@ with ebuilds.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/appendices/text.xml b/appendices/text.xml
index e59fe05..0d50500 100644
--- a/appendices/text.xml
+++ b/appendices/text.xml
@@ -12,7 +12,7 @@ This section incorporates various auxiliary documents which may be useful as a r
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/appendices/todo-list/text.xml b/appendices/todo-list/text.xml
index 767e457..f8c6ede 100644
--- a/appendices/todo-list/text.xml
+++ b/appendices/todo-list/text.xml
@@ -7,7 +7,7 @@
This TODO list is automatically generated from the <c><todo></c> directives in other documents.
</p>
-<contentsTree root="" extraction="todo"/>
+<contents root="" extraction="todo"/>
</body>
</chapter>
</devbook>
diff --git a/archs/text.xml b/archs/text.xml
index 82712d5..acfebb4 100644
--- a/archs/text.xml
+++ b/archs/text.xml
@@ -22,7 +22,7 @@ happens to work best in any situation.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/depend.xsl b/depend.xsl
index 99007f9..7ee22e6 100644
--- a/depend.xsl
+++ b/depend.xsl
@@ -12,7 +12,7 @@
<xsl:template match="/">
<xsl:variable name="refs">
<!-- all descendants -->
- <xsl:call-template name="contentsTree"/>
+ <xsl:call-template name="contents"/>
<!-- all ancestors -->
<xsl:call-template name="printParentDocs"/>
<!-- previous and next documents -->
diff --git a/devbook.rnc b/devbook.rnc
index b9907f5..0097a97 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -33,7 +33,7 @@ subsubsection = element subsubsection { title, body }
# Title texts are used as anchors, so allow only text attributes
title = element title { attrib }
-body = element body { (authors | contentsTree | block.class)+ }
+body = element body { (authors | contents | block.class)+ }
authors = element authors { author+ | authorlist+ }
@@ -48,7 +48,7 @@ authorlist = element authorlist {
attribute href { text }
}
-contentsTree = element contentsTree {
+contents = element contents {
attribute maxdepth { xsd:unsignedInt }?,
attribute root { text }?,
attribute extraction { text }?
diff --git a/devbook.rng b/devbook.rng
index 2fbf058..020f9ec 100644
--- a/devbook.rng
+++ b/devbook.rng
@@ -136,7 +136,7 @@
<oneOrMore>
<choice>
<ref name="authors"/>
- <ref name="contentsTree"/>
+ <ref name="contents"/>
<ref name="block.class"/>
</choice>
</oneOrMore>
@@ -169,8 +169,8 @@
<attribute name="href"/>
</element>
</define>
- <define name="contentsTree">
- <element name="contentsTree">
+ <define name="contents">
+ <element name="contents">
<optional>
<attribute name="maxdepth">
<data type="unsignedInt"/>
diff --git a/devbook.xsl b/devbook.xsl
index 2c74182..529365c 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -429,7 +429,7 @@
</xsl:template>
<!-- TOC Tree -->
-<xsl:template match="contentsTree" name="contentsTree">
+<xsl:template match="contents" name="contents">
<xsl:param name="depth" select="0"/>
<xsl:param name="maxdepth">
<xsl:choose>
@@ -463,7 +463,7 @@
<xsl:for-each select="document($doc_self)/devbook/include">
<count value="{count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])}"
path="{concat($path, @href)}">
- <xsl:call-template name="contentsTree">
+ <xsl:call-template name="contents">
<xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="maxdepth" select="$maxdepth"/>
<xsl:with-param name="path" select="concat($path, @href)"/>
@@ -479,7 +479,7 @@
<ul>
<xsl:for-each select="document($doc_self)/devbook/include">
<xsl:variable name="extraction_counter_node">
- <xsl:call-template name="contentsTree">
+ <xsl:call-template name="contents">
<xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="maxdepth" select="$maxdepth"/>
<xsl:with-param name="path" select="concat($path, @href)"/>
@@ -513,7 +513,7 @@
</xsl:for-each>
</ul>
</xsl:if>
- <xsl:call-template name="contentsTree">
+ <xsl:call-template name="contents">
<xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="maxdepth" select="$maxdepth"/>
<xsl:with-param name="path" select="concat($path, @href)"/>
@@ -637,11 +637,11 @@
<xsl:if test="/devbook/include">
<li class="divider"><xsl:comment/></li>
<!-- List any sub-documents included at first level.
- We cannot call "contentsTree" directly, because it would
+ We cannot call "contents" directly, because it would
insert another "ul" element. So, assign it to a variable,
then copy only the "li" nodes. -->
<xsl:variable name="contents">
- <xsl:call-template name="contentsTree">
+ <xsl:call-template name="contents">
<xsl:with-param name="maxdepth" select="1"/>
</xsl:call-template>
</xsl:variable>
diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml
index 7142992..16e2e71 100644
--- a/ebuild-maintenance/text.xml
+++ b/ebuild-maintenance/text.xml
@@ -15,7 +15,7 @@ familiar with.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/ebuild-writing/functions/src_compile/text.xml b/ebuild-writing/functions/src_compile/text.xml
index 6c65a89..96069b5 100644
--- a/ebuild-writing/functions/src_compile/text.xml
+++ b/ebuild-writing/functions/src_compile/text.xml
@@ -79,7 +79,7 @@ The following subsections cover different topics which often occur when writing
<c>src_compile</c> functions.
</p>
-<contentsTree/>
+<contents/>
</body>
</section>
diff --git a/ebuild-writing/functions/src_configure/text.xml b/ebuild-writing/functions/src_configure/text.xml
index cf1e44b..f1b5068 100644
--- a/ebuild-writing/functions/src_configure/text.xml
+++ b/ebuild-writing/functions/src_configure/text.xml
@@ -78,7 +78,7 @@ The following subsections cover different topics which often occur when writing
<c>src_configure</c> functions.
</p>
-<contentsTree/>
+<contents/>
</body>
</section>
diff --git a/ebuild-writing/functions/src_install/text.xml b/ebuild-writing/functions/src_install/text.xml
index 1cf9dcc..0df91dd 100644
--- a/ebuild-writing/functions/src_install/text.xml
+++ b/ebuild-writing/functions/src_install/text.xml
@@ -229,7 +229,7 @@ The following subsections cover different topics which often occur when writing
<c>src_install</c> functions.
</p>
-<contentsTree/>
+<contents/>
</body>
</section>
diff --git a/ebuild-writing/functions/src_prepare/text.xml b/ebuild-writing/functions/src_prepare/text.xml
index bce7153..325ffc8 100644
--- a/ebuild-writing/functions/src_prepare/text.xml
+++ b/ebuild-writing/functions/src_prepare/text.xml
@@ -90,7 +90,7 @@ The following subsections cover different topics which often occur
when writing <c>src_prepare</c> functions.
</p>
-<contentsTree/>
+<contents/>
</body>
</section>
diff --git a/ebuild-writing/functions/src_unpack/text.xml b/ebuild-writing/functions/src_unpack/text.xml
index c5978e4..5befab1 100644
--- a/ebuild-writing/functions/src_unpack/text.xml
+++ b/ebuild-writing/functions/src_unpack/text.xml
@@ -116,7 +116,7 @@ The following subsections cover different topics which often occur when writing
<c>src_unpack</c> functions.
</p>
-<contentsTree/>
+<contents/>
</body>
</section>
diff --git a/ebuild-writing/functions/text.xml b/ebuild-writing/functions/text.xml
index eded3e7..c513658 100644
--- a/ebuild-writing/functions/text.xml
+++ b/ebuild-writing/functions/text.xml
@@ -109,7 +109,7 @@ during the <c>src_compile</c> phase is equivalent to a call to the
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/ebuild-writing/misc-files/text.xml b/ebuild-writing/misc-files/text.xml
index b871548..a98ba69 100644
--- a/ebuild-writing/misc-files/text.xml
+++ b/ebuild-writing/misc-files/text.xml
@@ -12,7 +12,7 @@ This section contains some notes on various miscellaneous files.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/ebuild-writing/text.xml b/ebuild-writing/text.xml
index 4fdd99d..7b944af 100644
--- a/ebuild-writing/text.xml
+++ b/ebuild-writing/text.xml
@@ -14,7 +14,7 @@ with some general notes and extended examples.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/function-reference/text.xml b/function-reference/text.xml
index 64fa8fa..beb480c 100644
--- a/function-reference/text.xml
+++ b/function-reference/text.xml
@@ -12,7 +12,7 @@ The following functions are available for use in ebuilds:
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/general-concepts/text.xml b/general-concepts/text.xml
index eb35697..85a9af7 100644
--- a/general-concepts/text.xml
+++ b/general-concepts/text.xml
@@ -13,7 +13,7 @@ writing ebuilds or working with the Gentoo repository.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
diff --git a/profiles/text.xml b/profiles/text.xml
index e55f6f0..b7ead8c 100644
--- a/profiles/text.xml
+++ b/profiles/text.xml
@@ -19,7 +19,7 @@ Portage-specific behaviour must not be relied upon in the repository.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/tasks-reference/text.xml b/tasks-reference/text.xml
index a9dad03..6747f6f 100644
--- a/tasks-reference/text.xml
+++ b/tasks-reference/text.xml
@@ -13,7 +13,7 @@ ebuilds.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/text.xml b/text.xml
index b404271..4404784 100644
--- a/text.xml
+++ b/text.xml
@@ -25,14 +25,14 @@ section lists specific contributions to this manual.
<section>
<title>Contents</title>
<body>
-<contentsTree maxdepth="1"/>
+<contents maxdepth="1"/>
</body>
</section>
<section>
<title>Full contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
diff --git a/tools-reference/text.xml b/tools-reference/text.xml
index 1bfb93a..761a783 100644
--- a/tools-reference/text.xml
+++ b/tools-reference/text.xml
@@ -20,7 +20,7 @@ when using these tools in ebuilds.
<section>
<title>Contents</title>
<body>
-<contentsTree/>
+<contents/>
</body>
</section>
</chapter>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-11-12 18:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-12 18:20 [gentoo-commits] proj/devmanual:master commit in: appendices/devbook-guide/, ebuild-writing/functions/src_unpack/, Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox