From 7734e07d124410cdbd636c959f922ee7549b5a03 Mon Sep 17 00:00:00 2001 From: tg Date: Mon, 9 Jun 2014 11:22:50 +0000 Subject: [PATCH] oksh sync --- mksh.1 | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/mksh.1 b/mksh.1 index 776e790..e534a04 100644 --- a/mksh.1 +++ b/mksh.1 @@ -1,5 +1,5 @@ -.\" $MirOS: src/bin/mksh/mksh.1,v 1.333 2014/06/06 23:50:22 tg Exp $ -.\" $OpenBSD: ksh.1,v 1.151 2014/01/28 14:16:59 jmc Exp $ +.\" $MirOS: src/bin/mksh/mksh.1,v 1.334 2014/06/09 11:22:50 tg Exp $ +.\" $OpenBSD: ksh.1,v 1.152 2014/02/12 16:28:13 schwarze Exp $ .\"- .\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, .\" 2010, 2011, 2012, 2013, 2014 @@ -74,7 +74,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: June 6 2014 $ +.Dd $Mdocdate: June 9 2014 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" @@ -6374,20 +6374,30 @@ contains the system and suid profile. is developed by .An Thorsten Glaser Aq tg@mirbsd.org and currently maintained as part of The MirOS Project. -This shell is based upon the Public Domain Korn SHell. -The developer of mksh recognises the efforts of the pdksh authors, -who had dedicated their work into Public Domain, our users, and -all contributors, such as the Debian and OpenBSD projects. -.\" -.\" Charles Forsyth, author of the (Public Domain) Bourne Shell clone, -.\" which mksh is derived from, agreed to the following: -.\" -.\" In countries where the Public Domain status of the work may not be -.\" valid, its primary author hereby grants a copyright licence to the -.\" general public to deal in the work without restriction and permis- -.\" sion to sublicence derivates under the terms of any (OSI approved) -.\" Open Source licence. -.\" +This shell is based on the public domain 7th edition Bourne shell clone by +.An Charles Forsyth , +who kindly agreed to, in countries where the Public Domain status of the work +may not be valid, grant a copyright licence to the general public to deal in +the work without restriction and permission to sublicence derivates under the +terms of any (OSI approved) Open Source licence, +and parts of the BRL shell by +.An Doug A. Gwyn , +.An Doug Kingston , +.An Ron Natalie , +.An Arnold Robbins , +.An Lou Salkind , +and others. +The first release of +.Nm pdksh +was created by +.An Eric Gisin , +and it was subsequently maintained by +.An John R. MacMillan Aq Mt change!john@sq.sq.com , +.An Simon J. Gerraty Aq Mt sjg@zen.void.oz.au , +and +.An Michael Rendell Aq Mt michael@cs.mun.ca . +The effort of several projects, such as Debian and OpenBSD, and other +contributors including our users, to improve the shell is appreciated. See the documentation, CVS, and web site for details. .Pp The BSD daemon is Copyright \(co Marshall Kirk McKusick.