Remove extra blank lines inside programlisting, screen, and
literallayout sections. Translators please note, these are visible changes, not just whitespace.
This commit is contained in:
parent
557b64857c
commit
08e28d303b
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=39043
1 changed files with 23 additions and 47 deletions
|
@ -306,8 +306,7 @@ host2.example.com link#1 UC 0 0
|
|||
|
||||
<textobject>
|
||||
<literallayout class="monospaced">
|
||||
[Local2] <--ether--> [Local1] <--PPP--> [ISP-Serv] <--ether--> [T1-GW]
|
||||
</literallayout>
|
||||
[Local2] <--ether--> [Local1] <--PPP--> [ISP-Serv] <--ether--> [T1-GW]</literallayout>
|
||||
</textobject>
|
||||
</mediaobject>
|
||||
|
||||
|
@ -520,8 +519,7 @@ host2.example.com link#1 UC 0 0
|
|||
+------+
|
||||
| 192.168.2.1/24
|
||||
|
|
||||
Internal Net 2
|
||||
</literallayout>
|
||||
Internal Net 2</literallayout>
|
||||
</textobject>
|
||||
</mediaobject>
|
||||
|
||||
|
@ -2667,8 +2665,7 @@ Protocol Descriptor List:
|
|||
RFCOMM (0x0003)
|
||||
Protocol specific parameter #1: u/int8/bool 1
|
||||
Bluetooth Profile Descriptor List:
|
||||
LAN Access Using PPP (0x1102) ver. 1.0
|
||||
</screen>
|
||||
LAN Access Using PPP (0x1102) ver. 1.0</screen>
|
||||
|
||||
<para>... and so on. Note that each service has a list of
|
||||
attributes (RFCOMM channel for example). Depending on the
|
||||
|
@ -3535,8 +3532,7 @@ Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D</screen
|
|||
<programlisting>ifconfig_<replaceable>fxp0</replaceable>="up"
|
||||
ifconfig_<replaceable>fxp1</replaceable>="up"
|
||||
cloned_interfaces="<literal>lagg<replaceable>0</replaceable></literal>"
|
||||
ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto lacp laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.3/24</replaceable>"
|
||||
</programlisting>
|
||||
ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto lacp laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.3/24</replaceable>"</programlisting>
|
||||
</example>
|
||||
|
||||
<example id="networking-lagg-failover">
|
||||
|
@ -3585,8 +3581,7 @@ lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 150
|
|||
<programlisting>ifconfig_<replaceable>fxp0</replaceable>="up"
|
||||
ifconfig_<replaceable>fxp1</replaceable>="up"
|
||||
cloned_interfaces="<literal>lagg<replaceable>0</replaceable></literal>"
|
||||
ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.15/24</replaceable>"
|
||||
</programlisting>
|
||||
ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.15/24</replaceable>"</programlisting>
|
||||
</example>
|
||||
|
||||
<example id="networking-lagg-wired-and-wireless">
|
||||
|
@ -3676,8 +3671,7 @@ ifconfig_iwn0="ether 00:21:70:da:ae:37"
|
|||
wlans_iwn0="wlan0"
|
||||
ifconfig_wlan0="WPA"
|
||||
cloned_interfaces="<literal>lagg<replaceable>0</replaceable></literal>"
|
||||
ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover laggport bge0 laggport wlan0 DHCP"
|
||||
</programlisting>
|
||||
ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover laggport bge0 laggport wlan0 DHCP"</programlisting>
|
||||
</example>
|
||||
</sect2>
|
||||
</sect1>
|
||||
|
@ -3937,8 +3931,7 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover
|
|||
<hostid>corbieres</hostid> uses
|
||||
<acronym>PXE</acronym>:</para>
|
||||
|
||||
<programlisting>
|
||||
default-lease-time 600;
|
||||
<programlisting>default-lease-time 600;
|
||||
max-lease-time 7200;
|
||||
authoritative;
|
||||
|
||||
|
@ -3965,8 +3958,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
|
|||
filename "pxeboot";
|
||||
option root-path "192.168.4.4:/data/misc/diskless";
|
||||
}
|
||||
}
|
||||
</programlisting>
|
||||
}</programlisting>
|
||||
|
||||
<calloutlist>
|
||||
<callout arearefs="co-dhcp-host-name">
|
||||
|
@ -4045,8 +4037,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
|
|||
<application>bootpd</application> is that it exists in the
|
||||
base system.</para>
|
||||
|
||||
<programlisting>
|
||||
.def100:\
|
||||
<programlisting>.def100:\
|
||||
:hn:ht=1:sa=192.168.4.4:vm=rfc1048:\
|
||||
:sm=255.255.255.0:\
|
||||
:ds=192.168.4.1:\
|
||||
|
@ -4055,8 +4046,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
|
|||
:bf="/kernel.diskless":\
|
||||
:rp="192.168.4.4:/data/misc/diskless":
|
||||
|
||||
margaux:ha=0123456789ab:tc=.def100
|
||||
</programlisting>
|
||||
margaux:ha=0123456789ab:tc=.def100</programlisting>
|
||||
</sect3>
|
||||
|
||||
<sect3>
|
||||
|
@ -4099,9 +4089,7 @@ margaux:ha=0123456789ab:tc=.def100
|
|||
in the <application>Etherboot</application> tree and
|
||||
type:</para>
|
||||
|
||||
<screen>
|
||||
&prompt.root; <userinput>gmake bin32/<replaceable>devicetype</replaceable>.fd0</userinput>
|
||||
</screen>
|
||||
<screen>&prompt.root; <userinput>gmake bin32/<replaceable>devicetype</replaceable>.fd0</userinput></screen>
|
||||
|
||||
<para><replaceable>devicetype</replaceable> depends on the
|
||||
type of the Ethernet card in the diskless workstation.
|
||||
|
@ -4239,10 +4227,8 @@ margaux:ha=0123456789ab:tc=.def100
|
|||
client with the following options (in addition to the usual
|
||||
ones):</para>
|
||||
|
||||
<programlisting>
|
||||
options BOOTP # Use BOOTP to obtain IP address/hostname
|
||||
options BOOTP_NFSROOT # NFS mount root file system using BOOTP info
|
||||
</programlisting>
|
||||
<programlisting>options BOOTP # Use BOOTP to obtain IP address/hostname
|
||||
options BOOTP_NFSROOT # NFS mount root file system using BOOTP info</programlisting>
|
||||
|
||||
<para>You may also want to use <literal>BOOTP_NFSV3</literal>,
|
||||
<literal>BOOT_COMPAT</literal> and
|
||||
|
@ -4491,11 +4477,9 @@ cd /usr/src/etc; make distribution</programlisting>
|
|||
<para>Install &os; into the directory mounted over
|
||||
<acronym>NFS</acronym>:</para>
|
||||
|
||||
<screen>
|
||||
&prompt.root; <userinput>make installworld DESTDIR=${NFSROOTDIR}</userinput>
|
||||
<screen>&prompt.root; <userinput>make installworld DESTDIR=${NFSROOTDIR}</userinput>
|
||||
&prompt.root; <userinput>make installkernel DESTDIR=${NFSROOTDIR}</userinput>
|
||||
&prompt.root; <userinput>make distribution DESTDIR=${NFSROOTDIR}</userinput>
|
||||
</screen>
|
||||
&prompt.root; <userinput>make distribution DESTDIR=${NFSROOTDIR}</userinput></screen>
|
||||
</step>
|
||||
|
||||
<step>
|
||||
|
@ -4503,11 +4487,9 @@ cd /usr/src/etc; make distribution</programlisting>
|
|||
can download the boot loader which will be obtained
|
||||
via PXE:</para>
|
||||
|
||||
<screen>
|
||||
&prompt.root; <userinput>tftp localhost</userinput>
|
||||
<screen>&prompt.root; <userinput>tftp localhost</userinput>
|
||||
tftp> <userinput>get FreeBSD/install/boot/pxeboot</userinput>
|
||||
Received 264951 bytes in 0.1 seconds
|
||||
</screen>
|
||||
Received 264951 bytes in 0.1 seconds</screen>
|
||||
</step>
|
||||
|
||||
<step>
|
||||
|
@ -4515,10 +4497,8 @@ Received 264951 bytes in 0.1 seconds
|
|||
create an entry to mount the root file system over
|
||||
NFS:</para>
|
||||
|
||||
<programlisting>
|
||||
# Device Mountpoint FSType Options Dump Pass
|
||||
myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro 0 0
|
||||
</programlisting>
|
||||
<programlisting># Device Mountpoint FSType Options Dump Pass
|
||||
myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro 0 0</programlisting>
|
||||
|
||||
<para>Replace
|
||||
<replaceable>myhost.example.com</replaceable> with the
|
||||
|
@ -4557,8 +4537,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
|
|||
&man.amd.conf.5; maps for automounting. For
|
||||
example:</para>
|
||||
|
||||
<screen>
|
||||
&prompt.root; <userinput>chroot ${NFSROOTDIR}</userinput>
|
||||
<screen>&prompt.root; <userinput>chroot ${NFSROOTDIR}</userinput>
|
||||
&prompt.root; <userinput>pkg_add -r bash</userinput></screen>
|
||||
</step>
|
||||
</procedure>
|
||||
|
@ -4577,8 +4556,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
|
|||
these directories need to be writable, but the NFS root
|
||||
directory is read-only.</para>
|
||||
|
||||
<screen>
|
||||
&prompt.root; <userinput>chroot ${NFSROOTDIR}</userinput>
|
||||
<screen>&prompt.root; <userinput>chroot ${NFSROOTDIR}</userinput>
|
||||
&prompt.root; <userinput>mkdir -p conf/base</userinput>
|
||||
&prompt.root; <userinput>tar -c -v -f conf/base/etc.cpio.gz --format cpio --gzip etc</userinput>
|
||||
&prompt.root; <userinput>tar -c -v -f conf/base/var.cpio.gz --format cpio --gzip var</userinput></screen>
|
||||
|
@ -4620,8 +4598,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
|
|||
<acronym>NFS</acronym> root file system. Here is a sample
|
||||
<filename>dhcpd.conf</filename> setup:</para>
|
||||
|
||||
<programlisting>
|
||||
subnet 192.168.0.0 netmask 255.255.255.0 {
|
||||
<programlisting>subnet 192.168.0.0 netmask 255.255.255.0 {
|
||||
range 192.168.0.2 192.168.0.3 ;
|
||||
option subnet-mask 255.255.255.0 ;
|
||||
option routers 192.168.0.1 ;
|
||||
|
@ -4639,8 +4616,7 @@ subnet 192.168.0.0 netmask 255.255.255.0 {
|
|||
# pxeboot boot loader will try to NFS mount this directory for root FS
|
||||
option root-path "192.168.0.1:/b/tftpboot/FreeBSD/install/" ;
|
||||
|
||||
}
|
||||
</programlisting>
|
||||
}</programlisting>
|
||||
</step>
|
||||
</procedure>
|
||||
</sect2>
|
||||
|
|
Loading…
Reference in a new issue