From f6eafc1d108ff3645dff40e4173360ae9be4a5f0 Mon Sep 17 00:00:00 2001 From: jruoho Date: Fri, 18 Mar 2011 15:21:56 +0000 Subject: [PATCH] Move security(8) to the section 7. Discussed on source-changes a while back. Should address PR # 35718 at least partially. --- distrib/sets/lists/man/mi | 11 +++++++---- share/man/man7/Makefile | 4 ++-- share/man/man7/intro.7 | 7 +++++-- share/man/{man8/security.8 => man7/security.7} | 8 ++++---- share/man/man8/Makefile | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) rename share/man/{man8/security.8 => man7/security.7} (98%) diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index e841fbbfa526..e621e060bd0c 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1302 2011/03/17 02:35:28 joerg Exp $ +# $NetBSD: mi,v 1.1303 2011/03/18 15:21:56 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2032,6 +2032,7 @@ ./usr/share/man/cat7/release.0 man-reference-catman .cat ./usr/share/man/cat7/rump_sp.0 man-reference-catman .cat ./usr/share/man/cat7/script.0 man-reference-catman .cat +./usr/share/man/cat7/security.0 man-reference-catman .cat ./usr/share/man/cat7/setuid.0 man-reference-catman .cat ./usr/share/man/cat7/signal.0 man-reference-catman .cat ./usr/share/man/cat7/sticky.0 man-reference-catman .cat @@ -2702,7 +2703,7 @@ ./usr/share/man/cat8/schedctl.0 man-sysutil-catman .cat ./usr/share/man/cat8/scsictl.0 man-sysutil-catman .cat ./usr/share/man/cat8/sdpd.0 man-sysutil-catman .cat -./usr/share/man/cat8/security.0 man-sys-catman .cat +./usr/share/man/cat8/security.0 man-obsolete obsolete ./usr/share/man/cat8/sendmail.0 man-obsolete obsolete ./usr/share/man/cat8/services_mkdb.0 man-sysutil-catman .cat ./usr/share/man/cat8/sesd.0 man-sysutil-catman .cat @@ -4704,6 +4705,7 @@ ./usr/share/man/html7/release.html man-reference-htmlman html ./usr/share/man/html7/rump_sp.html man-reference-htmlman html ./usr/share/man/html7/script.html man-reference-htmlman html +./usr/share/man/html7/security.html man-reference-htmlman html ./usr/share/man/html7/setuid.html man-reference-htmlman html ./usr/share/man/html7/signal.html man-reference-htmlman html ./usr/share/man/html7/sticky.html man-reference-htmlman html @@ -5220,7 +5222,7 @@ ./usr/share/man/html8/schedctl.html man-sysutil-htmlman html ./usr/share/man/html8/scsictl.html man-sysutil-htmlman html ./usr/share/man/html8/sdpd.html man-sysutil-htmlman html -./usr/share/man/html8/security.html man-sys-htmlman html +./usr/share/man/html8/security.html man-obsolete obsolete ./usr/share/man/html8/services_mkdb.html man-sysutil-htmlman html ./usr/share/man/html8/sesd.html man-sysutil-htmlman html ./usr/share/man/html8/setencstat.html man-sysutil-htmlman html @@ -7356,6 +7358,7 @@ ./usr/share/man/man7/re_format.7 man-reference-man .man ./usr/share/man/man7/release.7 man-reference-man .man ./usr/share/man/man7/script.7 man-reference-man .man +./usr/share/man/man7/security.7 man-reference-man .man ./usr/share/man/man7/setuid.7 man-reference-man .man ./usr/share/man/man7/signal.7 man-reference-man .man ./usr/share/man/man7/sticky.7 man-reference-man .man @@ -8027,7 +8030,7 @@ ./usr/share/man/man8/schedctl.8 man-sysutil-man .man ./usr/share/man/man8/scsictl.8 man-sysutil-man .man ./usr/share/man/man8/sdpd.8 man-sysutil-man .man -./usr/share/man/man8/security.8 man-sys-man .man +./usr/share/man/man8/security.8 man-obsolete obsolete ./usr/share/man/man8/sendmail.8 man-obsolete obsolete ./usr/share/man/man8/services_mkdb.8 man-sysutil-man .man ./usr/share/man/man8/sesd.8 man-sysutil-man .man diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile index d2796aecb022..64721937f539 100644 --- a/share/man/man7/Makefile +++ b/share/man/man7/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.26 2010/12/14 16:18:15 jruoho Exp $ +# $NetBSD: Makefile,v 1.27 2011/03/18 15:21:57 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # missing: eqnchar.7 man.7 ms.7 term.7 MAN= ascii.7 c.7 environ.7 glob.7 hier.7 hostname.7 intro.7 mailaddr.7 \ - module.7 nls.7 operator.7 orders.7 pkgsrc.7 release.7 \ + module.7 nls.7 operator.7 orders.7 pkgsrc.7 release.7 security.7 \ script.7 setuid.7 signal.7 sticky.7 symlink.7 sysctl.7 \ tests.7 diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7 index 12e4840b27bf..3342e455054f 100644 --- a/share/man/man7/intro.7 +++ b/share/man/man7/intro.7 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.7,v 1.18 2010/12/14 16:18:15 jruoho Exp $ +.\" $NetBSD: intro.7,v 1.19 2011/03/18 15:21:57 jruoho Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)intro.7 8.1 (Berkeley) 6/5/93 .\" -.Dd December 14, 2010 +.Dd March 18, 2011 .Dt INTRO 7 .Os .Sh NAME @@ -88,6 +88,9 @@ layout of releases and snapshots .It Xr script 7 how interpreter scripts are executed +.It Xr security 7 +security features available in +.Nx .It Xr setuid 7 checklist for security and setuid programs .It Xr signal 7 diff --git a/share/man/man8/security.8 b/share/man/man7/security.7 similarity index 98% rename from share/man/man8/security.8 rename to share/man/man7/security.7 index d122cd108ee6..4ed3e35987a8 100644 --- a/share/man/man8/security.8 +++ b/share/man/man7/security.7 @@ -1,6 +1,6 @@ -.\" $NetBSD: security.8,v 1.28 2010/12/21 08:50:18 jruoho Exp $ +.\" $NetBSD: security.7,v 1.1 2011/03/18 15:21:57 jruoho Exp $ .\" -.\" Copyright (c) 2006 Elad Efrat +.\" Copyright (c) 2006, 2011 Elad Efrat .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,8 +25,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 21, 2010 -.Dt SECURITY 8 +.Dd March 18, 2011 +.Dt SECURITY 7 .Os .Sh NAME .Nm security diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 3123be63c310..668317201e78 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2011/01/26 11:25:51 nisimura Exp $ +# $NetBSD: Makefile,v 1.100 2011/03/18 15:21:57 jruoho Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/5/93 MAN= MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \ @@ -7,7 +7,7 @@ MAN= MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \ compat_netbsd32.8 compat_osf1.8 compat_pecoff.8 compat_sunos.8 \ compat_svr4.8 compat_ultrix.8 diskless.8 hpcboot.8 \ intro.8 nis.8 pam.8 rc.8 rc.subr.8 rescue.8 \ - security.8 sysinst.8 veriexec.8 \ + sysinst.8 veriexec.8 \ wizd.8 MLINKS+=MAKEDEV.8 makedev.8 MLINKS+=MAKEDEV.local.8 makedev.local.8