From owner-svn-src-stable@FreeBSD.ORG  Mon Jun  6 21:41:10 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E92AB106566C;
	Mon,  6 Jun 2011 21:41:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D91C38FC17;
	Mon,  6 Jun 2011 21:41:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p56LfAxx050007;
	Mon, 6 Jun 2011 21:41:10 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p56LfAq8050005;
	Mon, 6 Jun 2011 21:41:10 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201106062141.p56LfAq8050005@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 6 Jun 2011 21:41:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222785 - stable/7/share/man/man5
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2011 21:41:11 -0000

Author: gjb (doc committer)
Date: Mon Jun  6 21:41:10 2011
New Revision: 222785
URL: http://svn.freebsd.org/changeset/base/222785

Log:
  MFC 196727 [1]:
  
  Document MALLOC_PRODUCTION knob.
  
  PR:		136029
  Original commit by:	maxim [1]

Modified:
  stable/7/share/man/man5/make.conf.5
Directory Properties:
  stable/7/share/man/man5/   (props changed)

Modified: stable/7/share/man/man5/make.conf.5
==============================================================================
--- stable/7/share/man/man5/make.conf.5	Mon Jun  6 21:40:38 2011	(r222784)
+++ stable/7/share/man/man5/make.conf.5	Mon Jun  6 21:41:10 2011	(r222785)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 5, 2006
+.Dd September 1, 2009
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -474,6 +474,12 @@ console driver to
 and allow access over FireWire(IEEE1394) using
 .Xr dconschat 8 .
 Currently, only i386 and amd64 are supported.
+.It Va MALLOC_PRODUCTION
+.Pq Vt bool
+Set this to disable assertions and statistics gathering in
+.Xr malloc 3 .
+It also defaults the A and J runtime options to off.
+Disabled by default on -CURRENT.
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.