CVS commit: pkgsrc/doc/guide/files

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 13 13:47:43 UTC 2024

Modified Files:
        pkgsrc/doc/guide/files: creating.xml editing.xml fixes.xml
            regression.xml using.xml

Log Message:
guide: quote ampersands


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/doc/guide/files/creating.xml
cvs rdiff -u -r1.17 -r1.18 pkgsrc/doc/guide/files/editing.xml
cvs rdiff -u -r1.197 -r1.198 pkgsrc/doc/guide/files/fixes.xml
cvs rdiff -u -r1.10 -r1.11 pkgsrc/doc/guide/files/regression.xml
cvs rdiff -u -r1.53 -r1.54 pkgsrc/doc/guide/files/using.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/guide/files/creating.xml
diff -u pkgsrc/doc/guide/files/creating.xml:1.40 pkgsrc/doc/guide/files/creating.xml:1.41
--- pkgsrc/doc/guide/files/creating.xml:1.40    Sat Jan 13 01:07:38 2024
+++ pkgsrc/doc/guide/files/creating.xml Wed Mar 13 13:47:43 2024
@@ -1,4 +1,4 @@
-<!-- $NetBSD: creating.xml,v 1.40 2024/01/13 01:07:38 gutteridge Exp $ -->
+<!-- $NetBSD: creating.xml,v 1.41 2024/03/13 13:47:43 wiz Exp $ -->
 
 <chapter id="creating">
 <title>Creating a new pkgsrc package from scratch</title>
@@ -454,7 +454,7 @@ file, adding the dependency is very easy
 .include "../../mk/bsd.pkg.mk
 </programlisting>
 
-<para>After another <command>bmake clean && bmake</command>, the answer
+<para>After another <command>bmake clean &amp;&amp; bmake</command>, the answer
 was:</para>
 
 <programlisting>

Index: pkgsrc/doc/guide/files/editing.xml
diff -u pkgsrc/doc/guide/files/editing.xml:1.17 pkgsrc/doc/guide/files/editing.xml:1.18
--- pkgsrc/doc/guide/files/editing.xml:1.17     Wed Aug 12 14:40:33 2020
+++ pkgsrc/doc/guide/files/editing.xml  Wed Mar 13 13:47:43 2024
@@ -1,4 +1,4 @@
-<!-- $NetBSD: editing.xml,v 1.17 2020/08/12 14:40:33 bacon Exp $ -->
+<!-- $NetBSD: editing.xml,v 1.18 2024/03/13 13:47:43 wiz Exp $ -->
 
 <appendix id="editing">
 <title>Editing guidelines for the pkgsrc guide</title>
@@ -66,7 +66,7 @@
        <step><para><command>(cd files &amp;&amp; cvs
        commit)</command></para></step>
 
-       <step><para>Run <command>bmake clean && bmake</command> to
+       <step><para>Run <command>bmake clean &amp;&amp; bmake</command> to
        regenerate the output files with the proper RCS
        Ids.</para></step>
 

Index: pkgsrc/doc/guide/files/fixes.xml
diff -u pkgsrc/doc/guide/files/fixes.xml:1.197 pkgsrc/doc/guide/files/fixes.xml:1.198
--- pkgsrc/doc/guide/files/fixes.xml:1.197      Fri Dec  8 19:27:08 2023
+++ pkgsrc/doc/guide/files/fixes.xml    Wed Mar 13 13:47:43 2024
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.197 2023/12/08 19:27:08 gutteridge Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.198 2024/03/13 13:47:43 wiz Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
@@ -1366,7 +1366,7 @@ GNU_CONFIGURE=    yes
 ...
 
 pre-configure:
-        set -e; cd ${WRKSRC} && autoreconf -fi
+        set -e; cd ${WRKSRC} &amp;&amp; autoreconf -fi
 ...
 </programlisting>
 
@@ -1527,7 +1527,7 @@ gnu++03, gnu++11, gnu++14, gnu++17, gnu+
 
     <orderedlist>
       <listitem><para>Generate a list of those dependencies with
