From 05664f8a16d98c68b805e829edab7064bec9df7a Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Wed, 5 Sep 2007 22:11:01 +0000
Subject: [PATCH] Describe CCVER's default as gcc41.

---
 etc/defaults/make.conf     |  8 ++++----
 share/man/man5/make.conf.5 | 13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index a7c421ad49..62ab3f2c4e 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,5 +1,5 @@
 # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $
-# $DragonFly: src/etc/defaults/make.conf,v 1.30 2007/09/05 21:40:10 pavalos Exp $
+# $DragonFly: src/etc/defaults/make.conf,v 1.31 2007/09/05 22:11:01 pavalos Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
@@ -38,11 +38,11 @@
 # The CCVER variable controls which GCC-version to use by default.  It
 # should be set using ?= so as not to interfere with CCVER overrides from
 # userland or the buildworld.  Note that building world or the kernel using
-# the experimental compiler might be broken at any time.  We currently
+# an experimental compiler might be broken at any time.  We currently
 # recommend that an override NOT be set in /etc/make.conf.
 #
-#CCVER?=gcc34	# (use GCC 3.4, default)
-#CCVER?=gcc41	# (use GCC 4.1, experimental)
+#CCVER?=gcc34	# (use GCC 3.4, old version)
+#CCVER?=gcc41	# (use GCC 4.1, default)
 #
 # CFLAGS controls the compiler settings used when compiling C code.
 # Note that optimization settings above -O (-O2, ...) are not recommended
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 81222ca15e..f548b07429 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
-.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.28 2007/09/05 21:40:10 pavalos Exp $
+.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.29 2007/09/05 22:11:01 pavalos Exp $
 .\"
 .Dd March 23, 2007
 .Dt MAKE.CONF 5
@@ -110,15 +110,18 @@ for a list of recognized
 options.
 .It Va CCVER
 .Pq Vt str
-Controls which GCC version to use by default.  It should be set as
-CCVER?= so as not to interfere with overrides from userland. We
-currently recommend that an override NOT be set in
+Controls which GCC version to use by default.
+It should be set as
+.Li CCVER?=
+so as not to interfere with overrides from userland.
+We currently recommend that an override NOT be set in
 .Pa /etc/make.conf .
 Currently accepted values are
 .Dq gcc34
+(old version)
 and
 .Dq gcc41
-(experimental).
+(default).
 .It Va CFLAGS
 .Pq Vt str
 Controls the compiler setting when compiling C code.
-- 
2.41.0