From 0cd36ffb6bd821ea32f892fb9b96b3a0f8faf967 Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 30 Jun 2014 04:28:51 +0000
Subject: Eliminate some history from the documentation.

---
 .../books/developers-handbook/tools/chapter.xml    | 30 +++++-----------------
 1 file changed, 6 insertions(+), 24 deletions(-)

(limited to 'en_US.ISO8859-1/books/developers-handbook')

diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 578891622d..c578917eb3 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -618,35 +618,17 @@
 	  <para>This will link the math library functions into
 	    <filename>foobar</filename>.</para>
 
-	  <para>If you are compiling C++ code, you need to add
-	    <option>-lg++</option>, or <option>-lstdc++</option> if
-	    you are using FreeBSD 2.2 or later, to the command line
-	    argument to link the C++ library functions.
-	    Alternatively, you can run <command>c++</command> instead
-	    of <command>cc</command>, which does this for you.
-	    <command>c++</command> can also be invoked as
-	    <command>g++</command> on FreeBSD.</para>
+	  <para>If you are compiling C++ code, use
+	  <command>c++</command>.  <command>c++</command> can also be
+	  invoked as <command>clang++</command> on &os;.</para>
 
 	  <informalexample>
-	    <screen>&prompt.user; <userinput>cc -o foobar foobar.cc -lg++</userinput>     <lineannotation>For FreeBSD 2.1.6 and earlier</lineannotation>
-&prompt.user; <userinput>cc -o foobar foobar.cc -lstdc++</userinput>  <lineannotation>For FreeBSD 2.2 and later</lineannotation>
-&prompt.user; <userinput>c++ -o foobar foobar.cc</userinput>
-	    </screen>
+	    <screen>&prompt.user; <userinput>c++ -o foobar foobar.cc</userinput></screen>
 	  </informalexample>
 
-	  <para>Each of these will both produce an executable
+	  <para>This will both produce an executable
 	    <filename>foobar</filename> from the C++ source file
-	    <filename>foobar.cc</filename>.  Note that, on &unix;
-	    systems, C++ source files traditionally end in
-	    <filename>.C</filename>, <filename>.cxx</filename> or
-	    <filename>.cc</filename>, rather than the
-	    &ms-dos; style
-	    <filename>.cpp</filename> (which was already used for
-	    something else).  <command>gcc</command> used to rely on
-	    this to work out what kind of compiler to use on the
-	    source file; however, this restriction no longer applies,
-	    so you may now call your C++ files
-	    <filename>.cpp</filename> with impunity!</para>
+	    <filename>foobar.cc</filename>.
 	</listitem>
       </varlistentry>
     </variablelist>
-- 
cgit v1.2.3