commit: d97e0f8c27e2a8f95a57bdc88455fa84ecf3d3ea Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Wed Dec 4 14:29:16 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Dec 8 11:32:02 2019 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d97e0f8c
Fix <body> elements. No sectioning elements are allowed inside <body>, according to the devbook guide. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> appendices/common-problems/text.xml | 8 +++----- appendices/contributing/text.xml | 9 ++++----- appendices/further-reading/text.xml | 3 +-- archs/alpha/text.xml | 3 +-- archs/amd64/text.xml | 21 ++++--------------- archs/mips/text.xml | 3 +-- archs/ppc/text.xml | 3 +-- archs/sparc/text.xml | 3 +-- archs/x86/text.xml | 3 +-- ebuild-maintenance/git/text.xml | 10 +-------- ebuild-maintenance/maintenance-tasks/text.xml | 6 +----- ebuild-writing/common-mistakes/text.xml | 29 ++++++++++++++++++++------- ebuild-writing/eapi/text.xml | 19 ++---------------- ebuild-writing/functions/src_compile/text.xml | 6 ++---- ebuild-writing/misc-files/metadata/text.xml | 7 +++---- ebuild-writing/misc-files/patches/text.xml | 2 +- ebuild-writing/variables/text.xml | 2 +- eclass-writing/text.xml | 4 +--- general-concepts/dependencies/text.xml | 15 +++++--------- general-concepts/filesystem/text.xml | 3 +-- general-concepts/licenses/text.xml | 3 +-- general-concepts/manifest/text.xml | 4 ---- general-concepts/package-maintainers/text.xml | 3 +-- general-concepts/projects/text.xml | 3 +-- hosted-projects/text.xml | 3 +-- keywording/text.xml | 6 ++---- tasks-reference/completion/text.xml | 3 +-- tasks-reference/pam/text.xml | 3 +-- tools-reference/bash/text.xml | 9 ++------- tools-reference/cat/text.xml | 3 +-- tools-reference/echo/text.xml | 3 +-- tools-reference/head-and-tail/text.xml | 2 +- tools-reference/sed/text.xml | 6 +----- 33 files changed, 71 insertions(+), 139 deletions(-) diff --git a/appendices/common-problems/text.xml b/appendices/common-problems/text.xml index 992f863..3af479b 100644 --- a/appendices/common-problems/text.xml +++ b/appendices/common-problems/text.xml @@ -8,6 +8,7 @@ This page provides suggestions on how to handle various commonly seen errors and QA notices. </p> +</body> <section> <title>Handling QA Notices</title> @@ -24,6 +25,7 @@ substitute for proper testing and QA by developers. Some eclasses output messages in the same format. These are not covered here. </note> +</body> <subsection> <title>QA Notice -- USE Flag foo not in IUSE</title> @@ -150,9 +152,6 @@ you see this notice locally. If you see this notice when working with a pure <c>emerge sync</c> over <c>rsync</c> setup, it is probably a genuine issue. </p> -</body> -</subsection> - <todo> from vapier: TEXTREL's ... binary files which contain text relocations ... see @@ -165,6 +164,7 @@ directories Executable stacks ... binary files whose stack is marked with </todo> </body> +</subsection> </section> <section> @@ -223,7 +223,5 @@ by tricking the build system into using a safer location. See </body> </section> - -</body> </chapter> </guide> diff --git a/appendices/contributing/text.xml b/appendices/contributing/text.xml index 72db911..4b65c41 100644 --- a/appendices/contributing/text.xml +++ b/appendices/contributing/text.xml @@ -31,8 +31,9 @@ can also view the XML of any page by replacing <c>index.html</c> with <c>text.xml</c> in the URL. If you'd rather just work with plain text, that's fine too <d/> the formatting can be easily done by someone else (meaning, us). </p> +</body> -<subsection> +<section> <title>Where to find the sources</title> <body> @@ -56,9 +57,7 @@ the repository. You need <c>xsltproc</c> (from conversion used in some of the figures throughout the document. </p> </body> -</subsection> - -</body> +</section> <section> <title>Quick Introduction to DevBook XML</title> @@ -71,6 +70,7 @@ occur in layout which are designed to make a large-scale publication easier to produce and manage using a hierarchical tree system. Before starting off you really should first examine the GuideXML guide in a reasonable amount of depth. </p> +</body> <subsection> <title>Differences from GuideXML</title> @@ -114,7 +114,6 @@ really should first examine the GuideXML guide in a reasonable amount of depth. </body> </subsection> -</body> </section> <section> diff --git a/appendices/further-reading/text.xml b/appendices/further-reading/text.xml index f0e75da..d48277c 100644 --- a/appendices/further-reading/text.xml +++ b/appendices/further-reading/text.xml @@ -8,6 +8,7 @@ This section lists some recommended further reading. These are real recommendations, not padding designed to make this document look important. </p> +</body> <section> <title>Books</title> @@ -59,8 +60,6 @@ recommendations, not padding designed to make this document look important. </body> </section> - -</body> </chapter> </guide> diff --git a/archs/alpha/text.xml b/archs/alpha/text.xml index dec4eef..da13385 100644 --- a/archs/alpha/text.xml +++ b/archs/alpha/text.xml @@ -9,6 +9,7 @@ The Alpha port uses the <c>alpha</c> keyword. It focuses upon HP (formerly Compa (formerly DEC)) hardware. This covers from <c>ev4</c> (known as 21064) through <c>ev7z</c> (known as 21364a). </p> +</body> <section> <title>Alpha Kernel and Userland ABIs</title> @@ -153,7 +154,5 @@ The Alpha team can be contacted: </body> </section> - -</body> </chapter> </guide> diff --git a/archs/amd64/text.xml b/archs/amd64/text.xml index 366959d..392999b 100644 --- a/archs/amd64/text.xml +++ b/archs/amd64/text.xml @@ -2,7 +2,6 @@ <guide self="archs/amd64/"> <chapter> <title>Arch Specific Notes -- AMD64/EM64T</title> -<body> <section> <title>Position Independent Code Issues</title> @@ -20,6 +19,7 @@ with an error message like this: foo.o: relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC </pre> +</body> <subsection> <title>How to fix -fPIC issues</title> @@ -29,6 +29,7 @@ object; recompile with -fPIC There are several ways to enforce <c>-fPIC</c> on shared objects, each with its pros and cons. </p> +</body> <subsubsection> <title><c>sed</c>'ing the Makefile</title> @@ -54,8 +55,6 @@ This is more readable, and easier to send upstream. </body> </subsubsection> - -</body> </subsection> <subsection> @@ -76,8 +75,6 @@ done. It should only be applied to shared objects. </body> </subsection> - -</body> </section> <section> @@ -93,10 +90,10 @@ go to <c>/lib32</c> respectively <c>/usr/lib32</c>, the 64bit ones normally to < <c>/usr/lib64</c>. In a perfect world, you wouldn't have to read on. Unfortunately, that's not the case, and so it's a bit more complicated. </p> +</body> <subsection> <title>Multilib-Toolchain</title> -<body> <subsubsection> <title>GCC</title> @@ -129,8 +126,6 @@ To understand how this is done in the ebuild, read </body> </subsubsection> - -</body> </subsection> <subsection> @@ -322,6 +317,7 @@ into anything other than <c>(/usr)/lib64</c>. this behaviour is controlled by the <c>MULTILIB_STRICT_EXEMPT</c> variable in <c>make.profile</c>. </p> +</body> <subsubsection> <title>How to fix ebuilds properly</title> @@ -355,8 +351,6 @@ modifications! </body> </subsubsection> - -</body> </subsection> <subsection> @@ -433,13 +427,10 @@ LIBDIR_x86="lib32" </body> </subsection> - -</body> </section> <section> <title>Porting Notes</title> -<body> <subsection> <title>Machine Word sizes</title> @@ -586,8 +577,6 @@ segmentation faults or strange behaviour. GCC 4.0 refuses to compile such code. </body> </subsection> - -</body> </section> <section> @@ -608,7 +597,5 @@ segmentation faults or strange behaviour. GCC 4.0 refuses to compile such code. </body> </section> - -</body> </chapter> </guide> diff --git a/archs/mips/text.xml b/archs/mips/text.xml index 776c15c..9d7637c 100644 --- a/archs/mips/text.xml +++ b/archs/mips/text.xml @@ -23,6 +23,7 @@ calling functions) and the size of data types. ISA stands for "Instruction Set Architecture", and refers to the instructions available and the number and types of registers for a given CPU. </note> +</body> <section> <title>MIPS ABIs</title> @@ -133,7 +134,5 @@ The MIPS team can be contacted: </body> </section> - -</body> </chapter> </guide> diff --git a/archs/ppc/text.xml b/archs/ppc/text.xml index 5ccfeff..837a526 100644 --- a/archs/ppc/text.xml +++ b/archs/ppc/text.xml @@ -9,6 +9,7 @@ The Gentoo PowerPC port uses the <c>ppc</c> keyword and maintains compatibility all 32 bit PowerPC processors. It is also used for 32 bit userland installs on 64 bit PowerPC systems. </p> +</body> <section> <title>Common issues</title> @@ -101,7 +102,5 @@ The PowerPC team can be reached by: </body> </section> - -</body> </chapter> </guide> diff --git a/archs/sparc/text.xml b/archs/sparc/text.xml index f514c86..a0fda3b 100644 --- a/archs/sparc/text.xml +++ b/archs/sparc/text.xml @@ -10,6 +10,7 @@ hardware (Sun UltraSparc systems with <c>v9</c> CPUs). <c>v8</c> processors and 2.4 kernels should still work with Gentoo, but they are no longer supported by the Gentoo/SPARC team. </p> +</body> <section> <title>SPARC Kernel and Userland ABIs</title> @@ -133,8 +134,6 @@ The SPARC team can be contacted: </body> </section> - -</body> </chapter> </guide> diff --git a/archs/x86/text.xml b/archs/x86/text.xml index e0b7894..b2cc835 100644 --- a/archs/x86/text.xml +++ b/archs/x86/text.xml @@ -17,6 +17,7 @@ contact the x86 team. If your package requires specific hardware, or a specific non-trivial setup to test, then we will probably allow you to mark it stable, unless someone on the team can test it. </p> +</body> <section> <title>x86 Team Guidelines</title> @@ -67,7 +68,5 @@ The x86 team can be contacted: </body> </section> - -</body> </chapter> </guide> diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index fb09de7..8c83344 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -10,11 +10,10 @@ development. It assumes that the readers possess basic git knowledge. For a generic guide, please see the official <uri link="https://git-scm.com/book/";>git book</uri>. </p> - +</body> <section> <title>Preparing a development checkout</title> -<body> <subsection> <title>Cloning the gentoo.git repository</title> @@ -103,13 +102,10 @@ the historical commits after the initial git commit. </body> </subsection> - -</body> </section> <section> <title>Committing to gentoo.git</title> -<body> <subsection> <title>Committing and verifying commits</title> @@ -320,10 +316,6 @@ Signed-off-by: Alice Bar <a....@example.org> </body> </subsection> - -</body> </section> - -</body> </chapter> </guide> diff --git a/ebuild-maintenance/maintenance-tasks/text.xml b/ebuild-maintenance/maintenance-tasks/text.xml index 7e73937..2b16ce3 100644 --- a/ebuild-maintenance/maintenance-tasks/text.xml +++ b/ebuild-maintenance/maintenance-tasks/text.xml @@ -9,10 +9,10 @@ This guide aims to explain common everyday ebuild maintenance routines, as well as other rarer maintenance routines which developers may not be familiar with. </p> +</body> <section> <title>Adding a new ebuild</title> -<body> <subsection> <title>What (not) to put in the Gentoo repository</title> @@ -132,8 +132,6 @@ which is often more convenient. </body> </subsection> - -</body> </section> <section> @@ -510,7 +508,5 @@ https://wiki.gentoo.org/wiki/No_homepage</uri> </body> </section> - -</body> </chapter> </guide> diff --git a/ebuild-writing/common-mistakes/text.xml b/ebuild-writing/common-mistakes/text.xml index 869676e..026e1d9 100644 --- a/ebuild-writing/common-mistakes/text.xml +++ b/ebuild-writing/common-mistakes/text.xml @@ -12,14 +12,15 @@ writing ebuilds. <section> <title>Common Ebuild Writing Mistakes</title> -<body> <subsection> <title>Invalid use of <c>static</c> use-flag</title> <body> +<p> The <c>static</c> use-flag should only be used to make a binary use static linking instead of dynamic linking. It should not be used to make a library install static libraries. Instead, the <c>static-libs</c> use-flag is used for this. +</p> </body> </subsection> @@ -43,16 +44,20 @@ See also <uri link="::ebuild-writing/variables#ROOT"/>. <title>Referencing the full path to documentation files that could be compressed</title> <body> +<p> When printing out to the users where to find files like INSTALL, do not specify the full path since <c>PORTAGE_COMPRESS</c> comes into play. The file could be compressed with gzip, bzip2, or some other random compression tool. So, instead of doing this: +</p> <codesample lang="ebuild"> elog "They are listed in /usr/share/doc/${PF}/INSTALL.gz" </codesample> +<p> Do something like: +</p> <codesample lang="ebuild"> elog "They are listed in the INSTALL file in /usr/share/doc/${PF}" @@ -63,10 +68,12 @@ elog "They are listed in the INSTALL file in /usr/share/doc/${PF}" <subsection> <title>Build log not verbose</title> <body> +<p> When writing ebuilds, you should always check the build log, because the build system might ignore CC/CXX/LD/CFLAGS/LDFLAGS and such or add undesired flags by default. In order to analyze this and have complete information, in case someone reports a bug for your package, the <b>build log must always be verbose.</b> +</p> <p> There are several ways to fix non-verbose build logs depending on the build system: </p> @@ -96,10 +103,14 @@ preferred.</note> <subsection> <title>-Werror compiler flag not removed</title> <body> +<p> "-Werror" is a flag which turns all warnings into errors and thus will abort compiling if any warning is encountered. +</p> -<p><b>Rationale</b><p /> +<p><b>Rationale</b></p> +<p> This flag is not recommended for releases and should always be disabled when encountered in build-logs, because there are numerous cases where this breaks without purpose, e.g.: +</p> <ul> <li> new warnings on version bumps of GCC/GLIBC the developer was not aware of at the point of coding @@ -117,11 +128,14 @@ This flag is not recommended for releases and should always be disabled when enc random breakage depending on what distro/architecture/library version/kernel/userland the developer was testing "-Werror" on </li> </ul> +<p> Turning off "-Werror" we will still see the warnings, but there is no reason that they cause compile failure. Also note that portage already emits QA notices about gcc warnings that can cause runtime breakage. </p> -<p><b>How to fix</b><p /> +<p><b>How to fix</b></p> +<p> To fix the affected build system you should try the following methods: +</p> <ul> <li> remove the compiler flag from the build system, <e>e.g. Makefile.am or configure.ac</e> or even provide a switch (for autotools based build systems that could be "--disable-werror", which is good for sending a patch upstream) @@ -130,14 +144,17 @@ To fix the affected build system you should try the following methods: use <e>append-flags -Wno-error</e> (needs flag-o-matic.eclass); for this to work the environment flags have to be respected and placed after build system flags; this method is not preferred as it will disable all "-Werror=specific-warning" flags as well, see next section </li> </ul> +<p> Always check that it's really gone in the build log. </p> -<p><b>Specific -Werror=... flags</b><p /> +<p><b>Specific -Werror=... flags</b></p> +<p> GCC can turn any specific warning into an error. A specific -Werror flag would be "-Werror=implicit-function-declaration" for example and will only affect warnings about implicit function declarations. It's mostly safe to leave these untouched, cause they are pinned to this issue and should not cause random build time breakage. Also, we can expect that upstream did this on purpose to avoid known runtime errors and not just for testing their builds. However you should check the specified warnings yourself or ask other developers if unsure. </p> -<p><b>Exceptions</b><p /> +<p><b>Exceptions</b></p> +<p> Removing "-Werror" from configure.ac can cause breakage in very rare cases where the configure phase relies on the exit code. See <uri link="https://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708";> @@ -423,8 +440,6 @@ at least when the ebuild hits the stable branch. </p> </body> </subsection> - -</body> </section> diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml index 884f3c1..5992c59 100644 --- a/ebuild-writing/eapi/text.xml +++ b/ebuild-writing/eapi/text.xml @@ -22,6 +22,7 @@ file adheres to. <p> This section provides usage and descriptions of the different EAPIs. </p> +</body> <section> <title>Usage of EAPIs</title> @@ -134,7 +135,6 @@ IUSE="foo +bar" <section> <title>EAPI=2</title> -<body> <subsection> <title>Helpers</title> @@ -323,8 +323,6 @@ src_compile() { </ul> </body> </subsection> - -</body> </section> <section> <title>EAPI=3</title> @@ -353,7 +351,6 @@ src_compile() { <section> <title>EAPI=4</title> -<body> <subsection> <title>Helpers</title> @@ -668,13 +665,10 @@ src_install() { </ul> </body> </subsection> - -</body> </section> <section> <title>EAPI=5</title> -<body> <subsection> <title>Metadata</title> @@ -826,13 +820,10 @@ If USE flag is set, echo [true output][true suffix] (defaults to "yes"), </ul> </body> </subsection> - -</body> </section> <section> <title>EAPI=6</title> -<body> <subsection> <title>Bash version</title> @@ -971,14 +962,11 @@ src_install() { </ul> </body> </subsection> - - -</body> </section> <section> <title>EAPI=7</title> -<body> + <subsection> <title>Terminology</title> <body> @@ -1157,9 +1145,6 @@ src_install() { </ul> </body> </subsection> -</body> </section> - -</body> </chapter> </guide> diff --git a/ebuild-writing/functions/src_compile/text.xml b/ebuild-writing/functions/src_compile/text.xml index ef713aa..757ac9e 100644 --- a/ebuild-writing/functions/src_compile/text.xml +++ b/ebuild-writing/functions/src_compile/text.xml @@ -30,7 +30,7 @@ <section> <title>Default <c>src_compile</c></title> -<body> + <subsection> <title>with EAPI=0,1</title> <body> @@ -58,12 +58,11 @@ src_compile() { </codesample> </body> </subsection> -</body> </section> <section> <title>Sample <c>src_compile</c></title> -<body> + <subsection> <title>with EAPI=0</title> <body> @@ -94,7 +93,6 @@ porting the above example to EAPI=2, you won't need to define an extra </p> </body> </subsection> -</body> </section> <section> diff --git a/ebuild-writing/misc-files/metadata/text.xml b/ebuild-writing/misc-files/metadata/text.xml index 953ffa2..56229f0 100644 --- a/ebuild-writing/misc-files/metadata/text.xml +++ b/ebuild-writing/misc-files/metadata/text.xml @@ -8,6 +8,7 @@ The <c>metadata.xml</c> file is used to specify additional data about a package or category. </p> +</body> <section> <title>Syntax</title> @@ -370,6 +371,7 @@ metadata first shall be the assignee for the bugs for that package as per <uri link="https://www.gentoo.org/glep/glep-0067.html#bug-assignment";> GLEP 67</uri>. </p> +</body> <subsection> <title>Package Metadata Examples</title> @@ -381,6 +383,7 @@ provided. These examples are based on actual package metadata files to keep things as realistic as possible. However, they may not include these files verbatim and should be taken as hypothetical examples. </p> +</body> <subsubsection> <title>Projects as Maintainers</title> @@ -613,7 +616,6 @@ specified in the <c><subslots></c> tag. </body> </subsubsection> -</body> </subsection> <subsection> <title>Maintainer-Needed</title> @@ -659,7 +661,6 @@ part of the QA reports. </body> </subsection> -</body> </section> <section> @@ -718,7 +719,5 @@ Date: Tue Sep 22 10:47:49 2015 +0200 </body> </section> - -</body> </chapter> </guide> diff --git a/ebuild-writing/misc-files/patches/text.xml b/ebuild-writing/misc-files/patches/text.xml index fe9f471..8e87c2c 100644 --- a/ebuild-writing/misc-files/patches/text.xml +++ b/ebuild-writing/misc-files/patches/text.xml @@ -49,6 +49,7 @@ If a package requires many patches, even if they are individually small, it is often best to create a patch tarball to avoid cluttering up the tree too much. </p> +</body> <section> <title>Patch Descriptions</title> @@ -108,6 +109,5 @@ from the <c>vim</c> patch tarball: </body> </section> -</body> </chapter> </guide> diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml index e50a19e..caa7cf0 100644 --- a/ebuild-writing/variables/text.xml +++ b/ebuild-writing/variables/text.xml @@ -755,6 +755,7 @@ REQUIRED_USE="|| ( foo bar baz )" See section <uri link="::general-concepts/use-flags/#conflicting-use-flags" /> for when (and when not) to use <c>REQUIRED_USE</c>. </important> +</body> <subsection> <title>EAPI 5</title> @@ -774,7 +775,6 @@ REQUIRED_USE="foo? ( !bar !baz ) bar? ( !foo !baz ) baz? ( !foo !bar )" </codesample> </body> </subsection> -</body> </section> </chapter> diff --git a/eclass-writing/text.xml b/eclass-writing/text.xml index 1bc1768..aeae19f 100644 --- a/eclass-writing/text.xml +++ b/eclass-writing/text.xml @@ -12,6 +12,7 @@ This section provides a brief introduction to eclass authoring. You should reread the <uri link="::general-concepts/overlay#Overlay and Eclasses"/> and <uri link="::general-concepts/portage-cache"/> sections before continuing. </important> +</body> <section> <title>Purpose of Eclasses</title> @@ -773,8 +774,5 @@ esac </codesample> </body> </section> - -</body> - </chapter> </guide> diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml index c91c7e9..9d44d68 100644 --- a/general-concepts/dependencies/text.xml +++ b/general-concepts/dependencies/text.xml @@ -9,6 +9,7 @@ Automatic dependency resolution is one of the most useful features provided by <c>emerge</c>. </p> +</body> <section> <title>Build Dependencies</title> @@ -137,6 +138,7 @@ DEPEND=">=dev-libs/openssl-0.9.7d" <p> This states that at least version 0.9.7d of <c>openssl</c> is required. </p> +</body> <subsection> <title>Version Specifiers</title> @@ -291,8 +293,6 @@ newer package that caused the issues. </body> </subsection> - -</body> </section> <section> @@ -322,6 +322,7 @@ To depend on a specific version or version-range within a SLOT we use: DEPEND="qt3? ( ~x11-libs/qt-3.3.8:3 ) gtk? ( >=x11-libs/gtk+-2.24.9:2 ) </codesample> +</body> <subsection> <title>Slot Operators</title> @@ -361,8 +362,6 @@ RDEPEND="media-libs/cogl:1.0= </body> </subsection> - -</body> </section> <section> @@ -442,6 +441,7 @@ To depend on either <c>foo</c> or <c>bar</c> if the <c>baz</c> <c>USE</c> flag i <codesample lang="ebuild"> DEPEND="baz? ( || ( app-misc/foo app-misc/bar ) )" </codesample> +</body> <subsection> <title>Any of Many Versus USE</title> @@ -466,8 +466,6 @@ flag is not necessary if and only if all of the following hold: </body> </subsection> - -</body> </section> <section> @@ -527,6 +525,7 @@ There are also shortcuts for conditional situations: <ti><c>bar? ( app-misc/foo[-bar] ) !bar? ( app-misc/foo[bar] )</c></ti> </tr> </table> +</body> <subsection> <title>Use dependency defaults</title> @@ -544,8 +543,6 @@ presence or absence. </body> </subsection> - -</body> </section> <section> @@ -615,7 +612,5 @@ DEPEND="test? ( dev-util/foo )" </body> </section> - -</body> </chapter> </guide> diff --git a/general-concepts/filesystem/text.xml b/general-concepts/filesystem/text.xml index 9c52cc8..ab9b354 100644 --- a/general-concepts/filesystem/text.xml +++ b/general-concepts/filesystem/text.xml @@ -63,6 +63,7 @@ is additional work for the system administrator. In particular, non-text files and files that are not intended for system administrator usage should be moved to <c>/usr/share</c>. </p> +</body> <section> <title>FHS</title> @@ -76,7 +77,5 @@ much of our policy coincides with it. </body> </section> - -</body> </chapter> </guide> diff --git a/general-concepts/licenses/text.xml b/general-concepts/licenses/text.xml index 2e1a268..d37456c 100644 --- a/general-concepts/licenses/text.xml +++ b/general-concepts/licenses/text.xml @@ -36,6 +36,7 @@ be used) then use the following syntax: <codesample lang="ebuild"> LICENSE="|| ( foo bar )" </codesample> +</body> <section> <title>License-implied restrictions</title> @@ -189,7 +190,5 @@ you are unsure as to the meaning of any part of it. </body> </section> -</body> - </chapter> </guide> diff --git a/general-concepts/manifest/text.xml b/general-concepts/manifest/text.xml index 12961da..1b8120b 100644 --- a/general-concepts/manifest/text.xml +++ b/general-concepts/manifest/text.xml @@ -3,8 +3,6 @@ <chapter> <title>Manifest</title> -<body> - <section> <title>Generating the Manifest</title> <body> @@ -74,7 +72,5 @@ package later. This will change before signing is made mandatory. </p> </body> </section> - -</body> </chapter> </guide> diff --git a/general-concepts/package-maintainers/text.xml b/general-concepts/package-maintainers/text.xml index b93798e..6684e38 100644 --- a/general-concepts/package-maintainers/text.xml +++ b/general-concepts/package-maintainers/text.xml @@ -14,6 +14,7 @@ When assigning bugs, the first maintainer listed becomes the bug's assignee and the remaining maintainers are added to CC, unless stated otherwise in the metadata. </p> +</body> <section> <title>Maintainer authority</title> @@ -87,7 +88,5 @@ providing a list of newly-unmaintained packages. </body> </section> - -</body> </chapter> </guide> diff --git a/general-concepts/projects/text.xml b/general-concepts/projects/text.xml index 0ed004b..b725ed3 100644 --- a/general-concepts/projects/text.xml +++ b/general-concepts/projects/text.xml @@ -27,6 +27,7 @@ The full listing of all the projects can be found on api.gentoo.org</uri> or on the <uri link="https://wiki.gentoo.org/wiki/Project:Gentoo";>wiki</uri>. </p> +</body> <section> <title>Starting New Projects</title> @@ -82,7 +83,5 @@ the project's email address <c>devman...@gentoo.org</c>. </body> </section> - -</body> </chapter> </guide> diff --git a/hosted-projects/text.xml b/hosted-projects/text.xml index 5a7851c..02df4c3 100644 --- a/hosted-projects/text.xml +++ b/hosted-projects/text.xml @@ -8,6 +8,7 @@ The following guidelines have been proposed for hosted projects in an attempt to prevent a repeat of the <c>genkernel</c> disaster. </p> +</body> <section> <title>Documentation Requirement</title> @@ -161,7 +162,5 @@ Good places to look for further hints include: </body> </section> - -</body> </chapter> </guide> diff --git a/keywording/text.xml b/keywording/text.xml index 1dfbc32..2149f2d 100644 --- a/keywording/text.xml +++ b/keywording/text.xml @@ -104,6 +104,7 @@ Usually, "live" ebuilds (see <uri link="::ebuild-writing/functions/src_unpack/cvs-sources"/>) do not specify a <c>KEYWORDS</c> variable, or assign the empty string to it. </note> +</body> <section> <title>Equal Visibility Requirement</title> @@ -272,7 +273,6 @@ Vulnerability Treatment Policy</uri> </p> </body> -</section> <subsection> <title> @@ -298,7 +298,7 @@ Vulnerability Treatment Policy</uri> </p> </body> </subsection> - +</section> <section> <title>Removing Package Versions</title> @@ -328,7 +328,5 @@ so that you can tidy up, file a bug. </body> </section> - -</body> </chapter> </guide> diff --git a/tasks-reference/completion/text.xml b/tasks-reference/completion/text.xml index ee2ce35..038bda5 100644 --- a/tasks-reference/completion/text.xml +++ b/tasks-reference/completion/text.xml @@ -12,6 +12,7 @@ provided you know bash already. See bash-completion-r1.eclass</uri> for how to install completion files. </p> +</body> <section> <title>Completion-Related Internal Bash Variables</title> @@ -423,8 +424,6 @@ Lines 1-12 are pretty much the same as in the previous section. </body> </section> - -</body> </chapter> </guide> diff --git a/tasks-reference/pam/text.xml b/tasks-reference/pam/text.xml index aa71a04..ed35d28 100644 --- a/tasks-reference/pam/text.xml +++ b/tasks-reference/pam/text.xml @@ -24,6 +24,7 @@ NetBSD (and hence Gentoo/FreeBSD) use OpenPAM, which is a minimal version. The different implementations can provide different authentication modules, and can differ in some details of the configuration. </p> +</body> <section> <title>Structure of a <c>pamd</c> File</title> @@ -263,7 +264,5 @@ directory. </body> </section> - -</body> </chapter> </guide> diff --git a/tools-reference/bash/text.xml b/tools-reference/bash/text.xml index 8071ce0..3c4f58d 100644 --- a/tools-reference/bash/text.xml +++ b/tools-reference/bash/text.xml @@ -8,10 +8,10 @@ A thorough understanding of <c>bash</c> programming is vital when working with ebuilds. </p> +</body> <section> <title>Bash Conditionals</title> -<body> <subsection> <title>Basic Selection</title> @@ -616,8 +616,6 @@ These should be avoided in favour of <c>[[ ]]</c> and the above operators. </body> </subsection> - -</body> </section> <section> @@ -687,6 +685,7 @@ manipulate or return information based upon variables. These can be used instead of expensive (or illegal, if we're in global scope) external calls to <c>sed</c> and friends. </p> +</body> <subsection> <title><c>bash</c> String Length</title> @@ -1038,10 +1037,6 @@ There is no <c>**=</c> assignment operator. </body> </subsection> - -</body> </section> - -</body> </chapter> </guide> diff --git a/tools-reference/cat/text.xml b/tools-reference/cat/text.xml index f2f38b7..51501ac 100644 --- a/tools-reference/cat/text.xml +++ b/tools-reference/cat/text.xml @@ -8,6 +8,7 @@ The <c>cat</c> command can be used to concatenate the contents of two or more files. The usage is <c>cat firstfile secondfile ...</c>. </p> +</body> <section> <title>Abuse of <c>cat</c></title> @@ -80,7 +81,5 @@ desired effect. </p> </body> </section> - -</body> </chapter> </guide> diff --git a/tools-reference/echo/text.xml b/tools-reference/echo/text.xml index b6da93a..ce7ec43 100644 --- a/tools-reference/echo/text.xml +++ b/tools-reference/echo/text.xml @@ -9,6 +9,7 @@ The <c>echo</c> command can be used to print strings. The standard usage is <c>echo firstString secondString ...</c>. Also, it provides additional parameters for formatting of the output. </p> +</body> <section> <title>Abuse of <c>echo</c></title> @@ -90,7 +91,5 @@ command are available in the bash man page. </body> </section> - -</body> </chapter> </guide> diff --git a/tools-reference/head-and-tail/text.xml b/tools-reference/head-and-tail/text.xml index 8e9db88..07ebd28 100644 --- a/tools-reference/head-and-tail/text.xml +++ b/tools-reference/head-and-tail/text.xml @@ -45,6 +45,7 @@ For full details, see <uri link="http://www.opengroup.org/onlinepubs/000095399/u IEEE1003.1-2004-tail</uri>. Note that tail-1 on GNU systems describes many non-portable options. </p> +</body> <section> <title>Chaining with <c>head</c> or <c>tail</c> with <c>sed</c></title> @@ -97,6 +98,5 @@ sed -n -e '123p' </body> </section> -</body> </chapter> </guide> diff --git a/tools-reference/sed/text.xml b/tools-reference/sed/text.xml index 3f7a455..61a216d 100644 --- a/tools-reference/sed/text.xml +++ b/tools-reference/sed/text.xml @@ -67,6 +67,7 @@ always the case, which is why some packages, particularly those which use <c>sed -i</c>, have <c>DEPEND</c> s upon <c>>=sys-apps/sed-4</c>. </p> +</body> <section> <title>Basic <c>sed</c> Invocation</title> @@ -415,7 +416,6 @@ the file, for example, causing your sed script to break. <section> <title>Regular Expression Atoms in <c>sed</c></title> -<body> <subsection> <title>Basic Atoms</title> @@ -772,8 +772,6 @@ Read the source, it's the only place these're documented properly... </body> </subsection> - -</body> </section> <section> @@ -899,7 +897,5 @@ symbols. </body> </section> - -</body> </chapter> </guide>
