summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/ksh/ksh.16
-rw-r--r--lib/libc/gen/glob.36
-rw-r--r--lib/libcrypto/man/OCSP_sendreq_new.36
-rw-r--r--lib/libcrypto/man/OPENSSL_config.36
-rw-r--r--lib/libcrypto/man/openssl.cnf.539
-rw-r--r--share/man/man4/man4.macppc/macobio.46
-rw-r--r--share/man/man4/man4.sparc64/fhc.48
-rw-r--r--share/man/man6/intro.68
-rw-r--r--share/man/man9/mi_switch.96
-rw-r--r--sys/arch/landisk/stand/mbr/mbr.88
10 files changed, 31 insertions, 68 deletions
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 64b08b13df8..5e0713e3459 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,8 +1,8 @@
-.\" $OpenBSD: ksh.1,v 1.190 2017/07/04 11:46:15 anton Exp $
+.\" $OpenBSD: ksh.1,v 1.191 2017/07/06 15:42:04 schwarze Exp $
.\"
.\" Public Domain
.\"
-.Dd $Mdocdate: July 4 2017 $
+.Dd $Mdocdate: July 6 2017 $
.Dt KSH 1
.Os
.Sh NAME
@@ -890,7 +890,7 @@ automatically tracked:
.Xr cp 1 ,
.Xr date 1 ,
.Xr ed 1 ,
-.Xr emacs 1 ,
+.Sy emacs ,
.Xr grep 1 ,
.Xr ls 1 ,
.Xr mail 1 ,
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 7778ff769e1..016324254b6 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: glob.3,v 1.34 2017/06/10 14:07:23 schwarze Exp $
+.\" $OpenBSD: glob.3,v 1.35 2017/07/06 15:42:04 schwarze Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 10 2017 $
+.Dd $Mdocdate: July 6 2017 $
.Dt GLOB 3
.Os
.Sh NAME
@@ -214,7 +214,7 @@ strings like
The pattern
.Ql {}
is left unexpanded for historical reasons.
-.Xr (csh 1
+.Xr ( csh 1
does the same thing to ease typing of
.Xr find 1
patterns.)
diff --git a/lib/libcrypto/man/OCSP_sendreq_new.3 b/lib/libcrypto/man/OCSP_sendreq_new.3
index fb3fc4497c4..5900ac046b3 100644
--- a/lib/libcrypto/man/OCSP_sendreq_new.3
+++ b/lib/libcrypto/man/OCSP_sendreq_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OCSP_sendreq_new.3,v 1.3 2016/12/06 14:54:55 schwarze Exp $
+.\" $OpenBSD: OCSP_sendreq_new.3,v 1.4 2017/07/06 15:42:04 schwarze Exp $
.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
.\"
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 6 2016 $
+.Dd $Mdocdate: July 6 2017 $
.Dt OCSP_SENDREQ_NEW 3
.Os
.Sh NAME
@@ -140,7 +140,7 @@ If
indicates an operation should be retried, the corresponding BIO can
be examined to determine which operation (read or write) should be
retried and appropriate action can be taken, for example a
-.Xr select 3
+.Xr select 2
call on the underlying socket.
.Pp
.Fn OCSP_REQ_CTX_free
diff --git a/lib/libcrypto/man/OPENSSL_config.3 b/lib/libcrypto/man/OPENSSL_config.3
index bf42b72fd22..a5fd5a8d368 100644
--- a/lib/libcrypto/man/OPENSSL_config.3
+++ b/lib/libcrypto/man/OPENSSL_config.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OPENSSL_config.3,v 1.5 2016/12/11 18:06:09 schwarze Exp $
+.\" $OpenBSD: OPENSSL_config.3,v 1.6 2017/07/06 15:42:04 schwarze Exp $
.\" OpenSSL ab6577a4 May 14 21:07:51 2014 +0100
.\"
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 11 2016 $
+.Dd $Mdocdate: July 6 2017 $
.Dt OPENSSL_CONFIG 3
.Os
.Sh NAME
@@ -103,7 +103,7 @@ automatically.
It is also possible to automatically call
.Fn OPENSSL_config
when an application calls
-.Xr OPENSSL_add_all_algorithms 3
+.Xr OpenSSL_add_all_algorithms 3
by compiling an application with the preprocessor symbol
.Dv OPENSSL_LOAD_CONF
#define'd.
diff --git a/lib/libcrypto/man/openssl.cnf.5 b/lib/libcrypto/man/openssl.cnf.5
index 1d8ee2d430e..de21a5d973a 100644
--- a/lib/libcrypto/man/openssl.cnf.5
+++ b/lib/libcrypto/man/openssl.cnf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.cnf.5,v 1.2 2016/12/12 22:02:55 jmc Exp $
+.\" $OpenBSD: openssl.cnf.5,v 1.3 2017/07/06 15:42:04 schwarze Exp $
.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
.\"
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 12 2016 $
+.Dd $Mdocdate: July 6 2017 $
.Dt OPENSSL.CNF 5
.Os
.Sh NAME
@@ -322,41 +322,6 @@ other_ctrl = EMPTY
# Supply all default algorithms
default_algorithms = ALL
.Ed
-.Ss SSL Configuration Module
-This module has the name
-.Ic ssl_conf
-which points to a section containing SSL configurations.
-.Pp
-Each line in the SSL configuration section contains the name of the
-configuration and the section containing it.
-.Pp
-Each configuration section consists of command value pairs for
-.Vt SSL_CONF .
-Each pair will be passed to a
-.Vt SSL_CTX
-or
-.Vt SSL
-structure if it calls
-.Xr SSL_CTX_config 3
-or
-.Xr SSL_config 3
-with the appropriate configuration name.
-.Pp
-Note: any characters before an initial dot in the configuration section
-are ignored so the same command can be used multiple times.
-.Pp
-For example:
-.Bd -literal -offset indent
-ssl_conf = ssl_sect
-
-[ssl_sect]
-server = server_section
-
-[server_section]
-RSA.Certificate = server-rsa.pem
-ECDSA.Certificate = server-ecdsa.pem
-Ciphers = ALL:!RC4
-.Ed
.Sh FILES
.Bl -tag -width /etc/ssl/openssl.cnf -compact
.It Pa /etc/ssl/openssl.cnf
diff --git a/share/man/man4/man4.macppc/macobio.4 b/share/man/man4/man4.macppc/macobio.4
index 6564a6f278c..12d8a6b58fe 100644
--- a/share/man/man4/man4.macppc/macobio.4
+++ b/share/man/man4/man4.macppc/macobio.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: macobio.4,v 1.19 2008/05/04 21:06:13 jmc Exp $
+.\" $OpenBSD: macobio.4,v 1.20 2017/07/06 15:42:04 schwarze Exp $
.\"
.\" Copyright (c) 2003 Dale Rahn.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: May 4 2008 $
+.Dd $Mdocdate: July 6 2017 $
.Dt MACOBIO 4 macppc
.Os
.Sh NAME
@@ -75,7 +75,7 @@ WD100x compatible hard disk controller driver
WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b wireless network device
.It Xr xlights 4
Xserve G4 and G5 front panel LEDs
-.It Xr zsc 4
+.It Xr zs 4
Zilog 8530 (ZSCC) serial communications driver
.El
.Sh SEE ALSO
diff --git a/share/man/man4/man4.sparc64/fhc.4 b/share/man/man4/man4.sparc64/fhc.4
index b65f3448aa0..2bff2bc733d 100644
--- a/share/man/man4/man4.sparc64/fhc.4
+++ b/share/man/man4/man4.sparc64/fhc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fhc.4,v 1.8 2008/01/18 22:06:01 jmc Exp $
+.\" $OpenBSD: fhc.4,v 1.9 2017/07/06 15:42:04 schwarze Exp $
.\"
.\" Copyright (c) 2004 Jason L. Wright (jason@thought.net)
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: January 18 2008 $
+.Dd $Mdocdate: July 6 2017 $
.Dt FHC 4 sparc64
.Os
.Sh NAME
@@ -55,14 +55,14 @@ includes the following
.Nm
drivers, sorted by driver name:
.Pp
-.Bl -tag -width zs/zstty/zskbd(4) -offset ind -compact
+.Bl -tag -width environ(4) -offset ind -compact
.It Xr clkbrd 4
SPARC64 Clock Board
.It Xr clock 4
Real-time clock
.It Xr environ 4
SPARC64 temperature sensor
-.It Xr zs/zstty/zskbd 4
+.It Xr zs 4
Zilog 8530 (ZSCC) serial communications driver
.El
.Sh SEE ALSO
diff --git a/share/man/man6/intro.6 b/share/man/man6/intro.6
index 20527c7d252..c0ad4131674 100644
--- a/share/man/man6/intro.6
+++ b/share/man/man6/intro.6
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.6,v 1.14 2010/01/10 10:53:33 jmc Exp $
+.\" $OpenBSD: intro.6,v 1.15 2017/07/06 15:42:04 schwarze Exp $
.\"
.\" Copyright (c) 1999 Hugh Graham
.\"
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: January 10 2010 $
+.Dd $Mdocdate: July 6 2017 $
.Dt INTRO 6
.Os
.Sh NAME
@@ -96,9 +96,7 @@ Convert Arabic numerals to English.
.It Xr phantasia 6
An interterminal fantasy game.
.It Xr pig 6
-Eformatray inputway asway Igpay Atinlay.
-Eesay
-.Xr igpay 6 .
+Format input as Pig Latin.
.It Xr pom 6
Display the phase of the moon.
.It Xr ppt 6
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index a777dbd8bdd..b04179fa79d 100644
--- a/share/man/man9/mi_switch.9
+++ b/share/man/man9/mi_switch.9
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mi_switch.9,v 1.5 2013/06/04 19:27:09 schwarze Exp $
+.\" $OpenBSD: mi_switch.9,v 1.6 2017/07/06 15:42:04 schwarze Exp $
.\" $NetBSD: ctxsw.9,v 1.9 1999/03/06 22:09:29 mycroft Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 4 2013 $
+.Dd $Mdocdate: July 6 2017 $
.Dt MI_SWITCH 9
.Os
.Sh NAME
@@ -71,7 +71,7 @@ routines by calling the machine-dependent
.Fn need_resched "void" .
.It
In the signal handling code
-.Pq see Xr issignal 9
+.Pq see Pa sys/kern/kern_sig.c
if a signal is delivered that causes a process to stop.
.El
.Pp
diff --git a/sys/arch/landisk/stand/mbr/mbr.8 b/sys/arch/landisk/stand/mbr/mbr.8
index 647a7e4b15b..3b92a4e16e3 100644
--- a/sys/arch/landisk/stand/mbr/mbr.8
+++ b/sys/arch/landisk/stand/mbr/mbr.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbr.8,v 1.5 2015/09/10 15:16:43 schwarze Exp $
+.\" $OpenBSD: mbr.8,v 1.6 2017/07/06 15:42:04 schwarze Exp $
.\"
.\" Copyright (c) 2006 Michael Shalayeff
.\" All rights reserved.
@@ -15,7 +15,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 10 2015 $
+.Dd $Mdocdate: July 6 2017 $
.Dt MBR 8 landisk
.Os
.Sh NAME
@@ -57,6 +57,6 @@ The partition table is empty.
.Sh SEE ALSO
.Xr boot 8 ,
.Xr boot_landisk 8 ,
-.Xr bootxx 8 ,
.Xr disklabel 8 ,
-.Xr fdisk 8
+.Xr fdisk 8 ,
+.Xr xxboot 8