diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-02-16 23:58:06 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-02-16 23:58:06 +0000 |
| commit | e183a6513f0ac55e6525a30cd38c4f9d0bc2241e (patch) | |
| tree | e6f699d92ca3d73eadb697f7ca700e7f285149bd /sys/arch | |
| parent | a921fcdb47616f154d655587ad8f95c2f1dddebf (diff) | |
Cancel the automatic boot when you hold ctrl to skip boot.conf.
"I like it" deraadt "sweet" tedu "love it" marco
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/stand/boot/boot.8 | 7 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/boot.8 | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8 index 17a16cd2b5c..861ca76cdae 100644 --- a/sys/arch/amd64/stand/boot/boot.8 +++ b/sys/arch/amd64/stand/boot/boot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot.8,v 1.10 2007/05/31 19:20:02 jmc Exp $ +.\" $OpenBSD: boot.8,v 1.11 2009/02/16 23:58:05 sthen Exp $ .\" .\" Copyright (c) 1997-2001 Michael Shalayeff .\" All rights reserved. @@ -25,7 +25,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: February 16 2009 $ .Dt BOOT 8 amd64 .Os .Sh NAME @@ -108,7 +108,8 @@ accepts at the interactive prompt. Though default settings usually suffice, they can be changed here. .Pp .Pa boot.conf -processing can be skipped by holding down either Control key as +processing can be skipped, and the automatic boot cancelled, by holding +down either Control key as .Nm starts. .It diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8 index f57f6560da0..34ed527f29f 100644 --- a/sys/arch/i386/stand/boot/boot.8 +++ b/sys/arch/i386/stand/boot/boot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot.8,v 1.47 2007/05/31 19:20:03 jmc Exp $ +.\" $OpenBSD: boot.8,v 1.48 2009/02/16 23:58:05 sthen Exp $ .\" .\" Copyright (c) 1997-2001 Michael Shalayeff .\" All rights reserved. @@ -25,7 +25,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: February 16 2009 $ .Dt BOOT 8 i386 .Os .Sh NAME @@ -108,7 +108,8 @@ accepts at the interactive prompt. Though default settings usually suffice, they can be changed here. .Pp .Pa boot.conf -processing can be skipped by holding down either Control key as +processing can be skipped, and the automatic boot cancelled, by holding +down either Control key as .Nm starts. .It |