Re-generate for today's changes (editing.xml)

2 files changed, 35 insertions, 9 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index db577e07341..31271db0e47 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -10950,6 +10950,13 @@ Registering depends:.
             </li>
 
             <li>
+              <p>Run <span><b class="command">make
+              do-lint</b></span> in <tt class=
+              "filename">pkgsrc/doc/guide</tt> to check the XML
+              syntax, and fix it if needed</p>
+            </li>
+
+            <li>
               <p>Run <span><b class="command">make</b></span> in
               <tt class="filename">pkgsrc/doc/guide</tt> to build
               the HTML and ASCII version</p>
@@ -10959,15 +10966,13 @@ Registering depends:.
               <p>Run <span><b class="command">make
               OUTPUT=pdf</b></span> in <tt class=
               "filename">pkgsrc/doc/guide</tt> to build the PDF
-              version. Dont' omit this, as this does a very strict
-              SGML test, and doing this properly is important for
-              getting proper documentation on the web server!</p>
+              version.</p>
             </li>
 
             <li>
               <p>If all is well, run <span><b class="command">make
               install-doc</b></span> to put the generated files
-              into <tt class="filename">pkgserc/doc</tt>.</p>
+              into <tt class="filename">pkgsrc/doc</tt>.</p>
             </li>
 
             <li>
@@ -10979,6 +10984,20 @@ Registering depends:.
               <p><span><b class="command">cvs commit
               pkgsrc/doc/pkgsrc.{html,txt}</b></span></p>
             </li>
+
+            <li>
+              <p>Until the webserver on www.NetBSD.org is really
+              updated automatically to pick up changes to the
+              pkgsrc guide automatically, also run <span><b class=
+              "command">make install-htdoc
+              HTDOCSDIR=../../../htdocs</b></span> (or similar,
+              adjust <tt class="varname">HTDOCSDIR</tt>!)</p>
+            </li>
+
+            <li>
+              <p><span><b class="command">cvs commit
+              htdocs/Documentation/pkgsrc</b></span></p>
+            </li>
           </ul>
         </div>
       </div>
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 2a92bf7fee3..0c4d1813fae 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -4715,16 +4715,23 @@ The procedure to edit the pkgsrc guide is:
 
   * Edit the XML file(s) in pkgsrc/doc/guide/files
    
+  * Run make do-lint in pkgsrc/doc/guide to check the XML syntax, and fix it if
+    needed
+   
   * Run make in pkgsrc/doc/guide to build the HTML and ASCII version
    
-  * Run make OUTPUT=pdf in pkgsrc/doc/guide to build the PDF version. Dont'
-    omit this, as this does a very strict SGML test, and doing this properly is
-    important for getting proper documentation on the web server!
+  * Run make OUTPUT=pdf in pkgsrc/doc/guide to build the PDF version.
    
-  * If all is well, run make install-doc to put the generated files into
-    pkgserc/doc.
+  * If all is well, run make install-doc to put the generated files into pkgsrc
+    /doc.
    
   * cvs commit pkgsrc/doc/guide/files
    
   * cvs commit pkgsrc/doc/pkgsrc.{html,txt}
    
+  * Until the webserver on www.NetBSD.org is really updated automatically to
+    pick up changes to the pkgsrc guide automatically, also run make
+    install-htdoc HTDOCSDIR=../../../htdocs (or similar, adjust HTDOCSDIR!)
+   
+  * cvs commit htdocs/Documentation/pkgsrc
+