summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2013-09-16 00:25:07 +0000
committerIngo Schwarze <schwarze@openbsd.org>2013-09-16 00:25:07 +0000
commitb3d3825fd4c70631fc197c80b4f5396ec298651f (patch)
tree0b491b92eb5f62bcd3f07a8d0b71966553080e34
parent7223d0082a81c4411fa68997f0462c2c3b79c1e7 (diff)
downloadmandoc-b3d3825fd4c70631fc197c80b4f5396ec298651f.tar.gz
One of the WARNING messages has to use the word "section" twice in two
different meanings, that cannot be helped. But we can make this less confusing by stating that the second instance refers to stuff like (2), (3), and (9), and by adding the sections header the first instance refers to, for example ERRORS or RETURN VALUES. Source for confusion noticed by Jan Stary <hans at stare dot cz>, better wording suggested by jmc@, tweaked by me.
-rw-r--r--mandoc.h2
-rw-r--r--mdoc_validate.c3
-rw-r--r--read.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/mandoc.h b/mandoc.h
index 5aab0d97..7b7e4f41 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -65,7 +65,7 @@ enum mandocerr {
MANDOCERR_BADNAMESEC, /* bad NAME section contents */
MANDOCERR_SECOOO, /* sections out of conventional order */
MANDOCERR_SECREP, /* duplicate section name */
- MANDOCERR_SECMSEC, /* section not in conventional manual section */
+ MANDOCERR_SECMSEC, /* section header suited to sections ... */
/* related to macros and nesting */
MANDOCERR_MACROOBS, /* skipping obsolete macro */
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 7e28df3a..64632c69 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1964,7 +1964,8 @@ post_sh_head(POST_ARGS)
break;
if (*mdoc->meta.msec == '9')
break;
- mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC);
+ mandoc_msg(MANDOCERR_SECMSEC, mdoc->parse,
+ mdoc->last->line, mdoc->last->pos, buf);
break;
default:
break;
diff --git a/read.c b/read.c
index 52daedc4..3581328b 100644
--- a/read.c
+++ b/read.c
@@ -106,7 +106,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"bad NAME section contents",
"sections out of conventional order",
"duplicate section name",
- "section not in conventional manual section",
+ "section header suited to sections 2, 3, and 9 only",
/* related to macros and nesting */
"skipping obsolete macro",