summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--index.sgml13
-rw-r--r--mdoc.712
3 files changed, 18 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 0ee50276..5bc86271 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ INSTALL_LIB = $(INSTALL) -m 0644
INSTALL_MAN = $(INSTALL_DATA)
VERSION = 1.10.1
-VDATE = 03 June 2010
+VDATE = 07 June 2010
VFLAGS = -DVERSION="\"$(VERSION)\""
WFLAGS = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
diff --git a/index.sgml b/index.sgml
index 6b0cd641..1b1b67c1 100644
--- a/index.sgml
+++ b/index.sgml
@@ -200,6 +200,10 @@
</TR>
</TBODY>
</TABLE>
+
+ <P>
+ See <Q><A CLASS="external" HREF="http://manpages.bsd.lv">Writing UNIX Manual Pages</A></Q> for a general
+ introduction to manpages and mdoc.
</TD>
</TR>
<TR>
@@ -256,14 +260,19 @@
</H1>
<DIV CLASS="news">
<P>
- <SPAN CLASS="date">xx-06-2010</SPAN>:
+ <SPAN CLASS="date">07-06-2010</SPAN>:
version 1.10.1
</P>
<P>
This primarily focusses on the <Q>Bl</Q> and <Q>It</Q> macros described in <A
HREF="mdoc.7.html">mdoc</A>. Multi-line column support is now fully compatible with
groff, as are implicit list entries for columns. Removed manuals.7 in favour of <A
- CLASS="external" HREF="http://manpages.bsd.lv">http://manpages.bsd.lv</A>.
+ CLASS="external" HREF="http://manpages.bsd.lv">http://manpages.bsd.lv</A>. The way we
+ handle the SYNOPSIS section (see the SYNOPSIS documentation in <A
+ HREF="mdoc.7.html#x4d414e55414cx20x535452554354555245">MANUAL STRUCTURE</A>) has also
+ been considerably simplified compared to groff's method. Lastly, the <SPAN
+ CLASS="flag">-Owidth=width</SPAN> output option has been added to <SPAN
+ CLASS="flag">-Tascii</SPAN> (see <A HREF="mandoc.1.html">mandoc</A>).
</P>
</DIV>
<DIV CLASS="news">
diff --git a/mdoc.7 b/mdoc.7
index b3f12a41..ba8c714b 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -55,7 +55,7 @@ Text following a
whether in a macro or free-form text line, is ignored to the end of
line. A macro line with only a control character and comment escape,
.Sq \&.\e" ,
-is also ignored. Macro lines with only a control charater and optionally
+is also ignored. Macro lines with only a control character and optionally
whitespace are stripped from input.
.Ss Reserved Characters
Within a macro line, the following characters are reserved:
@@ -167,7 +167,7 @@ also defined a set of package-specific
.Dq predefined strings ,
which, like
.Sx Special Characters ,
-demark special output characters and strings by way of input codes.
+mark special output characters and strings by way of input codes.
Predefined strings are escaped with the slash-asterisk,
.Sq \e* :
single-character
@@ -973,7 +973,7 @@ See also
.Sx \&Aq .
.Ss \&Ap
Inserts an apostrophe without any surrounding white-space.
-This is generally used as a grammatic device when referring to the verb
+This is generally used as a grammatical device when referring to the verb
form of a function:
.Bd -literal -offset indent
\&.Fn execve Ap d
@@ -1879,7 +1879,7 @@ line itself.
Subsequent this, only the
.Sq \&Ta
pseudo-macro may be used to delimit phrases.
-Furthermore, note that quoted sections propogate over tab-delimited
+Furthermore, note that quoted sections propagate over tab-delimited
phrases on an
.Sx \&It ,
for example,
@@ -2185,7 +2185,7 @@ and
.Sx \&Fn
in the
.Em SYNOPSIS :
-at times newline(s) are suppressed dependong on whether a prior
+at times newline(s) are suppressed depending on whether a prior
.Sx \&Fn
has been invoked.
In mandoc, this is not the case.
@@ -2250,7 +2250,7 @@ and
.Fl right
are aliases for
.Fl left
-in manodc. Furthermore, the
+in mandoc. Furthermore, the
.Fl file Ar file
argument is ignored.
Lastly, since text is not right-justified in mandoc (or even groff),