===================================================================
RCS file: /cvs/mandoc/mdoc.7,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- mandoc/mdoc.7	2010/05/07 15:49:36	1.95
+++ mandoc/mdoc.7	2010/05/08 08:36:44	1.96
@@ -1,4 +1,4 @@
-.\"	$Id: mdoc.7,v 1.95 2010/05/07 15:49:36 kristaps Exp $
+.\"	$Id: mdoc.7,v 1.96 2010/05/08 08:36:44 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: May 7 2010 $
+.Dd $Mdocdate: May 8 2010 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -181,23 +181,13 @@ and
 .Sq \e*(Ba
 .Pq vertical bar .
 .Ss Whitespace
-In non-literal free-form lines, consecutive blocks of whitespace are
-pruned from input and added later in the output filter, if applicable:
-.Bd -literal -offset indent
-These     spaces   are    pruned       from    input.
-\&.Bd \-literal
-These         are              not.
-\&.Ed
-.Ed
+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 only permitted
+within literal contexts.
 .Pp
 In macro lines, whitespace delimits arguments and is discarded.  If
 arguments are quoted, whitespace within the quotes is retained.
-.Pp
-Blank lines are only permitted within literal contexts, as are lines
-containing only whitespace.  Tab characters are only acceptable when
-delimiting
-.Sq \&Bl \-column
-or when in a literal context.
 .Ss Quotation
 Macro arguments may be quoted with a double-quote to group
 space-delimited terms or to retain blocks of whitespace.  A quoted