aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-07-04 14:40:38 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-07-04 14:40:38 +0000
commit423ba251975a0c4f170f9e93bb7237b898b67fef (patch)
treeced56734cbf44d88a6da1d477190ffebbdbef2bd
parent90ba5141e31f73760148000ed0d98d9b7c612a63 (diff)
downloadmandoc-423ba251975a0c4f170f9e93bb7237b898b67fef.tar.gz
mandoc-423ba251975a0c4f170f9e93bb7237b898b67fef.tar.zst
mandoc-423ba251975a0c4f170f9e93bb7237b898b67fef.zip
Printing "BASE:" in messages about violations of base system conventions
is confusing, simply print "STYLE:", which is intuitive and does not sound excessively alarming; suggested by jmc@, OK tedu@ jmc@.
-rw-r--r--main.c5
-rw-r--r--mandoc.110
-rw-r--r--read.c4
3 files changed, 12 insertions, 7 deletions
diff --git a/main.c b/main.c
index cac2fe49..ef051e53 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.298 2017/07/02 21:18:29 schwarze Exp $ */
+/* $Id: main.c,v 1.299 2017/07/04 14:40:38 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -1089,8 +1089,7 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
if (line)
fprintf(stderr, "%d:%d:", line, col + 1);
- fprintf(stderr, " %s",
- t < MANDOCERR_STYLE ? "BASE" : mparse_strlevel(lvl));
+ fprintf(stderr, " %s", mparse_strlevel(lvl));
if ((mparse_msg = mparse_strerror(t)) != NULL)
fprintf(stderr, ": %s", mparse_msg);
diff --git a/mandoc.1 b/mandoc.1
index d906befb..449bece5 100644
--- a/mandoc.1
+++ b/mandoc.1
@@ -1,4 +1,4 @@
-.\" $Id: mandoc.1,v 1.213 2017/07/03 17:33:05 schwarze Exp $
+.\" $Id: mandoc.1,v 1.214 2017/07/04 14:40:38 schwarze Exp $
.\"
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
.\" Copyright (c) 2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,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: July 3 2017 $
+.Dd $Mdocdate: July 4 2017 $
.Dt MANDOC 1
.Os
.Sh NAME
@@ -762,6 +762,12 @@ A convertion used in the base system of a specific operating system
is not adhered to.
These are not markup mistakes, and neither the quality of formatting
nor portability are in danger.
+Messages of the
+.Cm base
+level are printed with the more intuitive
+.Cm style
+.Ar level
+tag.
.El
.Pp
Messages of the
diff --git a/read.c b/read.c
index ce894131..e7207802 100644
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/* $Id: read.c,v 1.187 2017/07/03 17:33:06 schwarze Exp $ */
+/* $Id: read.c,v 1.188 2017/07/04 14:40:38 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -75,7 +75,7 @@ static void mparse_parse_buffer(struct mparse *, struct buf,
static const enum mandocerr mandoclimits[MANDOCLEVEL_MAX] = {
MANDOCERR_OK,
- MANDOCERR_STYLE,
+ MANDOCERR_OK,
MANDOCERR_WARNING,
MANDOCERR_ERROR,
MANDOCERR_UNSUPP,