www/server/standards boilerplate.html patch-fro...

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       09/11/01 18:33:00

Modified files:
        server/standards: boilerplate.html patch-from-parent 

Log message:
        doc fixes

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/boilerplate.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/patch-from-parent?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: boilerplate.html
===================================================================
RCS file: /web/www/www/server/standards/boilerplate.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- boilerplate.html    27 Oct 2009 23:24:54 -0000      1.46
+++ boilerplate.html    1 Nov 2009 18:32:56 -0000       1.47
@@ -1,10 +1,10 @@
-<!-- Parent-Version: $Revision: 1.46 $ -->
+<!-- Parent-Version: $Revision: 1.47 $ -->
 
 <!-- Instructions for adapting this boilerplate to a new project: -->
 
 <!-- 1. In the line above starting "Parent-Version:", remove the -->
-<!--    "$Revision: 1.46 $" from around the revision number, -->
-<!--    leaving just the number. -->
+<!--    "$Revision: 1.47 $" from around the revision number, -->
+<!--    leaving just Parent-Version: and the number. -->
 
 <!-- 2. Replace "baz" with the name of your project. -->
 <!--    You should be able to do this with search and replace; -->
@@ -76,7 +76,8 @@
 or by looking at
 <em>/usr/doc/baz/</em>,
 <em>/usr/local/doc/baz/</em>,
-or similar directories on your system.</p>
+or similar directories on your system.  A brief summary is available by
+running <tt>baz&nbsp;--help</tt>.</p>
 
 
 <h3>Mailing lists</h3>
@@ -197,7 +198,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2009/10/27 23:24:54 $
+$Date: 2009/11/01 18:32:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: patch-from-parent
===================================================================
RCS file: /web/www/www/server/standards/patch-from-parent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- patch-from-parent   27 Oct 2009 23:24:54 -0000      1.1
+++ patch-from-parent   1 Nov 2009 18:32:56 -0000       1.2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: patch-from-parent,v 1.1 2009/10/27 23:24:54 karl Exp $
+# $Id: patch-from-parent,v 1.2 2009/11/01 18:32:56 karl Exp $
 # patch-from-parent
 # Patch a file in CVS from a notional "parent" from which it "inherits".
 # http://www.gnu.org/server/standards/boilerplate.html is one likely parent.
@@ -33,8 +33,13 @@
     echo Typical usage:
     echo
     echo   1. Run $program foo.html /path/to/parent.html
-    echo   2. foo.html will be updated
-    echo   3. Resolve any conflicts
+    echo   2. /path/to/parent.html will be CVS updated
+    echo   3. foo.html will be updated
+    echo   4. Resolve any conflicts
+    echo
+    echo A checkout of
+    echo http://www.gnu.org/server/standards/boilerplate.html is one
+    echo likely parent, and is the reason CVS is used.
     exit 1
 fi