-      <command>make clean && make patch && make show-go-modules >
+      <command>make clean &amp;&amp; make patch &amp;&amp; make show-go-modules >
       go-modules.mk</command>.</para></listitem>
 
       <listitem><para>Prepend
@@ -1549,7 +1549,7 @@ gnu++03, gnu++11, gnu++14, gnu++17, gnu+
 
     <orderedlist>
       <listitem><para>Generate a list of those dependencies with
-      <command>make CARGO_ARGS="build --release" build &&
+      <command>make CARGO_ARGS="build --release" build &amp;&amp;
       make print-cargo-depends > cargo-depends.mk</command>.</para></listitem>
 
       <listitem><para>Prepend
@@ -1889,7 +1889,7 @@ package is built and then pkgsrc is upda
 various hard to diagnose build errors. To clean up the situation:</para>
 
 <programlisting>
-&uprompt; (cd ../../ && cat mk/bsd.pkg.mk >/dev/null && rm -rf */*/work)
+&uprompt; (cd ../../ &amp;&amp; cat mk/bsd.pkg.mk >/dev/null &amp;&amp; rm -rf */*/work)
 </programlisting>
 
 <para>(The only purpose of the <filename>bsd.pkg.mk</filename> is to

Index: pkgsrc/doc/guide/files/regression.xml
diff -u pkgsrc/doc/guide/files/regression.xml:1.10 pkgsrc/doc/guide/files/regression.xml:1.11
--- pkgsrc/doc/guide/files/regression.xml:1.10  Fri May  1 14:22:12 2020
+++ pkgsrc/doc/guide/files/regression.xml       Wed Mar 13 13:47:43 2024
@@ -1,4 +1,4 @@
-<!-- $NetBSD: regression.xml,v 1.10 2020/05/01 14:22:12 rillig Exp $ -->
+<!-- $NetBSD: regression.xml,v 1.11 2024/03/13 13:47:43 wiz Exp $ -->
 
 <chapter id="regression"> <?dbhtml filename="regression.html"?>
 <title>Regression tests</title>
@@ -63,7 +63,7 @@
 <programlisting>
 do_test() {
         echo "Example output"
-} 1>$TEST_OUTFILE 2>&1
+} 1>$TEST_OUTFILE 2>&amp;1
 </programlisting>
 
        </listitem>

Index: pkgsrc/doc/guide/files/using.xml
diff -u pkgsrc/doc/guide/files/using.xml:1.53 pkgsrc/doc/guide/files/using.xml:1.54
--- pkgsrc/doc/guide/files/using.xml:1.53       Thu Jun 30 14:04:32 2022
+++ pkgsrc/doc/guide/files/using.xml    Wed Mar 13 13:47:43 2024
@@ -1,4 +1,4 @@
-<!-- $NetBSD: using.xml,v 1.53 2022/06/30 14:04:32 gdt Exp $ -->
+<!-- $NetBSD: using.xml,v 1.54 2024/03/13 13:47:43 wiz Exp $ -->
 
 <chapter id="using"> <?dbhtml filename="using.html"?>
 <title>Using pkgsrc</title>
@@ -184,10 +184,10 @@ nginx-1.18.0nb8      Lightweight HTTP se
       to the root users &man.crontab.5; entry.  For example the entry
       <screen>
 # Download vulnerabilities file
-0 3 * * * /usr/pkg/sbin/pkg_admin fetch-pkg-vulnerabilities >/dev/null 2>&1
+0 3 * * * /usr/pkg/sbin/pkg_admin fetch-pkg-vulnerabilities >/dev/null 2>&amp;1
 # Audit the installed packages and email results to root
 9 3 * * * /usr/pkg/sbin/pkg_admin audit |mail -s "Installed package audit result" \
-           root >/dev/null 2>&1
+           root >/dev/null 2>&amp;1
       </screen>
       will update the vulnerability list every day at 3AM, followed by an audit
       at 3:09AM. The result of the audit are then emailed to root.