commit:     ffa353428d17602c069d4cd2206a698497cc4c33
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 14:46:49 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 14:46:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ffa35342

More XML syntax fixes

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 ebuild-writing/eapi/text.xml                  | 8 ++++----
 ebuild-writing/functions/src_prepare/text.xml | 4 ++--
 function-reference/install-functions/text.xml | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml
index 8653b20..1eb82b9 100644
--- a/ebuild-writing/eapi/text.xml
+++ b/ebuild-writing/eapi/text.xml
@@ -1054,7 +1054,7 @@ src_install() {
                <p><b>Empty groupings are banned</b></p>
                <p>Groupings which are empty, such as <c>DEPEND="|| ( 
${empty_var} )"</c> will now generate an error.
                Furthermore, conditions within groupings are more strictly 
enforced.
-               Eg. <c>REQUIRED_USE="|| ( foo? ( bar ) baz? ( zoinks )"</c> 
would previously work with <c>USE="-a -b"<c> now requires
+               Eg. <c>REQUIRED_USE="|| ( foo? ( bar ) baz? ( zoinks )"</c> 
would previously work with <c>USE="-a -b"</c> now requires
                either <c>USE="foo bar"</c> or <c>USE="baz zoinks"</c>.
                </p>
        </li>
@@ -1066,7 +1066,7 @@ src_install() {
 <body>
 <ul>
        <li>
-               <p><b><c>package.provided</c> banned</b><p>
+               <p><b><c>package.provided</c> banned</b></p>
                <p>Profiles may no longer contain a <c>package.provided</c> 
file with <c>EAPI=7</c>.</p>
        </li>
 </ul>
@@ -1127,8 +1127,8 @@ src_install() {
                <p><b>New function <c>dostrip</c></b></p>
                <p>
                        The <c>dostrip</c> helper has been added with 
<c>EAPI=7</c>.
-                       This function controls whether or not to strip a 
binary.<br>
-                       <c>dostrip -x [file]</c> will exclude a binary from 
being stripped.<br>
+                       This function controls whether or not to strip a 
binary.<br />
+                       <c>dostrip -x [file]</c> will exclude a binary from 
being stripped.<br />
                        Conversely, when combined with RESTRICT=strip, 
<c>dostrip [file]</c> selects a binary
                        file to be stripped.
                </p>

diff --git a/ebuild-writing/functions/src_prepare/text.xml 
b/ebuild-writing/functions/src_prepare/text.xml
index 214dfbf..0425bb1 100644
--- a/ebuild-writing/functions/src_prepare/text.xml
+++ b/ebuild-writing/functions/src_prepare/text.xml
@@ -46,9 +46,9 @@ Beginning with EAPI=6, the src_prepare function gained a new 
default implementat
 <codesample lang="ebuild">
 src_prepare() {
     if declare -p PATCHES | grep -q "^declare -a "; then
-        [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
+        [[ -n ${PATCHES[@]} ]] &amp;&amp; eapply "${PATCHES[@]}"
     else
-        [[ -n ${PATCHES} ]] && eapply ${PATCHES}
+        [[ -n ${PATCHES} ]] &amp;&amp; eapply ${PATCHES}
     fi
     eapply_user
 }

diff --git a/function-reference/install-functions/text.xml 
b/function-reference/install-functions/text.xml
index e42b4f6..d0c8833 100644
--- a/function-reference/install-functions/text.xml
+++ b/function-reference/install-functions/text.xml
@@ -243,7 +243,7 @@ the first is the source name, the second the name to use 
when installing.
       <c>domo</c>
     </ti>
     <ti>
-      Install a Gettext <c>.mo</c> file<br>
+      Install a Gettext <c>.mo</c> file<br />
       (EAPI=7) No longer looks at the value of <c>into</c>
     </ti>
   </tr>

Reply via email to