[pkgsrc/trunk]: pkgsrc/doc/guide s/re-generate/regenerate/g

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/254302f09f0b
branches:  trunk
changeset: 516857:254302f09f0b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jul 29 17:55:13 2006 +0000

description:
s/re-generate/regenerate/g

diffstat:

 doc/guide/Makefile          |   6 +++---
 doc/guide/files/editing.xml |  28 +++++++++-------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diffs (76 lines):

diff -r 13d3bec06ab3 -r 254302f09f0b doc/guide/Makefile
--- a/doc/guide/Makefile        Sat Jul 29 16:49:44 2006 +0000
+++ b/doc/guide/Makefile        Sat Jul 29 17:55:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/07/27 07:06:13 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/29 17:55:13 rillig Exp $
 #
 
 DISTNAME=              pkgsrc-guide-${PKGVERSION}
@@ -99,14 +99,14 @@
        cd .. && cvs update pkgsrc.*
        ${MAKE} ${MAKEFLAGS} install-doc
        @${STEP_MSG} "Committing the files in pkgsrc/doc"
-       cd .. && cvs commit -m "re-generated." pkgsrc.*
+       cd .. && cvs commit -m "regenerated." pkgsrc.*
 
 regenerate-htdocs: build
        @${STEP_MSG} "Updating the files in htdocs"
        cd ${HTDOCSDIR}/Documentation/pkgsrc && cvs update
        ${MAKE} ${MAKEFLAGS} install-htdocs
        @${STEP_MSG} "Committing the files in htdocs"
-       cd ${HTDOCSDIR}/Documentation/pkgsrc && cvs commit -m "re-generated."
+       cd ${HTDOCSDIR}/Documentation/pkgsrc && cvs commit -m "regenerated."
 
 do-lint:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} lint
diff -r 13d3bec06ab3 -r 254302f09f0b doc/guide/files/editing.xml
--- a/doc/guide/files/editing.xml       Sat Jul 29 16:49:44 2006 +0000
+++ b/doc/guide/files/editing.xml       Sat Jul 29 17:55:13 2006 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: editing.xml,v 1.11 2006/06/30 09:25:34 rillig Exp $ -->
+<!-- $NetBSD: editing.xml,v 1.12 2006/07/29 17:55:13 rillig Exp $ -->
 
 <appendix id="editing">
 <title>Editing guidelines for the pkgsrc guide</title>
@@ -41,7 +41,7 @@
        <procedure>
 
        <step><para>Make sure you have the packages needed to
-       re-generate the pkgsrc guide (and other XML-based NetBSD
+       regenerate the pkgsrc guide (and other XML-based NetBSD
        documentation) installed. These are <filename
        role="pkg">meta-pkgs/netbsd-doc</filename> for creating the
        ASCII and HTML versions, and <filename
@@ -70,24 +70,14 @@
        regenerate the output files with the proper RCS
        Ids.</para></step>
 
-       <step><para>Run <command>(cd .. &amp;&amp; cvs update pkgsrc.*)
-       &amp;&amp; bmake install-doc</command> to put the generated
-       files into <filename>pkgsrc/doc</filename>.</para></step>
-
-       <step><para>Run <command>(cd .. &amp;&amp; cvs commit -m
-       "regenerated." pkgsrc.{html,txt})</command> to commit the
-       generated documentation.</para></step>
+       <step><para>Run <command>bmake regenerate</command> to
+       regenerate the files in both <filename>pkgsrc/doc</filename> and
+       <filename>htdocs</filename>.</para></step>
 
-       <step><para>Run <command>(cd
-       ../../../htdocs/Documentation/pkgsrc &amp;&amp; cvs update)
-       &amp;&amp; bmake install-htdocs</command> to generate all the
-       files for the web server.</para></step>
-
-       <step><para>Run <command>(cd
-       ../../../htdocs/Documentation/pkgsrc &amp;&amp; cvs commit -m
-       "regenerated.")</command> to update the files on the web server.
-       If you have added a chapter, don't forget to run <command>cvs
-       add *.html</command> before you commit the files.</para></step>
+       <step><para>If you have added, removed or renamed some chapters,
+       you need to synchronize them using <command>cvs add</command> or
+       <command>cvs delete</command> in the htdocs
+       directory.</para></step>
 
        </procedure>