diff options
author | rillig <rillig@pkgsrc.org> | 2006-07-29 17:55:13 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2006-07-29 17:55:13 +0000 |
commit | 43fca8b678422867506a73bed75f33d3d1748222 (patch) | |
tree | 681202171f6f47b3fd7ea00aa6bfda9dcee4ea9b /doc | |
parent | 610b1a13efcfebf38ed93c9763f4dc97e26a0dcb (diff) | |
download | pkgsrc-43fca8b678422867506a73bed75f33d3d1748222.tar.gz |
s/re-generate/regenerate/g
Diffstat (limited to 'doc')
-rw-r--r-- | doc/guide/Makefile | 6 | ||||
-rw-r--r-- | doc/guide/files/editing.xml | 28 |
2 files changed, 12 insertions, 22 deletions
diff --git a/doc/guide/Makefile b/doc/guide/Makefile index 623b046af4a..6dd2e52c66e 100644 --- a/doc/guide/Makefile +++ b/doc/guide/Makefile @@ -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 @@ regenerate-doc: build 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 --git a/doc/guide/files/editing.xml b/doc/guide/files/editing.xml index 68917f57c1a..1da20a5e567 100644 --- a/doc/guide/files/editing.xml +++ b/doc/guide/files/editing.xml @@ -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 .. && cvs update pkgsrc.*) - && bmake install-doc</command> to put the generated - files into <filename>pkgsrc/doc</filename>.</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 .. && cvs commit -m - "regenerated." pkgsrc.{html,txt})</command> to commit the - generated documentation.</para></step> - - <step><para>Run <command>(cd - ../../../htdocs/Documentation/pkgsrc && cvs update) - && bmake install-htdocs</command> to generate all the - files for the web server.</para></step> - - <step><para>Run <command>(cd - ../../../htdocs/Documentation/pkgsrc && 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> |