Synchronised man.7, mdoc.7, mdoc.template manual structure.

5 files changed, 18 insertions, 4 deletions

diff --git a/man.7 b/man.7
index 88421262..12eda4e7 100644
--- a/man.7
+++ b/man.7
@@ -139,18 +139,27 @@ are generally structured as follows:
 \&.
 \&.SH NAME
 \efBfoo\efR \e(en a description goes here
+\&.\e\*q The next is for sections 2 & 3 only.
+\&.\e\*q .SH LIBRARY
 \&.
 \&.SH SYNOPSIS
 \efBfoo\efR [\efB\e-options\efR] arguments...
 \&.
 \&.SH DESCRIPTION
-The \efBfoo\efR utility does...
+The \efBfoo\efR utility processes files...
 \&.
+\&.\e\*q .SH IMPLEMENTATION NOTES
+\&.\e\*q The next is for sections 1 & 8 only.
+\&.\e\*q .SH EXIT STATUS
+\&.\e\*q The next is for sections 2, 3, & 9 only.
 \&.\e\*q .SH RETURN VALUES
+\&.\e\*q The next is for sections 1, 6, 7, & 8 only.
 \&.\e\*q .SH ENVIRONMENT
 \&.\e\*q .SH FILES
 \&.\e\*q .SH EXAMPLES
+\&.\e\*q The next is for sections 1, 4, 6, 7, & 8 only.
 \&.\e\*q .SH DIAGNOSTICS
+\&.\e\*q The next is for sections 2, 3, & 9 only.
 \&.\e\*q .SH ERRORS
 \&.\e\*q .SH SEE ALSO
 \&.\e\*q \efBbar\efR(1)
@@ -159,6 +168,7 @@ The \efBfoo\efR utility does...
 \&.\e\*q .SH AUTHORS
 \&.\e\*q .SH CAVEATS
 \&.\e\*q .SH BUGS
+\&.\e\*q .SH SECURITY CONSIDERATIONS
 .Ed
 .
 .
diff --git a/mdoc.7 b/mdoc.7
index b2748f89..37824ae1 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -241,6 +241,7 @@ followed by
 The
 \&.Nm
 utility processes files ...
+\&.\e\*q .Sh IMPLEMENTATION NOTES
 \&.\e\*q The next is for sections 1 & 8 only.
 \&.\e\*q .Sh EXIT STATUS
 \&.\e\*q The next is for sections 2, 3, & 9 only.
diff --git a/mdoc.h b/mdoc.h
index 3341f744..e5c5929a 100644
--- a/mdoc.h
+++ b/mdoc.h
@@ -200,7 +200,7 @@ enum	mdoc_sec {
 	SEC_SYNOPSIS,
 	SEC_DESCRIPTION,
 	SEC_IMPLEMENTATION,
-	/* FIXME: EXIT STATUS */
+	SEC_EXIT_STATUS,
 	SEC_RETURN_VALUES,
 	SEC_ENVIRONMENT, 
 	SEC_FILES,
@@ -214,7 +214,7 @@ enum	mdoc_sec {
 	SEC_AUTHORS,
 	SEC_CAVEATS,
 	SEC_BUGS,
-	/* FIXME: SECURITY CONSIDERATIONS */
+	SEC_SECURITY,
 	SEC_CUSTOM		/* User-defined. */
 };
 
diff --git a/mdoc.template b/mdoc.template
index 9dcf5893..5122f882 100644
--- a/mdoc.template
+++ b/mdoc.template
@@ -18,6 +18,7 @@
 .\" .Sh LIBRARY
 .Sh SYNOPSIS
 .Sh DESCRIPTION
+.\" .Sh IMPLEMENTATION NOTES
 .\" The next is for sections 1 & 8 only.
 .\" .Sh EXIT STATUS
 .\" The next is for sections 2, 3, & 9 only.
diff --git a/mdoc_strings.c b/mdoc_strings.c
index 13549a94..9c7d8b83 100644
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -30,7 +30,7 @@ struct mdoc_secname {
 	enum mdoc_sec	 sec;	/* Corresponding section. */
 };
 
-#define	SECNAME_MAX	(18)
+#define	SECNAME_MAX	(20)
 
 static	const struct mdoc_secname secnames[SECNAME_MAX] = {
 	{ "NAME", SEC_NAME },
@@ -38,6 +38,7 @@ static	const struct mdoc_secname secnames[SECNAME_MAX] = {
 	{ "SYNOPSIS", SEC_SYNOPSIS },
 	{ "DESCRIPTION", SEC_DESCRIPTION },
 	{ "IMPLEMENTATION NOTES", SEC_IMPLEMENTATION },
+	{ "EXIT STATUS", SEC_EXIT_STATUS },
 	{ "RETURN VALUES", SEC_RETURN_VALUES },
 	{ "ENVIRONMENT", SEC_ENVIRONMENT },
 	{ "FILES", SEC_FILES },
@@ -51,6 +52,7 @@ static	const struct mdoc_secname secnames[SECNAME_MAX] = {
 	{ "AUTHORS", SEC_AUTHORS },
 	{ "CAVEATS", SEC_CAVEATS },
 	{ "BUGS", SEC_BUGS },
+	{ "SECURITY CONSIDERATIONS", SEC_SECURITY }
 };
 
 #ifdef __linux__