svn commit: r43348 - head/en_US.ISO8859-1/books/handbook/bsdinstall
Warren Block
wblock at FreeBSD.org
Wed Dec 18 02:09:19 UTC 2013
Author: wblock
Date: Wed Dec 18 02:09:18 2013
New Revision: 43348
URL: http://svnweb.freebsd.org/changeset/doc/43348
Log:
Remove role attributes from acronym tags, replace firstterm tags with
emphasis.
Modified:
head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
Modified: head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml Wed Dec 18 02:00:38 2013 (r43347)
+++ head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml Wed Dec 18 02:09:18 2013 (r43348)
@@ -237,25 +237,25 @@
<para>Hard disks can be divided into multiple sections. These
sections are called
- <firstterm>partitions</firstterm>.</para>
+ <emphasis>partitions</emphasis>.</para>
<para>There are two ways of dividing a disk into partitions.
- A traditional <firstterm>Master Boot Record</firstterm>
- (<acronym role="Master Boot Record">MBR</acronym>) holds a
- partition table defining up to four <firstterm>primary
- partitions</firstterm>. (For historical reasons, &os;
- calls primary partitions <firstterm>slices</firstterm>.) A
+ A traditional <emphasis>Master Boot Record</emphasis>
+ (<acronym>MBR</acronym>) holds a
+ partition table defining up to four <emphasis>primary
+ partitions</emphasis>. (For historical reasons, &os;
+ calls primary partitions <emphasis>slices</emphasis>.) A
limit of only four partitions is restrictive for large
disks, so one of these primary partitions can be made into
- an <firstterm>extended partition</firstterm>. Multiple
- <firstterm>logical partitions</firstterm> may then be
+ an <emphasis>extended partition</emphasis>. Multiple
+ <emphasis>logical partitions</emphasis> may then be
created inside the extended partition. This may sound a
little unwieldy, and it is.</para>
- <para>The <firstterm>GUID Partition Table</firstterm>
- (<acronym role="GUID Partition Table">GPT</acronym>) is a
+ <para>The <emphasis>GUID Partition Table</emphasis>
+ (<acronym>GPT</acronym>) is a
newer and simpler method of partitioning a disk.
- <acronym role="GUID Partition Table">GPT</acronym> is far
+ <acronym>GPT</acronym> is far
more versatile than the traditional MBR partition table.
Common <acronym>GPT</acronym> implementations allow up to
128 partitions per disk, eliminating the need for
@@ -266,7 +266,7 @@
are not compatible with the <acronym>GPT</acronym>
partition scheme. If &os; will be sharing a disk with
such an operating system,
- <acronym role="Master Boot Record">MBR</acronym>
+ <acronym>MBR</acronym>
partitioning is required.</para>
</warning>
@@ -366,8 +366,7 @@
cable or DSL modem with an Ethernet interface), the installer
will request some information about the network.</para>
- <para><firstterm><acronym role="Dynamic Host Configuration
- Protocol">DHCP</acronym></firstterm> is commonly used to
+ <para><emphasis><acronym>DHCP</acronym></emphasis> is commonly used to
provide automatic network configuration. If
<acronym>DHCP</acronym> is not available, this network
information must be obtained from the local network
@@ -377,7 +376,7 @@
<title>Network Information</title>
<listitem>
- <para><acronym role="Internet Protocol">IP</acronym>
+ <para><acronym>IP</acronym>
address</para>
</listitem>
@@ -394,7 +393,7 @@
</listitem>
<listitem>
- <para><acronym role="Domain Name System">DNS</acronym>
+ <para><acronym>DNS</acronym>
server <acronym>IP</acronym> address(es)</para>
</listitem>
</orderedlist>
@@ -460,7 +459,7 @@
bootable CD or DVD using the CD recording applications
available with your current operating system. On &os;,
recording is provided by &man.cdrecord.1; from
- <filename role="port">sysutils/cdrtools</filename>, installed
+ <filename>sysutils/cdrtools</filename>, installed
from the Ports Collection.</para>
<para>To create a bootable memory stick, follow these
@@ -625,8 +624,7 @@ commit your changes?</literallayout>
<step>
<para>Configure your machine to boot from either the CDROM
or from USB, depending on the media being used for the
- installation. <acronym role="Basic Input/Output
- System">BIOS</acronym> configurations allow the
+ installation. <acronym>BIOS</acronym> configurations allow the
selection of a specific boot device. Most systems also
provide for selecting a boot device during startup,
typically by pressing <keycap>F10</keycap>,
@@ -745,7 +743,7 @@ Loading /boot/defaults/loader.conf
from disk. To install &os;, you need to boot over the
network or from a CDROM, which requires you to break into
the
- <acronym role="Programmable Read Only Memory">PROM</acronym>
+ <acronym>PROM</acronym>
(OpenFirmware).</para>
<para>To do this, reboot the system, and wait until the boot
@@ -767,7 +765,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
on the keyboard, or send a <command>BREAK</command> over the
serial console (using for example <command>~#</command> in
&man.tip.1; or &man.cu.1;) to get to the
- <acronym role="Programmable Read Only Memory">PROM</acronym>
+ <acronym>PROM</acronym>
prompt. It looks like this:</para>
<screen><prompt>ok </prompt><co xml:id="bsdinstall-prompt-single"/>
@@ -1311,8 +1309,8 @@ Trying to mount root from cd9660:/dev/is
<para>Highlighting a drive (<filename>ada0</filename> in
this example) and selecting
<guibutton>[ Create ]</guibutton> displays a menu
- for choosing the type of <firstterm>partitioning
- scheme</firstterm>.</para>
+ for choosing the type of <emphasis>partitioning
+ scheme</emphasis>.</para>
<figure xml:id="bsdinstall-part-manual-partscheme">
<title>Manually Create Partitions</title>
@@ -1462,7 +1460,7 @@ Trying to mount root from cd9660:/dev/is
filesystem. If only a single UFS partition will be created,
the mountpoint should be <filename>/</filename>.</para>
- <para>A <firstterm>label</firstterm> is also requested. A label
+ <para>A <emphasis>label</emphasis> is also requested. A label
is a name by which this partition will be known. Drive
names or numbers can change if the drive is connected to
a different controller or port, but the partition label does
@@ -1717,16 +1715,16 @@ Trying to mount root from cd9660:/dev/is
allow it to connect to the network.</para>
<para>Wireless networks are identified by a Service Set
- Identifier, or <acronym role="Service Set Identifier">
+ Identifier, or <acronym>
SSID</acronym>. The
- <acronym role="Service Set Identifier">SSID</acronym> is a
+ <acronym>SSID</acronym> is a
short, unique name given to each network.</para>
<para>Most wireless networks encrypt transmitted data to
protect information from unauthorized viewing.
- <acronym role="Wi-Fi Protected Access II">WPA2</acronym>
+ <acronym>WPA2</acronym>
encryption is strongly recommended. Older encryption types,
- like <acronym role="Wired Equivalent Privacy">WEP</acronym>,
+ like <acronym>WEP</acronym>,
offer very little security.</para>
<para>The first step in connecting to a wireless network is to
@@ -1743,11 +1741,11 @@ Trying to mount root from cd9660:/dev/is
</mediaobject>
</figure>
- <para><acronym role="Service Set Identifiers">SSIDs</acronym>
+ <para><acronym>SSIDs</acronym>
found during the scan are listed, followed by a description
of the encryption types available for that network. If the
desired
- <acronym role="Service Set Identifier">SSID</acronym> does
+ <acronym>SSID</acronym> does
not appear in the list, select
<guibutton>[ Rescan ]</guibutton> to scan again.
If the desired network still does not appear, check for
@@ -1769,9 +1767,9 @@ Trying to mount root from cd9660:/dev/is
<para>The encryption information for connecting to the
selected wireless network is entered after selecting the
network. With
- <acronym role="Wi-Fi Protected Access II">WPA2</acronym>,
+ <acronym>WPA2</acronym>,
only a password (also known as the Pre-Shared Key, or
- <acronym role="Pre-Shared Key">PSK</acronym>) is needed.
+ <acronym>PSK</acronym>) is needed.
Characters typed into the input box are shown as asterisks
for security.</para>
@@ -1809,10 +1807,9 @@ Trying to mount root from cd9660:/dev/is
</figure>
<para>There are two methods of IPv4 configuration.
- <firstterm><acronym role="Dynamic Host Configuration
- Protocol">DHCP</acronym></firstterm> will automatically
+ <emphasis><acronym>DHCP</acronym></emphasis> will automatically
configure the network interface correctly, and is the
- preferred method. <firstterm>Static</firstterm>
+ preferred method. <emphasis>Static</emphasis>
configuration requires manual entry of network
information.</para>
@@ -1906,11 +1903,10 @@ Trying to mount root from cd9660:/dev/is
</figure>
<para>IPv6 also has two methods of configuration.
- <firstterm><acronym role="StateLess Address
- AutoConfiguration">SLAAC</acronym> </firstterm>, or
+ <emphasis><acronym>SLAAC</acronym> </emphasis>, or
<emphasis>StateLess Address AutoConfiguration</emphasis>,
will automatically configure the network interface
- correctly. <firstterm>Static</firstterm> configuration
+ correctly. <emphasis>Static</emphasis> configuration
requires manual entry of network information.</para>
<sect4 xml:id="bsdinstall-net-ipv6-slaac-config">
@@ -1973,12 +1969,10 @@ Trying to mount root from cd9660:/dev/is
</sect3>
<sect3 xml:id="bsdinstall-net-dns">
- <title>Configuring <acronym role="Domain Name
- System">DNS</acronym></title>
+ <title>Configuring <acronym>DNS</acronym></title>
- <para>The <firstterm>Domain Name System</firstterm> (or
- <emphasis><acronym role="Domain Name
- System">DNS</acronym></emphasis>) Resolver converts
+ <para>The <emphasis>Domain Name System</emphasis> (or
+ <emphasis><acronym>DNS</acronym></emphasis>) Resolver converts
hostnames to and from network addresses. If
<acronym>DHCP</acronym> or <acronym>SLAAC</acronym> was used
to autoconfigure the network interface, the Resolver
@@ -2111,7 +2105,7 @@ Trying to mount root from cd9660:/dev/is
<listitem>
<para><literal>sshd</literal> - Secure Shell
- (<acronym role="Secure Shell">SSH</acronym>) daemon for
+ (<acronym>SSH</acronym>) daemon for
secure remote access.</para>
</listitem>
@@ -2122,7 +2116,7 @@ Trying to mount root from cd9660:/dev/is
<listitem>
<para><literal>ntpd</literal> - Network Time Protocol
- (<acronym role="Network Time Protocol">NTP</acronym>)
+ (<acronym>NTP</acronym>)
daemon for automatic clock synchronization.</para>
</listitem>
More information about the svn-doc-all
mailing list