From owner-svn-doc-head@FreeBSD.ORG Thu Jun 14 11:50:53 2012 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 66A741065675; Thu, 14 Jun 2012 11:50:53 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 504228FC15; Thu, 14 Jun 2012 11:50:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5EBor6b092357; Thu, 14 Jun 2012 11:50:53 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5EBor5m092355; Thu, 14 Jun 2012 11:50:53 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201206141150.q5EBor5m092355@svn.freebsd.org> From: Warren Block Date: Thu, 14 Jun 2012 11:50:53 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r39043 - head/en_US.ISO8859-1/books/handbook/advanced-networking X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2012 11:50:53 -0000 Author: wblock Date: Thu Jun 14 11:50:52 2012 New Revision: 39043 URL: http://svn.freebsd.org/changeset/doc/39043 Log: Remove extra blank lines inside programlisting, screen, and literallayout sections. Translators please note, these are visible changes, not just whitespace. Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml Wed Jun 13 14:40:33 2012 (r39042) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml Thu Jun 14 11:50:52 2012 (r39043) @@ -306,8 +306,7 @@ host2.example.com link#1 UC -[Local2] <--ether--> [Local1] <--PPP--> [ISP-Serv] <--ether--> [T1-GW] - +[Local2] <--ether--> [Local1] <--PPP--> [ISP-Serv] <--ether--> [T1-GW] @@ -520,8 +519,7 @@ host2.example.com link#1 UC +------+ | 192.168.2.1/24 | - Internal Net 2 - + Internal Net 2 @@ -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 - + LAN Access Using PPP (0x1102) ver. 1.0 ... 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.8d ifconfig_fxp0="up" ifconfig_fxp1="up" cloned_interfaces="lagg0" -ifconfig_lagg0="laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24" - +ifconfig_lagg0="laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24" @@ -3585,8 +3581,7 @@ lagg0: flags=8843<UP,BROADCAST,RUNNIN ifconfig_fxp0="up" ifconfig_fxp1="up" cloned_interfaces="lagg0" -ifconfig_lagg0="laggproto failover laggport fxp0 laggport fxp1 10.0.0.15/24" - +ifconfig_lagg0="laggproto failover laggport fxp0 laggport fxp1 10.0.0.15/24" @@ -3676,8 +3671,7 @@ ifconfig_iwn0="ether 00:21:70:da:ae:37" wlans_iwn0="wlan0" ifconfig_wlan0="WPA" cloned_interfaces="lagg0" -ifconfig_lagg0="laggproto failover laggport bge0 laggport wlan0 DHCP" - +ifconfig_lagg0="laggproto failover laggport bge0 laggport wlan0 DHCP" @@ -3937,8 +3931,7 @@ ifconfig_lagg0corbieres uses PXE: - -default-lease-time 600; + 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"; } -} - +} @@ -4045,8 +4037,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 bootpd is that it exists in the base system. - -.def100:\ + .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 - +margaux:ha=0123456789ab:tc=.def100 @@ -4099,9 +4089,7 @@ margaux:ha=0123456789ab:tc=.def100 in the Etherboot tree and type: - -&prompt.root; gmake bin32/devicetype.fd0 - + &prompt.root; gmake bin32/devicetype.fd0 devicetype 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): - -options BOOTP # Use BOOTP to obtain IP address/hostname -options BOOTP_NFSROOT # NFS mount root file system using BOOTP info - + options BOOTP # Use BOOTP to obtain IP address/hostname +options BOOTP_NFSROOT # NFS mount root file system using BOOTP info You may also want to use BOOTP_NFSV3, BOOT_COMPAT and @@ -4491,11 +4477,9 @@ cd /usr/src/etc; make distributionInstall &os; into the directory mounted over NFS: - -&prompt.root; make installworld DESTDIR=${NFSROOTDIR} + &prompt.root; make installworld DESTDIR=${NFSROOTDIR} &prompt.root; make installkernel DESTDIR=${NFSROOTDIR} -&prompt.root; make distribution DESTDIR=${NFSROOTDIR} - +&prompt.root; make distribution DESTDIR=${NFSROOTDIR} @@ -4503,11 +4487,9 @@ cd /usr/src/etc; make distribution - -&prompt.root; tftp localhost + &prompt.root; tftp localhost tftp> get FreeBSD/install/boot/pxeboot -Received 264951 bytes in 0.1 seconds - +Received 264951 bytes in 0.1 seconds @@ -4515,10 +4497,8 @@ Received 264951 bytes in 0.1 seconds create an entry to mount the root file system over NFS: - -# Device Mountpoint FSType Options Dump Pass -myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro 0 0 - + # Device Mountpoint FSType Options Dump Pass +myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro 0 0 Replace myhost.example.com with the @@ -4557,8 +4537,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/i &man.amd.conf.5; maps for automounting. For example: - -&prompt.root; chroot ${NFSROOTDIR} + &prompt.root; chroot ${NFSROOTDIR} &prompt.root; pkg_add -r bash @@ -4577,8 +4556,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/i these directories need to be writable, but the NFS root directory is read-only. - -&prompt.root; chroot ${NFSROOTDIR} + &prompt.root; chroot ${NFSROOTDIR} &prompt.root; mkdir -p conf/base &prompt.root; tar -c -v -f conf/base/etc.cpio.gz --format cpio --gzip etc &prompt.root; tar -c -v -f conf/base/var.cpio.gz --format cpio --gzip var @@ -4620,8 +4598,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/i NFS root file system. Here is a sample dhcpd.conf setup: - -subnet 192.168.0.0 netmask 255.255.255.0 { + 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/" ; -} - +}