CVS commit: pkgsrc/doc

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Wed Aug 12 14:42:36 UTC 2020

Modified Files:
        pkgsrc/doc: pkgsrc.html pkgsrc.txt

Log Message:
doc/pkgsrc.*: regen


To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.301 -r1.302 pkgsrc/doc/pkgsrc.txt

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

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.303 pkgsrc/doc/pkgsrc.html:1.304
--- pkgsrc/doc/pkgsrc.html:1.303        Tue Aug 11 20:34:45 2020
+++ pkgsrc/doc/pkgsrc.html      Wed Aug 12 14:42:36 2020
@@ -14024,6 +14024,9 @@ source packages</h2></div></div></div>
 <a name="procedure"></a>E.2.�Procedure</h2></div></div></div>
 <p>The procedure to edit the pkgsrc guide is:</p>
 <div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p>Make sure you have checked out the htdocs repository
+       into a sibling directory of your pkgsrc directory.  You will need
+       the ability to commit from both pkgsrc and htdocs.</p></li>
 <li class="step"><p>Make sure you have the packages needed to
        regenerate the pkgsrc guide (and other XML-based NetBSD
        documentation) installed. These are automatically installed when

Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.301 pkgsrc/doc/pkgsrc.txt:1.302
--- pkgsrc/doc/pkgsrc.txt:1.301 Tue Aug 11 20:34:46 2020
+++ pkgsrc/doc/pkgsrc.txt       Wed Aug 12 14:42:36 2020
@@ -9826,26 +9826,30 @@ E.2. Procedure
 
 The procedure to edit the pkgsrc guide is:
 
- 1. Make sure you have the packages needed to regenerate the pkgsrc guide (and
+ 1. Make sure you have checked out the htdocs repository into a sibling
+    directory of your pkgsrc directory. You will need the ability to commit
+    from both pkgsrc and htdocs.
+
+ 2. Make sure you have the packages needed to regenerate the pkgsrc guide (and
     other XML-based NetBSD documentation) installed. These are automatically
     installed when you install the meta-pkgs/pkgsrc-guide-tools package.
 
- 2. Run cd doc/guide to get to the right directory. All further steps will take
+ 3. Run cd doc/guide to get to the right directory. All further steps will take
     place here.
 
- 3. Edit the XML file(s) in files/.
+ 4. Edit the XML file(s) in files/.
 
- 4. Run bmake to check the pkgsrc guide for valid XML and to build the final
+ 5. Run bmake to check the pkgsrc guide for valid XML and to build the final
     output files. If you get any errors at this stage, you can just edit the
     files, as there are only symbolic links in the working directory, pointing
     to the files in files/.
 
- 5. (cd files && cvs commit)
+ 6. (cd files && cvs commit)
 
- 6. Run bmake clean && bmake to regenerate the output files with the proper RCS
+ 7. Run bmake clean && bmake to regenerate the output files with the proper RCS
     Ids.
 
- 7. Run bmake regen to install and commit the files in both pkgsrc/doc and
+ 8. Run bmake regen to install and commit the files in both pkgsrc/doc and
     htdocs.
 
     Note