Update Question 7.6:

- Mark up CVSup with <application>
- Mark up dash with &mdash;
- Add a paragraph about csup(1) as a CVSup replacement

Approved by:	gabor (mentor)

en_US.ISO8859-1/books/faq/book.sgml

@@ -4412,25 +4412,36 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 
       <qandaentry>
         <question id="cvsup-in-base">
-	  <para>Why is CVSup not integrated in the main FreeBSD tree?
+	  <para>Why is <application>CVSup</application> not integrated in the main FreeBSD tree?
 	  </para>
 	</question>
 
 	<answer>
-	  <para>The FreeBSD base system is designed as self-hosting - it
+	  <para>The FreeBSD base system is designed as self-hosting &mdash; it
 	    should be possible to build the whole operating system starting
 	    with a very limited set of tools.  Thus, the actual build tools
 	    needed to compile the FreeBSD sources are bundled with the
 	    sources themselves.  This includes a C compiler (&man.gcc.1;),
 	    &man.make.1;, &man.awk.1;, and similar tools.</para>
 
-	  <para>Since CVSup is written in Modula-3, adding it to the FreeBSD
+	  <para>Since <application>CVSup</application> is written in Modula-3, adding it to the FreeBSD
 	    base system would also require adding and maintaining a Modula-3
 	    compiler.  This would lead to both an increase in the disk space
 	    consumed by the FreeBSD sources and additional maintenance work.
 	    Thus, it is much easier for both the developers and users to
-	    keep CVSup as a separate port, which can be easily installed as
+	    keep <application>CVSup</application> as a separate port, which can be easily installed as
 	    a package bundled on the FreeBSD installation CDs.</para>
+
+	  <para>However, &os; users are not without an integrated
+	    <application>CVSup</application> compatible client anymore
+	    since FreeBSD&nbsp;6.2-RELEASE.  Thanks to &a.mux;,
+	    <application>CVSup</application> was rewritten in C as
+	    &man.csup.1; and it is the part of the base system by now.
+	    Although it does not implement all the features of
+	    <application>CVSup</application> at the moment, it is good
+	    enough (and really fast!) to keep your sources synchronized.
+	    For systems earlier than 6.2, it can be installed as a port
+	    or package (see <filename role="package">net/csup</filename>).</para>
 	</answer>
       </qandaentry>