===================================================================
RCS file: /cvs/mandoc/man.7,v
retrieving revision 1.62
retrieving revision 1.65
diff -u -p -r1.62 -r1.65
--- mandoc/man.7	2010/04/13 05:26:49	1.62
+++ mandoc/man.7	2010/05/08 10:28:24	1.65
@@ -1,4 +1,4 @@
-.\"	$Id: man.7,v 1.62 2010/04/13 05:26:49 kristaps Exp $
+.\"	$Id: man.7,v 1.65 2010/05/08 10:28:24 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 13 2010 $
+.Dd $Mdocdate: May 8 2010 $
 .Dt MAN 7
 .Os
 .Sh NAME
@@ -126,10 +126,14 @@ and
 .Sq \ef
 attributes are forgotten when entering or exiting a macro block.
 .Ss Whitespace
-Unless specifically escaped, consecutive blocks of whitespace are pruned
-from input.  These are later re-added, if applicable, by a front-end
-utility such as
-.Xr mandoc 1 .
+Whitespace consists of the space character.  
+In free-form lines, whitespace is preserved within a line; un-escaped
+trailing spaces are stripped from input (unless in a literal context).
+Blank free-form lines, which may include spaces, are permitted and
+rendered as an empty line.
+.Pp
+In macro lines, whitespace delimits arguments and is discarded.  If
+arguments are quoted, whitespace within the quotes is retained.
 .Ss Dates
 The
 .Sx \&TH
@@ -886,11 +890,6 @@ language.
 In quoted literals, GNU troff allowed pair-wise double-quotes to produce
 a standalone double-quote in formatted output.  It is not known whether
 this behaviour is exhibited by other formatters.
-.It
-Blocks of whitespace are stripped from macro and free-form text lines
-(except when in literal mode) in mandoc.  This is not the case for GNU
-troff: for maximum portability, whitespace sensitive blocks should be
-enclosed in literal contexts.
 .It
 The
 .Sx \&sp