Merge headers defining identifiers from sysctl.8 into sysctl.3. Shorten and

update their descriptions. In sysctl.8 refer to /etc/sysctl.conf in FILES.

discussed with and ok jmc

2 files changed, 33 insertions, 62 deletions

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 810d9ea50c1..0ac92a5c079 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.278 2017/04/14 01:23:02 deraadt Exp $
+.\"	$OpenBSD: sysctl.3,v 1.279 2017/05/04 20:41:10 tb Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 14 2017 $
+.Dd $Mdocdate: May 4 2017 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -2169,39 +2169,44 @@ is set appropriately.
 .Sh FILES
 .Bl -tag -width "uvm/uvmXswapXencrypt.h  " -compact
 .It In sys/sysctl.h
-definitions for top level identifiers, second level kernel and hardware
-identifiers, and user level identifiers
+top level identifiers and second level kernel and hardware
+identifiers
 .It In sys/socket.h
-definitions for second level network identifiers
+second level network identifiers
 .It In sys/gmon.h
-definitions for third level profiling identifiers
-.It In ufs/ffs/ffs_extern.h
-definitions for third level virtual file system identifiers
-.Pq ffs
-.It In nfs/nfs.h
-definitions for third level virtual file system identifiers
-.Pq nfs
+third level profiling identifiers
 .It In uvm/uvm_param.h
-definitions for second level virtual memory identifiers
+second level virtual memory identifiers
 .It In uvm/uvm_swap_encrypt.h
-definitions for third level virtual memory identifiers
+third level virtual memory identifiers
 .It In net/if.h
-definitions for packet input/output queue identifiers
+packet input/output queue identifiers
 .It In net/pipex.h
-definitions for third level PIPEX identifiers
+third level PIPEX identifiers
 .It In netinet/in.h
-definitions for third level IPv4/v6 identifiers and
-fourth level IP and IPv6 identifiers
+third and fourth level IPv4/v6 identifiers
+.It In netinet/ip_divert.h
+fourth level divert identifiers
 .It In netinet/icmp_var.h
-definitions for fourth level ICMP identifiers
+fourth level ICMP identifiers
 .It In netinet/icmp6.h
-definitions for fourth level ICMPv6 identifiers
+fourth level ICMPv6 identifiers
 .It In netinet/tcp_var.h
-definitions for fourth level TCP identifiers
+fourth level TCP identifiers
 .It In netinet/udp_var.h
-definitions for fourth level UDP identifiers
+fourth level UDP identifiers
+.It In ddb/db_var.h
+second level ddb identifiers
+.It In sys/mount.h
+second level vfs identifiers
+.It In miscfs/fuse/fusefs.h
+third level fusefs identifiers
+.It In nfs/nfs.h
+third level NFS identifiers
+.It In ufs/ffs/ffs_extern.h
+third level FFS identifiers
 .It In machine/cpu.h
-definitions for second level CPU identifiers
+second level CPU identifiers
 .El
 .Sh ERRORS
 The following errors may be reported:
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 5ce718376b6..0671b735d97 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.211 2017/03/16 19:30:57 jmc Exp $
+.\"	$OpenBSD: sysctl.8,v 1.212 2017/05/04 20:41:10 tb Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sysctl.8	8.2 (Berkeley) 5/9/95
 .\"
-.Dd $Mdocdate: March 16 2017 $
+.Dd $Mdocdate: May 4 2017 $
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -116,43 +116,9 @@ Use of the
 .Fl A
 flag lists all the filesystems compiled into the running kernel.
 .Sh FILES
-.Bl -tag -width <uvm/uvm_swap_encrypt.h> -compact
-.It In sys/sysctl.h
-definitions for top level identifiers and second level kernel and hardware
-identifiers
-.It In sys/socket.h
-definitions for second level network identifiers
-.It In sys/gmon.h
-definitions for third level profiling identifiers
-.It In uvm/uvm_param.h
-definitions for second level virtual memory identifiers
-.It In uvm/uvm_swap_encrypt.h
-definitions for third level virtual memory identifiers
-.It In netinet/in.h
-definitions for third level IPv4/v6 identifiers and
-fourth level IPv4/v6 identifiers
-.It In netinet/ip_divert.h
-definitions for fourth level divert identifiers
-.It In netinet/icmp_var.h
-definitions for fourth level ICMP identifiers
-.It In netinet6/icmp6.h
-definitions for fourth level ICMPv6 identifiers
-.It In netinet/tcp_var.h
-definitions for fourth level TCP identifiers
-.It In netinet/udp_var.h
-definitions for fourth level UDP identifiers
-.It In ddb/db_var.h
-definitions for second level ddb identifiers
-.It In sys/mount.h
-definitions for second level vfs identifiers
-.It In nfs/nfs.h
-definitions for third level NFS identifiers
-.It In miscfs/fuse/fusefs.h
-definitions for third level fusefs identifiers
-.It In ufs/ffs/ffs_extern.h
-definitions for third level FFS identifiers
-.It In machine/cpu.h
-definitions for second level CPU identifiers
+.Bl -tag -width "/etc/sysctl.confXX" -compact
+.It Pa /etc/sysctl.conf
+sysctl variables to set at system startup
 .El
 .Sh EXAMPLES
 To retrieve the maximum number of processes allowed