Date: Sat, 3 Aug 2002 18:17:31 +0200 (CEST) From: Martin Heinen <martin@sumuk.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: docs/41286: [PATCH] missing <userinput> in books Message-ID: <200208031617.g73GHVne040997@Kain.sumuk.de>
next in thread | raw e-mail | index | archive | help
>Number: 41286
>Category: docs
>Synopsis: [PATCH] missing <userinput> in books
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: doc-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 03 09:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Martin Heinen
>Release: FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD Kain.sumuk.de 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Sun May 12 20:01:38 CEST 2002 toor@Kain.sumuk.de:/usr/obj/usr/src/sys/KAIN i386
>Description:
Added missing <userinput> elements to the books of
the Documentation Project.
>How-To-Repeat:
Read the books.
>Fix:
Index: developers-handbook/driverbasics/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml,v
retrieving revision 1.19
diff -u -r1.19 chapter.sgml
--- developers-handbook/driverbasics/chapter.sgml 11 Jul 2002 19:08:04 -0000 1.19
+++ developers-handbook/driverbasics/chapter.sgml 3 Aug 2002 15:45:53 -0000
@@ -123,7 +123,7 @@
<para>Simply running <command>make</command> with this makefile
will create a file <filename>skeleton.ko</filename> that can
be loaded into your system by typing:
-<screen>&prompt.root; kldload -v ./skeleton.ko</screen>
+<screen>&prompt.root; <userinput>kldload -v ./skeleton.ko</userinput></screen>
</para>
</sect2>
</sect1>
@@ -336,13 +336,13 @@
<para>To install this driver you will first need to make a node on
your filesystem with a command such as:</para>
- <screen>&prompt.root; mknod /dev/echo c 33 0</screen>
+ <screen>&prompt.root; <userinput>mknod /dev/echo c 33 0</userinput></screen>
<para>With this driver loaded you should now be able to type
something like:</para>
- <screen>&prompt.root; echo -n "Test Data" > /dev/echo
-&prompt.root; cat /dev/echo
+ <screen>&prompt.root; <userinput>echo -n "Test Data" > /dev/echo</userinput>
+&prompt.root; <userinput>cat /dev/echo</userinput>
Test Data</screen>
<para>Real hardware devices in the next chapter..</para>
Index: developers-handbook/ipv6/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml,v
retrieving revision 1.11
diff -u -r1.11 chapter.sgml
--- developers-handbook/ipv6/chapter.sgml 11 Jul 2002 19:08:07 -0000 1.11
+++ developers-handbook/ipv6/chapter.sgml 3 Aug 2002 16:06:41 -0000
@@ -680,9 +680,7 @@
of the packet, which should be more than 65,535. For example,
type as follows:</para>
- <para><userinput>
- &prompt.user; <command>ping6 -b 70000 -s 68000 ::1</command>
- </userinput></para>
+ <screen>&prompt.user; <userinput>ping6 -b 70000 -s 68000 ::1</userinput></screen>
<para>The IPv6 specification requires that the Jumbo Payload option
must not be used in a packet that carries a fragment header. If
@@ -697,10 +695,10 @@
statistics are incremented. You can see the statistics as output of
&man.netstat.8; command with `-s -p ip6' option:</para>
- <screen> &prompt.user; <command>netstat -s -p ip6</command>
+ <screen>&prompt.user; <userinput>netstat -s -p ip6</userinput>
ip6:
(snip)
- 1 with data size < data length</screen>
+ 1 with data size < data length</screen>
<para>So, kernel does not send an ICMPv6 error unless the erroneous
packet is an actual Jumbo Payload, that is, its packet size is more
Index: faq/book.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
retrieving revision 1.462
diff -u -r1.462 book.sgml
--- faq/book.sgml 29 Jul 2002 10:10:43 -0000 1.462
+++ faq/book.sgml 3 Aug 2002 15:20:04 -0000
@@ -1550,7 +1550,7 @@
bad144. For example, the following drive has
<command>bad144</command> enabled.:</para>
- <screen>&prompt.root; disklabel -r wd0
+ <screen>&prompt.root; <userinput>disklabel -r wd0</userinput>
# /dev/rwd0c:
type: ESDI
disk: wd0s1
@@ -4051,7 +4051,7 @@
the output from <command>pciconf -vl</command> for an onboard
sound chip:</para>
- <screen>&prompt.root; pciconf -vl
+ <screen>&prompt.root; <userinput>pciconf -vl</userinput>
chip1@pci0:31:5: class=0x040100 card=0x00931028 chip=0x24158086 rev=0x02 hdr=0x00
vendor = 'Intel Corporation'
device = '82801AA 8xx Chipset AC'97 Audio Controller'
Index: handbook/advanced-networking/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v
retrieving revision 1.148
diff -u -r1.148 chapter.sgml
--- handbook/advanced-networking/chapter.sgml 11 Jul 2002 19:08:19 -0000 1.148
+++ handbook/advanced-networking/chapter.sgml 3 Aug 2002 15:22:07 -0000
@@ -115,7 +115,7 @@
<para>To illustrate different aspects of routing, we will use the
following example from <command>netstat</command>:</para>
- <screen>&prompt.user; netstat -r
+ <screen>&prompt.user; <userinput>netstat -r</userinput>
Routing tables
Destination Gateway Flags Refs Use Netif Expire
@@ -1019,7 +1019,7 @@
Exports list on foobar:
/usr 10.10.10.0
/a 10.10.10.0
-&prompt.user; cd /host/foobar/usr</screen>
+&prompt.user; <userinput>cd /host/foobar/usr</userinput></screen>
</example>
<para>As seen in the example, the <command>showmount</command> shows
@@ -5433,7 +5433,7 @@
<example id="inetd-hangup">
<title>Sending <application>inetd</application> a HangUP Signal</title>
- <screen>&prompt.root; kill -HUP `cat /var/run/inetd.pid`</screen>
+ <screen>&prompt.root; <userinput>kill -HUP `cat /var/run/inetd.pid`</userinput></screen>
</example>
<para>Each line of the configuration file specifies an
Index: handbook/basics/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v
retrieving revision 1.74
diff -u -r1.74 chapter.sgml
--- handbook/basics/chapter.sgml 11 Jul 2002 19:08:21 -0000 1.74
+++ handbook/basics/chapter.sgml 3 Aug 2002 15:22:37 -0000
@@ -1316,8 +1316,8 @@
<para>On systems without <literal>DEVFS</literal>, device nodes are created
using the &man.MAKEDEV.8; script as shown below:</para>
- <screen>&prompt.root; cd /dev
-&prompt.root; sh MAKEDEV ad1
+ <screen>&prompt.root; <userinput>cd /dev</userinput>
+&prompt.root; <userinput>sh MAKEDEV ad1</userinput>
</screen>
<para>This example would make the proper device nodes
Index: handbook/config/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v
retrieving revision 1.54
diff -u -r1.54 chapter.sgml
--- handbook/config/chapter.sgml 31 Jul 2002 09:57:23 -0000 1.54
+++ handbook/config/chapter.sgml 3 Aug 2002 15:23:11 -0000
@@ -889,8 +889,8 @@
now we are only concerned with toggling Soft Updates on and
off, which is done by:</para>
- <screen>&prompt.root; tunefs -n enable /filesystem
-&prompt.root; tunefs -n disable /filesystem</screen>
+ <screen>&prompt.root; <userinput>tunefs -n enable /filesystem</userinput>
+&prompt.root; <userinput>tunefs -n disable /filesystem</userinput></screen>
<para>A filesystem cannot be modified with &man.tunefs.8; while
it is mounted. A good time to enable Soft Updates is before any
Index: handbook/linuxemu/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v
retrieving revision 1.73
diff -u -r1.73 chapter.sgml
--- handbook/linuxemu/chapter.sgml 16 May 2002 17:14:49 -0000 1.73
+++ handbook/linuxemu/chapter.sgml 3 Aug 2002 15:35:45 -0000
@@ -624,8 +624,8 @@
<step><para>Test-start maple:</para>
- <screen>&prompt.user; cd /usr/local/maple/bin
-&prompt.user; ./xmaple</screen>
+ <screen>&prompt.user; <userinput>cd /usr/local/maple/bin</userinput>
+&prompt.user; <userinput>./xmaple</userinput></screen>
<para>You should be up and running. Make sure to write
Maplesoft to let them know you would like a native FreeBSD
@@ -1872,7 +1872,7 @@
<para>Then the install-script is started, which will copy nearly
all the relevant files into the install-directory:</para>
- <screen>&prompt.root; /oracle/<SID>/sapreorg/KERNEL/UNIX/INSTTOOL.SH</screen>
+ <screen>&prompt.root; <userinput>/oracle/<replaceable>SID</replaceable>/sapreorg/KERNEL/UNIX/INSTTOOL.SH</userinput></screen>
<para>The IDES-Installation (4.6B) comes with a fully customized
SAP R/3 Demo-System, so there are six instead of just three
@@ -2859,9 +2859,9 @@
<para>To continue with the installation, I created a link and an
additional directory:</para>
- <screen>&prompt.root; pwd
+ <screen>&prompt.root; <userinput>pwd</userinput>
/compat/linux/usr/sap
-&prompt.root; ls -l
+&prompt.root; <userinput>ls -l</userinput>
total 4
drwxr-xr-x 3 idsadm sapsys 512 May 5 11:20 D00
drwxr-x--x 5 idsadm sapsys 512 May 5 11:35 IDS
Index: handbook/multimedia/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v
retrieving revision 1.36
diff -u -r1.36 chapter.sgml
--- handbook/multimedia/chapter.sgml 30 Jul 2002 01:04:20 -0000 1.36
+++ handbook/multimedia/chapter.sgml 3 Aug 2002 15:33:36 -0000
@@ -294,7 +294,7 @@
<para>After you reboot, log in and run <command>dmesg | grep
pcm</command> as shown below:</para>
- <screen>&prompt.root; dmesg | grep pcm
+ <screen>&prompt.root; <userinput>dmesg | grep pcm</userinput>
pcm0: <SB16 DSP 4.11> on sbc0</screen>
<para>The output from your system may look different. If no
@@ -308,8 +308,8 @@
<devicename>pcm0</devicename>, you will have to run the
following as <username>root</username>:</para>
- <screen>&prompt.root; cd /dev
-&prompt.root; sh MAKEDEV snd0</screen>
+ <screen>&prompt.root; <userinput>cd /dev</userinput>
+&prompt.root; <userinput>sh MAKEDEV snd0</userinput></screen>
<para>If the command returned <devicename>pcm1</devicename>,
follow the same steps as shown above, replacing
@@ -383,7 +383,7 @@
your soundcard, you can put a CD in the drive and play it
with &man.cdcontrol.1;.</para>
- <screen>&prompt.user; cdcontrol -f /dev/acd0c play 1</screen>
+ <screen>&prompt.user; <userinput>cdcontrol -f /dev/acd0c play 1</userinput></screen>
<para>Various applications, such as <filename
role="package">audio/workman</filename> offer a better
@@ -470,8 +470,8 @@
<para>To set the number of virtual channels, there are two sysctl
knobs which, if you are the <username>root</username> user, can
be set like this:</para>
- <screen>&prompt.root; sysctl hw.snd.pcm0.vchans=4
-&prompt.root; sysctl hw.snd.maxautovchans=4</screen>
+ <screen>&prompt.root; <userinput>sysctl hw.snd.pcm0.vchans=4</userinput>
+&prompt.root; <userinput>sysctl hw.snd.maxautovchans=4</userinput></screen>
<para>The above example allocates four virtual channels, which is a
practical number for everyday use. <varname>hw.snd.pcm0.vchans</varname>
@@ -538,7 +538,7 @@
the sound device and the MP3 file on the command line, as
shown below:</para>
- <screen>&prompt.root; mpg123 -a <replaceable>/dev/dsp1.0</replaceable> Foobar-GreatestHits.mp3
+ <screen>&prompt.root; <userinput>mpg123 -a <replaceable>/dev/dsp1.0</replaceable> Foobar-GreatestHits.mp3</userinput>
High Performance MPEG 1.0/2.0/2.5 Audio Player for Layer 1, 2 and 3.
Version 0.59r (1999/Jun/15). Written and copyrights by Michael Hipp.
Uses code from various people. See 'README' for more!
@@ -574,14 +574,14 @@
be issued (as <username>root</username>) to rip an entire CD
into individual (per track) WAV files:</para>
- <screen>&prompt.root; cdda2wav -D <replaceable>0,1,0</replaceable> -B</screen>
+ <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -B</userinput></screen>
<para><application>cdda2wav</application> will support
ATAPI (IDE) CDROM drives. To rip from an IDE drive, specify
the device name in place of the SCSI unit numbers. For
example, to rip track 7 from an IDE drive:</para>
- <screen>&prompt.root; cdda2wav -D <replaceable>/dev/acd0a</replaceable> -t 7</screen>
+ <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>/dev/acd0a</replaceable> -t 7</userinput></screen>
<para>The <option>-D <replaceable>0,1,0</replaceable></option>
indicates the SCSI device <devicename>0,1,0</devicename>,
@@ -591,13 +591,13 @@
<para>To rip individual tracks, make use of the
<option>-t</option> option as shown:</para>
- <screen>&prompt.root; cdda2wav -D <replaceable>0,1,0</replaceable> -t 7</screen>
+ <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -t 7</userinput></screen>
<para>This example rips track seven of the audio CDROM. To rip
a range of tracks, for example, track one to seven, specify a
range:</para>
- <screen>&prompt.root; cdda2wav -D <replaceable>0,1,0</replaceable> -t 1+7</screen>
+ <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -t 1+7</userinput></screen>
</sect2>
@@ -613,14 +613,14 @@
convert <filename>audio01.wav</filename> to
<filename>audio01.mp3</filename>:</para>
- <screen>&prompt.root; lame -h -b <replaceable>128</replaceable> \
+ <screen>&prompt.root; <userinput>lame -h -b <replaceable>128</replaceable> \
--tt "<replaceable>Foo Song Title</replaceable>" \
--ta "<replaceable>FooBar Artist</replaceable>" \
--tl "<replaceable>FooBar Album</replaceable>" \
--ty "<replaceable>2001</replaceable>" \
--tc "<replaceable>Ripped and encoded by Foo</replaceable>" \
--tg "<replaceable>Genre</replaceable>" \
-<replaceable>audio01.wav audio01.mp3</replaceable></screen>
+<replaceable>audio01.wav audio01.mp3</replaceable></userinput></screen>
<para>128 kbits seems to be the standard MP3 bitrate in use.
Many enjoy the higher quality 160, or 192. The higher the
@@ -746,14 +746,14 @@
name hardcoded in them, you might find it useful to make
symbolic links to the proper devices:</para>
- <screen>&prompt.root; ln -sf /dev/acd0c /dev/dvd
-&prompt.root; ln -sf /dev/racd0c /dev/rdvd</screen>
+ <screen>&prompt.root; <userinput>ln -sf /dev/acd0c /dev/dvd</userinput>
+&prompt.root; <userinput>ln -sf /dev/racd0c /dev/rdvd</userinput></screen>
<para>On FreeBSD 5.X, which uses &man.devfs.5; there
is a slightly different set of recommended links:</para>
- <screen>&prompt.root; ln -sf /dev/acd0c /dev/dvd
-&prompt.root; ln -sf /dev/acd0c /dev/rdvd</screen>
+ <screen>&prompt.root; <userinput>ln -sf /dev/acd0c /dev/dvd</userinput>
+&prompt.root; <userinput>ln -sf /dev/acd0c /dev/rdvd</userinput></screen>
<para>Additionally, DVD decryption, which requires invoking
special DVD-ROM functions, requires write permission on the DVD
@@ -851,7 +851,7 @@
To check whether the extension is running,
use <command>xvinfo</command>:</para>
- <screen>&prompt.user; xvinfo</screen>
+ <screen>&prompt.user; <userinput>xvinfo</userinput></screen>
<para>XVideo is supported for your card if the result looks like:</para>
<screen>X-Video Extension version 2.2
@@ -1096,8 +1096,8 @@
<command>make</command> which echo at the start of the
build.</para>
- <screen>&prompt.root; cd /usr/ports/graphics/mplayer
-&prompt.root; make
+ <screen>&prompt.root; <userinput>cd /usr/ports/graphics/mplayer</userinput>
+&prompt.root; <userinput>make</userinput>
You can enable additional compilation optimizations
by defining WITH_OPTIMIZED_CFLAGS
You can enable GTK GUI by defining WITH_GUI.
@@ -1117,7 +1117,7 @@
before enabling this option.</para> </footnote>. Some
reasonable options are:</para>
- <screen>&prompt.root; make WITH_DVD=yes WITH_SVGALIB=yes</screen>
+ <screen>&prompt.root; <userinput>make WITH_DVD=yes WITH_SVGALIB=yes</userinput></screen>
<para>As of this writing, the <application>MPlayer</application> port will build its HTML
documentation and one executable,
@@ -1147,8 +1147,8 @@
home directory. To create this necessary subdirectory,
you can do the following:</para>
-<screen>&prompt.user; cd /usr/ports/graphics/mplayer
-&prompt.user; make install-user</screen>
+<screen>&prompt.user; <userinput>cd /usr/ports/graphics/mplayer</userinput>
+&prompt.user; <userinput>make install-user</userinput></screen>
<para>The command options for <command>mplayer</command> are
listed in the manual page. For even more detail there is HTML
@@ -1159,11 +1159,11 @@
<filename>testfile.avi</filename> through one of the various
video interfaces set the <option>-vo</option>:
- <screen>&prompt.user; mplayer -vo xv testfile.avi</screen>
- <screen>&prompt.user; mplayer -vo sdl testfile.avi</screen>
- <screen>&prompt.user; mplayer -vo x11 testfile.avi</screen>
- <screen>&prompt.root; mplayer -vo dga testfile.avi</screen>
- <screen>&prompt.root; mplayer -vo 'sdl:dga' testfile.avi</screen>
+ <screen>&prompt.user; <userinput>mplayer -vo xv testfile.avi</userinput></screen>
+ <screen>&prompt.user; <userinput>mplayer -vo sdl testfile.avi</userinput></screen>
+ <screen>&prompt.user; <userinput>mplayer -vo x11 testfile.avi</userinput></screen>
+ <screen>&prompt.root; <userinput>mplayer -vo dga testfile.avi</userinput></screen>
+ <screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' testfile.avi</userinput></screen>
<para>It is worth trying all of these options, as their relative
performance depends on many factors and will vary significantly
@@ -1177,7 +1177,7 @@
device node for the DVD-ROM. For example, to play title 3
from <filename>/dev/dvd</filename>:</para>
- <screen>&prompt.root; mplayer -vo dga -dvd 2 /dev/dvd</screen>
+ <screen>&prompt.root; <userinput>mplayer -vo dga -dvd 2 /dev/dvd</userinput></screen>
<para>To stop, pause, advance and so on, consult the
keybindings, which are output by running <command>mplayer
@@ -1198,7 +1198,7 @@
<para>Finally, <command>mplayer</command> can be used to rip a
DVD title into a <filename>.vob</filename> file. To dump out title 2 from a DVD:</para>
- <screen>&prompt.root; mplayer -dumpstream -dumpfile out.vob -dvd 2 /dev/dvd</screen>
+ <screen>&prompt.root; <userinput>mplayer -dumpstream -dumpfile out.vob -dvd 2 /dev/dvd</userinput></screen>
<para>The output file, <filename>out.vob</filename>, will be
MPEG and can be manipulated by the other packages described
@@ -1224,7 +1224,7 @@
or bad performance. Here are a couple of examples to get
you going. First a simple copy:</para>
- <screen>&prompt.user; mencoder input.avi -oac copy -ovc copy -o output.avi</screen>
+ <screen>&prompt.user; <userinput>mencoder input.avi -oac copy -ovc copy -o output.avi</userinput></screen>
<para>It is easy to find examples where the output is
unplayable even by <command>mplayer</command>. Thus, if you
@@ -1234,8 +1234,8 @@
<para>To convert <filename>input.avi</filename> to the MPEG4
codec with MPEG3 audio encoding (<filename role="package">audio/lame</filename> is required):</para>
- <screen>&prompt.user; mencoder input.avi -oac mp3lame -lameopts br=192 \
- -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi</screen>
+ <screen>&prompt.user; <userinput>mencoder input.avi -oac mp3lame -lameopts br=192 \
+ -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi</userinput></screen>
<para>This has produced output playable by <command>mplayer</command>
and <command>xine</command>.</para>
@@ -1303,26 +1303,26 @@
many options to the <command>make</command> command. I
recommend:</para>
- <screen>&prompt.root; make WITH_LIBMPEG2=yes</screen>
+ <screen>&prompt.root; <userinput>make WITH_LIBMPEG2=yes</userinput></screen>
<para>If you plan to install <filename
role="package">graphics/avifile</filename>, then add the
<literal>WITH_AVIFILE</literal> option to your
<command>make</command> command line, as shown here:</para>
- <screen>&prompt.root; make WITH_AVIFILE=yes WITH_LIBMPEG2=yes</screen>
+ <screen>&prompt.root; <userinput>make WITH_AVIFILE=yes WITH_LIBMPEG2=yes</userinput></screen>
<para>Here are two examples of using <command>transcode</command>
for video conversion which produce rescaled output. The first
encodes the output to an openDIVX AVI file, while the second
encodes to the much more portable MPEG format.</para>
- <screen>&prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \
--y opendivx -N 0x55 -o output.avi</screen>
+ <screen>&prompt.user; <userinput>transcode -i input.vob -x vob -V -Z 320x240 \
+-y opendivx -N 0x55 -o output.avi</userinput></screen>
- <screen>&prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \
--y mpeg -N 0x55 -o output.tmp
-&prompt.user; tcmplex -o output.mpg -i output.tmp.m1v -p output.tmp.mpa -m 1</screen>
+ <screen>&prompt.user; <userinput>transcode -i input.vob -x vob -V -Z 320x240 \
+-y mpeg -N 0x55 -o output.tmp</userinput>
+&prompt.user; <userinput>tcmplex -o output.mpg -i output.tmp.m1v -p output.tmp.mpa -m 1</userinput></screen>
<para>There is a manual page for <command>transcode</command>, but
for the various <command>tc*</command> utilities (such as
Index: handbook/ports/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v
retrieving revision 1.177
diff -u -r1.177 chapter.sgml
--- handbook/ports/chapter.sgml 11 Jul 2002 12:09:24 -0000 1.177
+++ handbook/ports/chapter.sgml 3 Aug 2002 15:36:32 -0000
@@ -477,7 +477,7 @@
<para>As <username>root</username>, run <command>/stand/sysinstall</command> as
shown below:</para>
- <screen>&prompt.root; /stand/sysinstall</screen>
+ <screen>&prompt.root; <userinput>/stand/sysinstall</userinput></screen>
</step>
<step>
@@ -556,7 +556,7 @@
<step>
<para>Run <command>cvsup</command>:</para>
- <screen>&prompt.root; cvsup -g -L 2 <replaceable>/root/ports-supfile</replaceable></screen>
+ <screen>&prompt.root; <userinput>cvsup -g -L 2 <replaceable>/root/ports-supfile</replaceable></userinput></screen>
</step>
<step>
Index: handbook/printing/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v
retrieving revision 1.57
diff -u -r1.57 chapter.sgml
--- handbook/printing/chapter.sgml 29 Apr 2002 12:22:28 -0000 1.57
+++ handbook/printing/chapter.sgml 3 Aug 2002 15:37:13 -0000
@@ -522,7 +522,7 @@
<para>Change to the <filename>/dev</filename>
directory:</para>
- <screen>&prompt.root; cd <filename>/dev</filename></screen>
+ <screen>&prompt.root; <userinput>cd /dev</userinput></screen>
</step>
<step>
Index: handbook/security/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v
retrieving revision 1.112
diff -u -r1.112 chapter.sgml
--- handbook/security/chapter.sgml 2 Jul 2002 01:48:29 -0000 1.112
+++ handbook/security/chapter.sgml 3 Aug 2002 15:42:40 -0000
@@ -1801,12 +1801,12 @@
<para>Now try doing the <command>su</command>:</para>
- <screen>&prompt.user; <prompt>su</prompt>
-<prompt>Password:</prompt></screen>
+ <screen>&prompt.user; <userinput>su</userinput>
+Password:</screen>
<para>and take a look at what tokens we have:</para>
- <screen>&prompt.root; klist
+ <screen>&prompt.root; <userinput>klist</userinput>
Ticket file: /tmp/tkt_root_245
Principal: jane.root@EXAMPLE.COM
@@ -2876,11 +2876,11 @@
on both HOST A and B:</para>
<screen>
-&prompt.root; <command>setkey -c</command>
+&prompt.root; <userinput>setkey -c
add 10.2.3.4 10.6.7.8 ah-old 1000 -m transport -A keyed-md5 "MYSECRETMYSECRET" ;
add 10.6.7.8 10.2.3.4 ah 2000 -m transport -A hmac-sha1 "KAMEKAMEKAMEKAMEKAME" ;
add 10.6.7.8 10.2.3.4 esp 3000 -m transport -E des-cbc "PASSWORD" ;
-^D
+^D</userinput>
</screen>
<para>Actually, IPsec communication does not process until security policy
@@ -2889,19 +2889,19 @@
<screen>
At A:
-&prompt.root; <command>setkey -c</command>
+&prompt.root; <userinput>setkey -c
spdadd 10.2.3.4 10.6.7.8 any -P out ipsec
ah/transport/10.2.3.4-10.6.7.8/require ;
-^D
+^D</userinput>
At B:
-&prompt.root; <command>setkey -c</command>
+&prompt.root; <userinput>setkey -c
spdadd 10.6.7.8 10.2.3.4 any -P out ipsec
esp/transport/10.6.7.8-10.2.3.4/require ;
spdadd 10.6.7.8 10.2.3.4 any -P out ipsec
ah/transport/10.6.7.8-10.2.3.4/require ;
-^D
+^D</userinput>
HOST A --------------------------------------> HOST E
@@ -2935,7 +2935,7 @@
Configuration at Host-A:</para>
<screen>
- &prompt.root; <command>setkey -c</command> <<<filename>EOF</filename>
+ &prompt.root; <userinput>setkey -c <<EOF
spdadd fec0::10[any] fec0::11[110] tcp -P out ipsec
esp/transport/fec0::10-fec0::11/use ;
spdadd fec0::11[110] fec0::10[any] tcp -P in ipsec
@@ -2948,12 +2948,12 @@
-m transport
-E blowfish-cbc "kamekame"
-A hmac-sha1 "this is the test key" ;
- EOF
+ EOF</userinput>
</screen>
<para>and at Host-B:</para>
- <screen>&prompt.root; <command>setkey -c</command> <<<filename>EOF</filename>
+ <screen>&prompt.root; <userinput>setkey -c <<EOF
spdadd fec0::11[110] fec0::10[any] tcp -P out ipsec
esp/transport/fec0::11-fec0::10/use ;
spdadd fec0::10[any] fec0::11[110] tcp -P in ipsec
@@ -2964,7 +2964,7 @@
add fec0::11 fec0::10 esp 0x10002 -m transport
-E blowfish-cbc "kamekame"
-A hmac-sha1 "this is the test key" ;
- EOF
+ EOF</userinput>
</screen>
<para>Note the direction of SP.</para>
@@ -2989,7 +2989,7 @@
<para>Configuration at Gateway-A:</para>
<screen>
- &prompt.root; <command>setkey -c</command> <<<filename>EOF</filename>
+ &prompt.root; <userinput>setkey -c <<EOF
spdadd 10.0.1.0/24 10.0.2.0/24 any -P out ipsec
ah/tunnel/172.16.0.1-172.16.0.2/require ;
spdadd 10.0.2.0/24 10.0.1.0/24 any -P in ipsec
@@ -2999,7 +2999,7 @@
add 172.16.0.2 172.16.0.1 ah-old 0x10004 -m any
-A keyed-md5 "this is the test" ;
- EOF
+ EOF</userinput>
</screen>
<para>If the port number field is omitted such as above then
@@ -3011,7 +3011,7 @@
<para>and at Gateway-B:</para>
<screen>
- &prompt.root; <command>setkey -c</command> <<<filename>EOF</filename>
+ &prompt.root; <userinput>setkey -c <<EOF
spdadd 10.0.2.0/24 10.0.1.0/24 any -P out ipsec
ah/tunnel/172.16.0.2-172.16.0.1/require ;
spdadd 10.0.1.0/24 10.0.2.0/24 any -P in ipsec
@@ -3021,7 +3021,7 @@
add 172.16.0.2 172.16.0.1 ah-old 0x10004 -m any
-A keyed-md5 "this is the test" ;
- EOF
+ EOF</userinput>
</screen>
<para>Making SA bundle between two security gateways</para>
@@ -3047,7 +3047,7 @@
Configuration at Gateway-A:</para>
<screen>
- &prompt.root; <command>setkey -c</command> <<<filename>EOF</filename>
+ &prompt.root; <userinput>setkey -c <<EOF
spdadd fec0:0:0:1::/64 fec0:0:0:2::/64 any -P out ipsec
esp/tunnel/fec0:0:0:1::1-fec0:0:0:2::1/require
ah/transport/fec0:0:0:1::1-fec0:0:0:2::1/require ;
@@ -3065,7 +3065,7 @@
add fec0:0:0:2::1 fec0:0:0:1::1 ah 0x10001 -m transport
-A hmac-md5 "this is the test" ;
- EOF
+ EOF</userinput>
</screen>
<para>Making SAs with the different end</para>
@@ -3087,7 +3087,7 @@
<para>Configuration at Host-A:</para>
<screen>
- &prompt.root; <command>setkey -c</command> <<<filename>EOF</filename>
+ &prompt.root; <userinput>setkey -c <<EOF
spdadd fec0:0:0:1::1[any] fec0:0:0:2::2[80] tcp -P out ipsec
esp/transport/fec0:0:0:1::1-fec0:0:0:2::2/use
esp/tunnel/fec0:0:0:1::1-fec0:0:0:2::1/require ;
@@ -3109,7 +3109,7 @@
-E rc5-cbc "kamekame"
-A hmac-md5 "this is the test" ;
- EOF
+ EOF</userinput>
</screen>
</sect2>
</sect1>
Index: handbook/x11/chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v
retrieving revision 1.88
diff -u -r1.88 chapter.sgml
--- handbook/x11/chapter.sgml 27 Jul 2002 11:17:21 -0000 1.88
+++ handbook/x11/chapter.sgml 3 Aug 2002 15:44:03 -0000
@@ -364,7 +364,7 @@
<application>XFree86</application>. As the super user, simply
run:</para>
- <screen>&prompt.root; XFree86 -configure</screen>
+ <screen>&prompt.root; <userinput>XFree86 -configure</userinput></screen>
<para>This will generate a skeleton
<application>XFree86</application> configuration file in the
@@ -381,7 +381,7 @@
hardware on the target system. To perform this task, the user
needs to run:</para>
- <screen>&prompt.root; XFree86 -xf86config XF86Config.new</screen>
+ <screen>&prompt.root; <userinput>XFree86 -xf86config XF86Config.new</userinput></screen>
<para>If a black and grey grid and an X mouse cursor appear,
the configuration was successful. To exit the test, just press
@@ -475,7 +475,7 @@
This is typically <filename>/etc/X11/XF86Config</filename> or
<filename>/usr/X11R6/etc/X11/XF86Config</filename>.</para>
- <screen>&prompt.root; cp XF86Config.new /etc/X11/XF86Config</screen>
+ <screen>&prompt.root; <userinput>cp XF86Config.new /etc/X11/XF86Config</userinput></screen>
<para>Once the configuration file has been placed in a common
location, configuration is complete. In order to start
@@ -511,8 +511,8 @@
&man.MAKEDEV.8; in the <filename>/dev</filename>
directory:</para>
- <screen>&prompt.root; cd /dev
-&prompt.root; sh MAKEDEV agpgart</screen>
+ <screen>&prompt.root; <userinput>cd /dev</userinput>
+&prompt.root; <userinput>sh MAKEDEV agpgart</userinput></screen>
<para>This will allow configuration of the hardware as any other
graphics board.</para>
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200208031617.g73GHVne040997>