From dff69dd1ee5f9cd53eb5ad5264ccd013f0d19df6 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 24 May 2000 21:40:56 +0000
Subject: - Update the copyright to include 2000 - Fix capitalization of the
 title of the last section - Add a new FAQ to the Misc. Questions section that
 explains how to add a   file to a CVS branch, complete with a real-life
 example.

---
 .../articles/committers-guide/article.sgml         | 42 ++++++++++++++++++++--
 .../articles/committers-guide/article.sgml         | 42 ++++++++++++++++++++--
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 460d8e928b..b1c583f3cb 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
     <pubdate>September 1999</pubdate>
 
     <copyright>
-      <year>1999</year>
+      <year>1999-2000</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -1196,7 +1196,7 @@
   </sect1>
 
   <sect1>
-    <title>Miscellaneous questions</title>
+    <title>Miscellaneous Questions</title>
 
     <qandaset>
       <qandaentry>
@@ -1260,6 +1260,44 @@
 	    vendor code.</para>
 	</answer>
       </qandaentry>
+
+      <qandaentry>
+	<question>
+	  <para>How do I add a new file to a CVS branch?</para>
+	</question>
+
+	<answer>
+	  <para>To add a file onto a branch, simply checkout or update
+	  to the branch you want to add to and then add the file using
+	  <command>cvs add</command> as you normally would.  For
+	  example, if you wanted to MFC the file
+	  <filename>src/sys/alpha/include/smp.h</filename> from HEAD
+	  to RELENG_4 and it does not exist in RELENG_4 yet, you would
+	  use the following steps:</para>
+
+	  <example>
+	    <title>MFC'ing a New File</title>
+
+	    <screen>&prompt.user; <userinput>cd sys/alpha/include</userinput>
+&prompt.user; <userinput>cvs update -rRELENG_4</userinput>
+cvs update: Updating .
+U clockvar.h
+U console.h
+...
+&prompt.user; <userinput>cvs update -kk -Ap smp.h &gt; smp.h</userinput>
+===================================================================
+Checking out smp.h
+RCS:  /usr/cvs/src/sys/alpha/include/smp.h,v
+VERS: 1.1
+***************
+&prompt.user; <userinput>cvs add smp.h</userinput>
+cvs add: scheduling file `smp.h' for addition on branch `RELENG_4'
+cvs add: use 'cvs commit' to add this file permanently
+&prompt.user; <userinput>cvs commit</userinput>
+	    </screen>
+	  </example>
+	</answer>
+      </qandaentry>
     </qandaset>
   </sect1>
 </article>
diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
index 460d8e928b..b1c583f3cb 100644
--- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
     <pubdate>September 1999</pubdate>
 
     <copyright>
-      <year>1999</year>
+      <year>1999-2000</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -1196,7 +1196,7 @@
   </sect1>
 
   <sect1>
-    <title>Miscellaneous questions</title>
+    <title>Miscellaneous Questions</title>
 
     <qandaset>
       <qandaentry>
@@ -1260,6 +1260,44 @@
 	    vendor code.</para>
 	</answer>
       </qandaentry>
+
+      <qandaentry>
+	<question>
+	  <para>How do I add a new file to a CVS branch?</para>
+	</question>
+
+	<answer>
+	  <para>To add a file onto a branch, simply checkout or update
+	  to the branch you want to add to and then add the file using
+	  <command>cvs add</command> as you normally would.  For
+	  example, if you wanted to MFC the file
+	  <filename>src/sys/alpha/include/smp.h</filename> from HEAD
+	  to RELENG_4 and it does not exist in RELENG_4 yet, you would
+	  use the following steps:</para>
+
+	  <example>
+	    <title>MFC'ing a New File</title>
+
+	    <screen>&prompt.user; <userinput>cd sys/alpha/include</userinput>
+&prompt.user; <userinput>cvs update -rRELENG_4</userinput>
+cvs update: Updating .
+U clockvar.h
+U console.h
+...
+&prompt.user; <userinput>cvs update -kk -Ap smp.h &gt; smp.h</userinput>
+===================================================================
+Checking out smp.h
+RCS:  /usr/cvs/src/sys/alpha/include/smp.h,v
+VERS: 1.1
+***************
+&prompt.user; <userinput>cvs add smp.h</userinput>
+cvs add: scheduling file `smp.h' for addition on branch `RELENG_4'
+cvs add: use 'cvs commit' to add this file permanently
+&prompt.user; <userinput>cvs commit</userinput>
+	    </screen>
+	  </example>
+	</answer>
+      </qandaentry>
     </qandaset>
   </sect1>
 </article>
-- 
cgit v1.2.3