summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2014-08-26 11:13:59 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2014-08-26 11:13:59 +0000
commitee72743e7eac2604c1d93f408cb2fccbe777be20 (patch)
tree810225fa57aa660fa1282871ff6d3ce64c71e6f7 /usr.bin
parent4bb94680579da67df57c054f9cb0800401398a52 (diff)
Unify console and CGI section titles, bringing them closer to groff,
is an attempt to reduce confusion for users switching between media and between different operating systems. Not using the groff title for section 4 is intentional, it is just too awful ("Kernel Interfaces Manual"), and the difference from sections 2 and 9 would be too hard to see. Positive feedback from at least deraadt@ millert@ bluhm@ jca@. Previously also agreed with the general direction: jmc@ Nick@. The title for 3p was polished by bluhm@. The existing mismatches were originally noticed by jsg@.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/mandoc/cgi.c14
-rw-r--r--usr.bin/mandoc/msec.in22
2 files changed, 18 insertions, 18 deletions
diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index a73f7c23c7b..3d1d1e0f184 100644
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/* $Id: cgi.c,v 1.33 2014/08/21 16:03:50 schwarze Exp $ */
+/* $OpenBSD: cgi.c,v 1.34 2014/08/26 11:13:58 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -91,14 +91,14 @@ static const char *const sec_names[] = {
"All Sections",
"1 - General Commands",
"2 - System Calls",
- "3 - Subroutines",
- "3p - Perl Subroutines",
- "4 - Special Files",
+ "3 - Library Functions",
+ "3p - Perl Library",
+ "4 - Device Drivers",
"5 - File Formats",
"6 - Games",
- "7 - Macros and Conventions",
- "8 - Maintenance Commands",
- "9 - Kernel Interface"
+ "7 - Miscellaneous Information",
+ "8 - System Manager\'s Manual",
+ "9 - Kernel Developer\'s Manual"
};
static const int sec_MAX = sizeof(sec_names) / sizeof(char *);
diff --git a/usr.bin/mandoc/msec.in b/usr.bin/mandoc/msec.in
index 8bb397a9208..238e66a21b0 100644
--- a/usr.bin/mandoc/msec.in
+++ b/usr.bin/mandoc/msec.in
@@ -1,4 +1,4 @@
-/* $Id: msec.in,v 1.4 2010/07/31 23:42:04 schwarze Exp $ */
+/* $OpenBSD: msec.in,v 1.5 2014/08/26 11:13:58 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -22,16 +22,16 @@
* Be sure to escape strings.
*/
-LINE("1", "OpenBSD Reference Manual")
-LINE("2", "OpenBSD Programmer\'s Manual")
-LINE("3", "OpenBSD Programmer\'s Manual")
-LINE("3p", "Perl Programmers Reference Guide")
-LINE("4", "OpenBSD Programmer\'s Manual")
-LINE("5", "OpenBSD Programmer\'s Manual")
-LINE("6", "OpenBSD Reference Manual")
-LINE("7", "OpenBSD Reference Manual")
-LINE("8", "OpenBSD System Manager's Manual")
-LINE("9", "OpenBSD Kernel Manual")
+LINE("1", "General Commands Manual")
+LINE("2", "System Calls Manual")
+LINE("3", "Library Functions Manual")
+LINE("3p", "Perl Library Manual")
+LINE("4", "Device Drivers Manual")
+LINE("5", "File Formats Manual")
+LINE("6", "Games Manual")
+LINE("7", "Miscellaneous Information Manual")
+LINE("8", "System Manager\'s Manual")
+LINE("9", "Kernel Developer\'s Manual")
LINE("X11", "X11 Developer\'s Manual")
LINE("X11R6", "X11 Developer\'s Manual")
LINE("unass", "Unassociated")