From 9d79fe8aac73d89fa2e2b25a0deca564e26e7672 Mon Sep 17 00:00:00 2001
From: Joseph Koshy <jkoshy@FreeBSD.org>
Date: Thu, 21 Oct 1999 09:18:27 +0000
Subject: [PATCH] Change bootloader prompt in description to match post-3.2
 reality.  Add <userinput> tags.  Replace occurrence of "#" with
 &prompt.root;.

PR:             docs/14432 (partial)
Submitted by:   Lowell Gilbert <lowell@world.std.com>
---
 en_US.ISO8859-1/books/faq/book.sgml  | 7 ++++---
 en_US.ISO_8859-1/books/faq/book.sgml | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index eb31a3f71d..c0baeee5ca 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -10,7 +10,7 @@
 </author>
 </authorgroup>
 
-<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.14 1999/10/04 22:22:19 jesusr Exp $</pubdate>
+<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.15 1999/10/20 11:44:08 des Exp $</pubdate>
 
 <abstract><para>    This is the FAQ for FreeBSD systems version 2.X  All entries are
     assumed to be relevant to FreeBSD 2.0.5 and later, unless otherwise noted.
@@ -4296,9 +4296,10 @@ restart sendmail after updating sendmail.cf.</para>
 <qandaentry><question>
 <para>Eek! I forgot the root password!</para></question><answer>
 
-<para>Don't Panic!  Simply restart the system, type -s at the Boot: prompt
+<para>Don't Panic!  Simply restart the system, type <userinput>boot -s</userinput> 
+at the Boot: prompt (just <userinput>-s</userinput> for FreeBSD releases before 3.2)
 to enter Single User mode.  At the question about the shell to use,
-hit ENTER.  You'll be dropped to a # prompt.  Enter <command>mount -u /</command> to
+hit ENTER.  You'll be dropped to a &prompt.root; prompt.  Enter <command>mount -u /</command> to
 remount your root filesystem read/write, then run <command>mount -a</command> to 
 remount all the filesystems.  Run <emphasis remap=tt>passwd root</emphasis> to 
 change the root password then run <emphasis remap=tt>exit</emphasis>
diff --git a/en_US.ISO_8859-1/books/faq/book.sgml b/en_US.ISO_8859-1/books/faq/book.sgml
index eb31a3f71d..c0baeee5ca 100644
--- a/en_US.ISO_8859-1/books/faq/book.sgml
+++ b/en_US.ISO_8859-1/books/faq/book.sgml
@@ -10,7 +10,7 @@
 </author>
 </authorgroup>
 
-<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.14 1999/10/04 22:22:19 jesusr Exp $</pubdate>
+<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.15 1999/10/20 11:44:08 des Exp $</pubdate>
 
 <abstract><para>    This is the FAQ for FreeBSD systems version 2.X  All entries are
     assumed to be relevant to FreeBSD 2.0.5 and later, unless otherwise noted.
@@ -4296,9 +4296,10 @@ restart sendmail after updating sendmail.cf.</para>
 <qandaentry><question>
 <para>Eek! I forgot the root password!</para></question><answer>
 
-<para>Don't Panic!  Simply restart the system, type -s at the Boot: prompt
+<para>Don't Panic!  Simply restart the system, type <userinput>boot -s</userinput> 
+at the Boot: prompt (just <userinput>-s</userinput> for FreeBSD releases before 3.2)
 to enter Single User mode.  At the question about the shell to use,
-hit ENTER.  You'll be dropped to a # prompt.  Enter <command>mount -u /</command> to
+hit ENTER.  You'll be dropped to a &prompt.root; prompt.  Enter <command>mount -u /</command> to
 remount your root filesystem read/write, then run <command>mount -a</command> to 
 remount all the filesystems.  Run <emphasis remap=tt>passwd root</emphasis> to 
 change the root password then run <emphasis remap=tt>exit</emphasis>