[illumos-gate merge]

commit f76886de6cd6914424d9f6c25bd9d93d87889269
    7402 Create tunable to ignore hole_birth feature
commit 5bdf86e2a288d6c81a0bcc50a98699f52557bab6
    7401 loader.4th is missing newline
commit ed4e7a6a5cbc5e8986dc649ad54435210487b102
    7340 receive manual origin should override automatic origin
commit b021ac0b78f8df3d9c421783d9a323723df84925
    7337 inherit_001_pos occasionally times out
commit c166b69d29138aed7a415fe7cef698e54c6ae945
    7254 ztest failed assertion in ztest_dataset_dirobj_verify: dirobjs + 1 == usedobjs
commit 754998c8d410b7b7ddefbfa4de310a030e0c7ce1
    7253 ztest failure: dsl_destroy_head(name) == 0 (0x10 == 0x0), file ../ztest.c, line 3235
commit 4220fdc152e5dfec9a1dd51452175295f3684689
    7398 zfs test zfs_get_005_neg does not work as expected
commit d5f26ad8122c3762fb16413a17bfb497db86a782
    5142 libzfs support raidz root pool (loader project)
commit c8811bd3e2427dddbac6c05a59cfe117d8fea370
    5120 zfs should allow large block/gzip/raidz boot pool (loader project)
commit 12e3fba22ec759e9dd8f9564fad79541275b2aa5
    6709 manual pages need to be updated for loader (loader project)
commit fa0c327afe484fa5ff164fb81ff93715dd6573f8
    6706 disable grub menu management in bootadm (loader project)
    6707 disable grub menu management in libbe (loader project)
commit 9abc7a578aecf9064f46563361e8f856b4bdc35e
    6705 halt: replace grub_get_boot_args with be_get_boot_args (loader project)
commit a6424c753d6e2f0f04fb65b11e9f9c04445ccbae
    6704 svc.startd: replace grub_get_boot_args with be_get_boot_args (loader project)
commit c262cbbc8301f7c884fd4800056ee51ba75d931c
    6703 update bootadm to support loader configuration (loader project)
    6708 update eeprom for loader (loader project)
commit ce3cb817f67103796b730fd322174dddefd9a9a8
    6702 libbe should support x86 installboot command (loader project)
commit 0c946d80993858b7b1314e0b31773e48500e03fb
    6701 add installboot to i386 platform (loader project)
commit 1386b601c0c7f5c89a9325b8a1e34037304e8119
    6700 remove installboot script from i386 platform (loader project)
commit f5e5a2c4965aa1013184568ca3140cdcba93e44b
    6699 be_get_boot_args interface implementation in libbe (loader project)
commit 199767f8919635c4928607450d9e0abb932109ce
    5061 freebsd boot loader integration (loader project)
commit 0cc5983c8a077e6396dc7c492ee928b40bf0fed1
    6698 freebsd btxld port for illumos (loader project)
commit afc2ba1deb75b323afde536f2dd18bcafdaa308d
    6185 want ficl scripting engine in illumos (loader project)

	Conflicts:
	exception_lists/cstyle
	exception_lists/hdrchk
	exception_lists/copyright

1 files changed, 16 insertions, 13 deletions

diff --git a/usr/src/man/man1m/eeprom.1m b/usr/src/man/man1m/eeprom.1m
index a4d0213654..b24478363c 100644
--- a/usr/src/man/man1m/eeprom.1m
+++ b/usr/src/man/man1m/eeprom.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH EEPROM 1M "Mar 28, 2007"
+.TH EEPROM 1M "Feb 21, 2016"
 .SH NAME
 eeprom \- EEPROM display and load utility
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ eeprom \- EEPROM display and load utility
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBeeprom\fR displays or changes the values of parameters in the \fBEEPROM.\fR
 It processes parameters in the order given. When processing a \fIparameter\fR
@@ -35,13 +34,11 @@ incorrect.
 \fIplatform-name\fR is the name of the platform implementation and can be found
 using the \fB-i\fR option of \fBuname\fR(1).
 .SS "SPARC"
-.sp
 .LP
 \fBSPARC\fR based systems implement firmware password protection with
 \fBeeprom\fR, using the \fBsecurity-mode\fR, \fBsecurity-password\fR and
 \fBsecurity-#badlogins\fR properties.
 .SS "x86"
-.sp
 .LP
 \fBEEPROM\fR storage is simulated using a file residing in the
 platform-specific boot area. The \fB/boot/solaris/bootenv.rc\fR file simulates
@@ -55,7 +52,6 @@ program. While it is possible to set the \fBsecurity-mode\fR,
 systems, these properties have no special meaning or behavior on x86 based
 systems.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-f\fR \fIdevice\fR\fR
@@ -67,7 +63,6 @@ Use \fIdevice\fR as the \fBEEPROM\fR device.
 
 .SH OPERANDS
 .SS "x86 Only"
-.sp
 .ne 2
 .na
 \fB\fIacpi-user-options\fR\fR
@@ -107,15 +102,26 @@ and then, if you do not obtain satisfactory results, \fB0x02\fR.
 Specifies the console device.
 Possible values are \fBttya\fR, \fBttyb\fR, \fBttyc\fR, \fBttyd\fR, and
 \fBtext\fR. In \fBtext\fR mode, console output goes to the frame buffer and
-input comes from the keyboard. When this property is not present, the console
-device falls back to the device specified by \fBinput-device\fR and
+input comes from the keyboard. For SPARC, when this property is not present,
+the console device falls back to the device specified by \fBinput-device\fR and
 \fBoutput-device\fR. When neither the console property or the
 \fBinput-device\fR and \fBoutput-device\fR property pair are present, the
 console defaults to the frame buffer and keyboard.
 .RE
 
+.SS "x86 Only"
+.ne 2
+.na
+\fB\fIos_console\fR\fR
+.ad
+.sp .6
+.RS 4n
+While \fBconsole\fR controls both boot loader and kernel console, setting
+\fBos_console\fR allows setting console device only for kernel. Values
+are the same as for \fBconsole\fR.
+.RE
+
 .SH NVRAM CONFIGURATION PARAMETERS
-.sp
 .LP
 Not all OpenBoot systems support all parameters. Defaults vary depending on the
 system and the \fBPROM\fR revision. See the output in the "Default Value"
@@ -129,8 +135,7 @@ prompt, to determine the default for your system.
 .sp .6
 .RS 4n
 If \fBtrue\fR, boots automatically after power-on or reset. Defaults to
-\fBtrue\fR. On x86, this parameter is controlled by the grub menu file. See
-\fBinstallgrub\fR(1M).
+\fBtrue\fR.
 .RE
 
 .sp
@@ -1270,7 +1275,6 @@ you might use a device other than device \fBa\fR, as shown above. For example,
 you could set console to \fBttyb\fR if the second serial port is present.
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/boot/solaris/bootenv.rc\fR\fR
@@ -1302,7 +1306,6 @@ Platform-specific version of \fBeeprom\fR. Use \fBuname\fR \fB-i\fR to obtain
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpasswd\fR(1), \fBsh\fR(1), \fBsvcs\fR(1),  \fBtip\fR(1),  \fBuname\fR(1),
 \fBboot\fR(1M), \fBkadb\fR(1M), \fBkernel\fR(1M), \fBinit\fR(1M),