Branch 'f10' - en-US/adminoptions.xml en-US/before-begin.xml en-US/beginninginstallation.xml en-US/bootloader.xml en-US/diskpartitioning.xml en-US/expert-quickstart.xml en-US/firstboot.xml en-US/Installation_Guide.ent en-US/intro.xml en-US/networkconfig.xml en-US/new-users.xml en-US/old-intro.xml en_US/other-instmethods.xml en-US/other-instmethods.xml en-US/packageselection.xml en-US/preparing-media.xml en-US/timezone.xml en-US/upgrading.xml nl-NL/diskpartitioning.po nl-NL/preparing-media.po zh-CN/diskpartitioning.po

Rüdiger Landmann rlandmann at fedoraproject.org
Tue May 11 13:09:21 UTC 2010


 en-US/Installation_Guide.ent    |    1 
 en-US/adminoptions.xml          |   28 +++++++++++------------
 en-US/before-begin.xml          |    8 +++---
 en-US/beginninginstallation.xml |    8 +++---
 en-US/bootloader.xml            |    8 +++---
 en-US/diskpartitioning.xml      |    8 +++---
 en-US/expert-quickstart.xml     |    8 +++---
 en-US/firstboot.xml             |    8 +++---
 en-US/intro.xml                 |    4 +--
 en-US/networkconfig.xml         |    4 +--
 en-US/new-users.xml             |   28 +++++++++++------------
 en-US/old-intro.xml             |    4 +--
 en-US/other-instmethods.xml     |   48 +++++++++++++++++++++++-----------------
 en-US/packageselection.xml      |    4 +--
 en-US/preparing-media.xml       |    8 +++---
 en-US/timezone.xml              |    4 +--
 en-US/upgrading.xml             |    4 +--
 en_US/other-instmethods.xml     |    4 +--
 nl-NL/diskpartitioning.po       |    2 -
 nl-NL/preparing-media.po        |    2 -
 zh-CN/diskpartitioning.po       |    4 +--
 21 files changed, 103 insertions(+), 94 deletions(-)

New commits:
commit 59e52b91271cdf7220135430b21cd63b1116b7f5
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Tue May 11 23:08:37 2010 +1000

    various XML fixes

diff --git a/en-US/Installation_Guide.ent b/en-US/Installation_Guide.ent
index 7aa628c..fe56aa5 100644
--- a/en-US/Installation_Guide.ent
+++ b/en-US/Installation_Guide.ent
@@ -20,4 +20,5 @@
 <!ENTITY FDPX "Docs Project">
 <!ENTITY BZ "Bugzilla">
 <!ENTITY BZ-PROD "install-guide">
+<!ENTITY PRODVER "10">
 
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index dc4cd27..376184a 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -29,15 +29,15 @@
 <screen>
 <userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable> <replaceable>option3</replaceable></userinput>
 </screen>
-  <tip>
+  <note>
     <title>Anaconda Boot Options</title>
 
     <para>
       The anaconda installer has many boot options, most are listed on 
       the wiki <ulink url="http://fedoraproject.org/wiki/Anaconda/Options"/>.
     </para>
-  </tip>
-  <tip>
+  </note>
+  <note>
     <title>Kernel Boot Options</title>
 
     <para>
@@ -46,7 +46,7 @@
       /usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/kernel-parameters.txt, 
       which is installed with the kernel-doc package.
     </para>
-  </tip>
+  </note>
   <note>
     <title>Rescue Mode</title>
 
@@ -249,7 +249,7 @@
       providers offer VNC clients for Microsoft Windows and Mac OS, as
       well as UNIX-based systems.
     </para>
-    <tip>
+    <note>
       <title>Installing a VNC Client on &FED;</title>
       <para>
         <indexterm>
@@ -261,7 +261,7 @@
         <application>vncviewer</application>, install the
         <filename>vnc</filename> package.
       </para>
-    </tip>
+    </note>
     <para>
       The installation system supports two methods of establishing a VNC
       connection. You may start the installation, and manually login to
@@ -414,7 +414,7 @@
 <screen>
 <userinput>telnet computer.mydomain.com</userinput>
 </screen>
-      <caution>
+      <warning>
         <title>Telnet Access Requires No Password</title>
 
         <para>
@@ -422,7 +422,7 @@
           the <option>telnet</option> option to install systems on
           networks with restricted access.
         </para>
-      </caution>
+      </warning>
     </section>
   </section>
   <section id="sn-remote-logging">
@@ -465,7 +465,7 @@
         rejects messages from remote systems.
       </para>
 
-      <caution>
+      <warning>
         <title>Only Enable Remote Syslog Access on Secured Networks</title>
 
         <para>
@@ -476,7 +476,7 @@
           or falsify messages sent to the logging service over the
           network.
         </para>
-      </caution>
+      </warning>
 
       <para>
         To configure a &FED; system to accept log messages from other
@@ -533,7 +533,7 @@
       Kickstart file and carry out the installation process without any
       further input from a user.
     </para>
-    <tip>
+    <note>
       <title>Every Installation Produces a Kickstart File</title>
       <para>
         The &FED; installation process automatically writes a Kickstart
@@ -543,7 +543,7 @@
         file to repeat the installation with identical settings, or
         modify copies to specify settings for other systems.
       </para>
-    </tip>
+    </note>
     <para>
       &FED; includes a graphical application to create and modify
       Kickstart files by selecting the options that you require. Use the
@@ -728,13 +728,13 @@
         take additional steps to manually configure the device after the
         installation process is complete.
       </para>
-      <tip>
+      <note>
         <title>Check the Release Notes</title>
         <para>
           Refer to the Release Notes for information on known issues
           with specific devices.
         </para>
-      </tip>
+      </note>
       <para>
         To override the automatic hardware detection, use one or more of
         the following options:
diff --git a/en-US/before-begin.xml b/en-US/before-begin.xml
index c5276b1..2c6129f 100644
--- a/en-US/before-begin.xml
+++ b/en-US/before-begin.xml
@@ -146,14 +146,14 @@
       <systemitem>ppc</systemitem> architecture, for instance, add <filename
 	class="directory">/&FCLOCALVER;/ppc/os/</filename> to the path shown.
     </para>
-    <tip>
+    <note>
       <title>Building Your Own Mirror</title>
       <para>
 	Refer to <ulink url="http://docs.fedoraproject.org/mirror/"/> for
 	information on how to create your own &FED; mirror for either public or
 	private use.
       </para>
-    </tip>
+    </note>
     <para>
         To use a mirror, boot your computer with &FED; boot media, and follow
       the instructions in
@@ -210,7 +210,7 @@
 
 -->
 
-    <caution>
+    <warning>
       <title>Consult Network Administrators</title>
 
       <para>
@@ -219,7 +219,7 @@
 	correct network and authentication settings, and guidance on specific
 	organizational policies and requirements.
       </para>
-    </caution>
+    </warning>
   </section>
 </chapter>
 
diff --git a/en-US/beginninginstallation.xml b/en-US/beginninginstallation.xml
index 9ef55df..b691cdc 100644
--- a/en-US/beginninginstallation.xml
+++ b/en-US/beginninginstallation.xml
@@ -38,11 +38,11 @@
       keyboard, and hit <keycap>Enter</keycap> when the correct option
       is highlighted.  If you want to customize the boot options for a
       particular option, hit the <keycap>Tab</keycap> key.</para>
-    <tip>
+    <note>
       <title>Using Boot Options</title>
       <para>For a listing and explanation of common boot options, refer
 	to <xref linkend="ap-admin-options"/>.</para>
-    </tip>
+    </note>
     <para>When using Fedora Live media, press any key during the initial
       boot countdown to bring up the <guilabel>Boot Options</guilabel>
       menu. The boot options include:</para>
@@ -171,13 +171,13 @@
       installation program can cause the installation to abort.  To
       minimize the chances of data errors affecting the installation,
       verify the media before installing.</para>
-<!--	<tip>
+<!--	<note>
       <title>BitTorrent Automatically Verifies File Integrity</title>
       <para>If you use BitTorrent, any files you download are automatically 
 	validated. If your file completes downloading you do not need to
 	check it. Once you burn your CD or DVD, however, during the installation 
 	you should still use mediacheck to verify the integrity of the media.</para>
-    </tip> -->
+    </note> -->
     <section id="sn-verifying-livecd">
       <title>Verifying the Live CD</title>
       <para>If you boot from the Live CD, choose <guilabel>Verify and
diff --git a/en-US/bootloader.xml b/en-US/bootloader.xml
index cf4a1a8..13e5e34 100644
--- a/en-US/bootloader.xml
+++ b/en-US/bootloader.xml
@@ -165,7 +165,7 @@ This section was removed because this isn't possible in current anaconda
       <application>GRUB</application> so that the operator must enter
       the password to interrupt the normal boot sequence.
     </para>
-    <tip>
+    <note>
       <title>GRUB Passwords Not Required</title>
       <para>
         You may not require a <application>GRUB</application> password
@@ -176,7 +176,7 @@ This section was removed because this isn't possible in current anaconda
 	<application>GRUB</application>. A password is helpful in this
 	case.
       </para>
-    </tip>
+    </note>
     <para>
       To set a boot password, select the <guibutton>Use a boot loader
 	password</guibutton> check box. The Enter Boot Loader Password
@@ -184,13 +184,13 @@ This section was removed because this isn't possible in current anaconda
 	confirm it by typing it again in the spaces provided and selecting 
 	<guibutton>Ok</guibutton>.
     </para>
-    <tip>
+    <note>
       <title>Choose a Good Password</title>
       <para>
         Choose a password that is easy for you to remember but hard for
         others to guess.
       </para>
-    </tip>
+    </note>
     <section id="sn-forgotten-grub-pass">
       <title>Forgotten <application>GRUB</application> Passwords</title>
 
diff --git a/en-US/diskpartitioning.xml b/en-US/diskpartitioning.xml
index 15a177a..17f6304 100644
--- a/en-US/diskpartitioning.xml
+++ b/en-US/diskpartitioning.xml
@@ -62,13 +62,13 @@
 	the &DISTRO; installation system.  If configuration of these
 	disks at installation time is not vital, disconnect them to
 	avoid any confusion.</para>
-      <tip>
+      <note>
 	<title>Post-installation Usage</title>
 	<para>You can connect and configure external FireWire and USB
 	  hard disks after installation.  Most such devices are
 	  recognized by the kernel and available for use at that
 	  time.</para>
-      </tip>
+      </note>
     </section>
   </section>
   <section id="sn-partitioning-general">
@@ -206,7 +206,7 @@
 	Druid's</application> <link linkend="disk-druid-edit">Edit
 	option</link> for more information.
     </para>
-    <tip>
+    <note>
       <title>Leave Excess Capacity Unallocated</title>
       <para>
         Only assign storage capacity to those partitions you require
@@ -215,7 +215,7 @@
 	storage management, refer to <xref
 	  linkend="sn-partitioning-lvm"/>.
       </para>
-    </tip>
+    </note>
     <section id="sn-partitioning-types">
       <title>Partition Types</title>
 
diff --git a/en-US/expert-quickstart.xml b/en-US/expert-quickstart.xml
index 220ea6b..8cb28a0 100644
--- a/en-US/expert-quickstart.xml
+++ b/en-US/expert-quickstart.xml
@@ -46,11 +46,11 @@
   <section id="sn-expert-download">
     <title>Download Files</title>
     <para>Do any one of the following:</para>
-    <tip>
+    <note>
       <title>Verify your downloads</title>
       <para>Downloads may fail for any number of reasons.  Always verify
       the sha1sum of the downloaded files.</para>
-    </tip>
+    </note>
     <orderedlist>
       <listitem>
 	<indexterm>
@@ -103,12 +103,12 @@
       <secondary>resizing</secondary>
     </indexterm>
     <para>Back up any user data you need to preserve.</para>
-		<tip>
+		<note>
 			<title>Resizing Partitions</title>
 			<para>The installation program provides functions for resizing
 			ext2, ext3, ext4, and NTFS formatted partitions.  Refer to <xref
 			linkend="ch-disk-partitioning" /> for more information.</para>
-		</tip>
+		</note>
   </section>
   <section id="sn-expert-install">
     <title>Install &DISTRO;</title>
diff --git a/en-US/firstboot.xml b/en-US/firstboot.xml
index 5ae6f90..1b81614 100644
--- a/en-US/firstboot.xml
+++ b/en-US/firstboot.xml
@@ -66,7 +66,7 @@
       <xref linkend="ch-rootpassword" /> for guidelines on selecting a
       secure password.
     </para>
-    <tip>
+    <note>
       <title>Creating Extra User Accounts</title>
       <para>
         To add additional user accounts to your system after the
@@ -75,7 +75,7 @@
         <guisubmenu>Administration</guisubmenu> <guimenuitem>Users &amp;
         Groups</guimenuitem> </menuchoice>.
       </para>
-    </tip>
+    </note>
     <para>
       To configure &FC; to use network services for authentication or
       user information, select <guibutton>Use Network
@@ -107,7 +107,7 @@
       Select the <guilabel>Network Time Protocol</guilabel> tab to
       configure your system to use NTP servers instead.
     </para>
-    <tip>
+    <note>
       <title>Setting the Clock</title>
       <para>
         To change these settings later, choose <menuchoice>
@@ -115,7 +115,7 @@
         <guisubmenu>Administration</guisubmenu> <guimenuitem>Date &amp;
         Time</guimenuitem> </menuchoice>.
       </para>
-    </tip>
+    </note>
     <para>
       To configure your system to use network time servers, select the
       <guilabel>Enable Network Time Protocol</guilabel> option. This
diff --git a/en-US/intro.xml b/en-US/intro.xml
index ce52926..d1914cd 100644
--- a/en-US/intro.xml
+++ b/en-US/intro.xml
@@ -61,13 +61,13 @@
 	    &DISTRO; system</para>
 	</listitem>
       </orderedlist>
-      <tip>
+      <note>
 	<title>Other Sources of Documentation</title>
 	<para>This guide does not cover use of &DISTRO;. To learn how to
 	  use an installed &DISTRO; system, refer to <ulink
 	    url="http://docs.fedoraproject.org/"/> for other
 	  documentation.</para>
-      </tip>
+      </note>
     </section>
     <section id="sn-audience">
       <title>Audience</title>
diff --git a/en-US/networkconfig.xml b/en-US/networkconfig.xml
index 5fad0db..f5bab1d 100644
--- a/en-US/networkconfig.xml
+++ b/en-US/networkconfig.xml
@@ -71,14 +71,14 @@
       for your &DISTRO; system.  If you have more than one computer on
       this network, you should give each one a separate host name in
       this domain.</para>
-    <tip>
+    <note>
       <title>Valid Hostnames</title>
       <para>
 	You may give your system any name provided that the full
 	hostname is unique.  The hostname may include letters, numbers
 	and hyphens.
       </para>
-    </tip>
+    </note>
     <para>If your &DISTRO; system is connected
       <emphasis>directly</emphasis> to the Internet, you must pay
       attention to additional considerations to avoid service
diff --git a/en-US/new-users.xml b/en-US/new-users.xml
index 9f6e633..69df685 100644
--- a/en-US/new-users.xml
+++ b/en-US/new-users.xml
@@ -20,7 +20,7 @@
     help by visiting the Fedora Forums at <ulink
     url="http://www.fedoraforum.org/"/>.
   </para>
-  <tip>
+  <note>
     <title>Download Links</title>
     <para>
       To follow a Web-based guide to downloading, visit <ulink
@@ -28,7 +28,7 @@
       architecture to download, refer to <xref
       linkend="sn-which-arch"/>.
     </para>
-  </tip>
+  </note>
   <section id="sn-howto-download">
     <title>How Do I Download Installation Files?</title>
     <para>The &FP; distributes &DISTRO; in many ways, mostly free of 
@@ -56,7 +56,7 @@
       suitable for use with a fast Internet connection and install &DISTRO; 
       on one computer.  Source code discs are not used for installing &DISTRO;, 
       but are resources for experienced users and software developers.</para>
-    <tip>
+    <note>
       <title>Downloading media</title>
       <indexterm>
 	<primary>CD/DVD media</primary>
@@ -79,7 +79,7 @@
 	suitable for writing directly to a USB flash disk.</para>
       <para>For more information on burning CDs and DVDs, refer to
 	<xref linkend="sn-making-media"/>.</para>
-    </tip>
+    </note>
     <para>&DISTRO; software is available for download at no cost in a
       variety of ways. </para>
     <section id="sn-which-download-mirror">
@@ -135,11 +135,11 @@
 	participates in a nearby group. To download and use the &DISTRO;
 	BitTorrent files, visit <ulink
 	url="http://torrent.fedoraproject.org/"/>.</para>
-      <tip>
+      <note>
 	<title>Minimal Boot Images</title>
 	<para>Minimal boot CD and USB flash disk images are not
 	  available through BitTorrent.</para>
-      </tip>
+      </note>
     </section>
   </section>
   <section id="sn-which-arch">
@@ -177,7 +177,7 @@
 	<seg><systemitem>ppc</systemitem></seg>
       </seglistitem>
     </segmentedlist>
-    <tip>
+    <note>
       <title><systemitem>i386</systemitem> Works for Most Windows
 	Compatible Computers</title>
       <para>If you are unsure what type of processor your computer uses, choose
@@ -185,14 +185,14 @@
       <para>The exception is if your computer is a non-Intel based Apple
 	Macintosh.  Refer to <xref
 	linkend="List-Processor_and_Architecture_Types"/> for more information.</para>
-    </tip>
-    <tip>
+    </note>
+    <note>
       <title>Intel Atom Processor Architectures Vary</title>
       <para>The N and Z Series Atom processors are based on the 
 	<systemitem>i386</systemitem> architecture. The 230 and 330 Series 
 	Atom processors are based on the<systemitem>x86_64</systemitem> 
 	architecture. Refer to <ulink url="http://ark.intel.com/cpugroup.aspx?familyID=29035"/> for more details. </para>
-    </tip>
+    </note>
   </section>
   <section id="sn-which-files">
     <title>Which Files Do I Download?</title>
@@ -253,14 +253,14 @@
 	    media. Once you have finished installation, you can add or
 	    remove software to your system as desired.</para>
 	</formalpara>
-	<tip>
+	<note>
 	  <title>Download Size</title>
 	  <para>Installing the default software for &DISTRO; over the
 	    Internet requires more time than the Live image, but less
 	    time than the entire DVD distribution.  Actual results
 	    depend on the software you select and network traffic
 	    conditions.</para>
-	</tip>
+	</note>
       </listitem>
     </orderedlist>
     <para>The following table explains where to find the desired files
@@ -467,14 +467,14 @@
       the DVD drive. On older Apple hardware you may need to  press <keycap>Cmd</keycap>
 +<keycap>Opt</keycap>+<keycap>Shift</keycap>+<keycap>Del</keycap> to 
 boot from DVD drive.</para>
-    <tip>
+    <note>
       <title>Configuring the BIOS</title>
       <para>If you are not sure what capabilities your computer has, or
 	how to configure the BIOS, consult the documentation provided by
 	the manufacturer.  Detailed information on hardware
 	specifications and configuration is beyond the scope of this
 	document.</para>
-    </tip>
+    </note>
   </section>
 </chapter>
 
diff --git a/en-US/old-intro.xml b/en-US/old-intro.xml
index 8c077bc..32dd082 100644
--- a/en-US/old-intro.xml
+++ b/en-US/old-intro.xml
@@ -21,7 +21,7 @@
       &FC; is a complete desktop and server operating system created
       entirely with open source software.
     </para>
-    <caution>
+    <warning>
       <title>&FC; Lifecycle</title>
 
       <para>
@@ -29,7 +29,7 @@
 	technical developments. &FC; may not be appropriate for use in
 	business-critical applications in your organization.
       </para>
-    </caution>
+    </warning>
     <para>
       For complete access to information about &FC;, refer to the
       official project wiki at <ulink url="http://fedoraproject.org/"/>
diff --git a/en-US/other-instmethods.xml b/en-US/other-instmethods.xml
index 3e3fdde..c60310f 100644
--- a/en-US/other-instmethods.xml
+++ b/en-US/other-instmethods.xml
@@ -162,32 +162,40 @@
       image files.  The following table shows some examples of how to
       enter this information:
     </para>
-    <segmentedlist>
-      <segtitle>Partition type</segtitle>
-      <segtitle>Volume</segtitle>
-      <segtitle>Original path to files</segtitle>
-      <segtitle>Directory to use</segtitle>
-      <seglistitem>
-	<seg>VFAT, NTFS</seg>
-	<seg>D:\</seg>
-	<seg>D:\Downloads\&FCX;&FCVER;</seg>
-	<seg>/Downloads/&FCX;&FCVER;</seg>
-      </seglistitem>
-      <seglistitem>
-	<seg>ext2, ext3</seg>
-	<seg>/home</seg>
-	<seg>/home/user1/&FCX;&FCVER;</seg>
-	<seg>/user1/&FCX;&FCVER;</seg>
-      </seglistitem>
-    </segmentedlist>
-    <tip>
+    <table id="table-Location_of_ISO_images" frame='all'><title>Location of ISO images for different partition types</title>
+    <tgroup cols='4' align='left' colsep='1' rowsep='1'>
+      <thead>
+	  <row>
+	    <entry>Partition type</entry>
+	    <entry>Volume</entry>
+	    <entry>Original path to files</entry>
+	    <entry>Directory to use</entry>
+	  </row>
+      </thead>
+      <tbody>  
+	  <row>
+	    <entry>VFAT,NTFS</entry>
+	    <entry>D:\</entry>
+	    <entry>D:\Downloads\F&PRODVER;</entry>
+	    <entry>/Downloads/F&PRODVER;</entry>
+	  </row>
+	  <row>
+	    <entry>ext2, ext3, ext4</entry>
+	    <entry>/home</entry>
+	    <entry>/home/user1/F&PRODVER;</entry>
+	    <entry>/user1/F&PRODVER;</entry>
+	  </row>
+      </tbody>
+    </tgroup>
+</table>
+    <note>
       <title>Use a leading slash</title>
       <para>
 	Use a leading slash character (/) to start the directory path.
 	An entry without a leading slash may cause the installation to
 	fail.
       </para>
-    </tip>
+    </note>
     <para>
       Select <guibutton>OK</guibutton> to continue.  Proceed with <xref
 	linkend="ch-welcome"/>.
diff --git a/en-US/packageselection.xml b/en-US/packageselection.xml
index 9f56505..63a7c4c 100644
--- a/en-US/packageselection.xml
+++ b/en-US/packageselection.xml
@@ -106,11 +106,11 @@
       dialog appears. Provide a <guilabel>Repository name</guilabel> and
       the <guilabel>Repository URL</guilabel> for its location.
     </para>
-    <tip>
+    <note>
       <title>&DISTRO; Software Mirrors</title>
       <para>To find a &DISTRO; software mirror near you, refer to <ulink
 	  url="http://fedoraproject.org/wiki/Mirrors"/>.</para>
-    </tip>
+    </note>
     <para>Once you have located a mirror, to determine the URL to use,
       find the directory on the mirror that
       <emphasis>contains</emphasis> a directory named <filename
diff --git a/en-US/preparing-media.xml b/en-US/preparing-media.xml
index dead145..d2de96c 100644
--- a/en-US/preparing-media.xml
+++ b/en-US/preparing-media.xml
@@ -27,10 +27,10 @@
     <listitem>
       <para>a set of installation CDs or DVDs of the &FED;
 	distribution</para>
-      <tip>
+      <note>
 	<title>Set Size May Vary</title>
 	<para>In some cases, there may be only one disc in a set.</para>
-      </tip>
+      </note>
     </listitem>
     <listitem>
       <para>A &FED; rescue CD</para>
@@ -287,7 +287,7 @@
 	  to the detection of a new SCSI device. Linux systems treat USB media
 	  as SCSI devices.
 	</para>
-	<tip>
+	<note>
 	  <title>Using the Device Mapper</title>
 	  <para>
 	    On &FC; 5 and later systems, it may be easier to find the
@@ -296,7 +296,7 @@
 	    command <command>ls -l /dev/disk/by-id/</command> to see the
 	    disk devices collated by model and device name.
 	  </para>
-	</tip>
+	</note>
       </step>
       <step>
 	<para>
diff --git a/en-US/timezone.xml b/en-US/timezone.xml
index 8010845..0edec36 100644
--- a/en-US/timezone.xml
+++ b/en-US/timezone.xml
@@ -61,7 +61,7 @@
       operating systems.
     </para>
 
-    <caution>
+    <warning>
       <title>Windows and the System Clock</title>
 
       <para>
@@ -70,7 +70,7 @@
 	operating systems change the BIOS clock to match local time
 	rather than UTC. This may cause unexpected behavior under &FC;.
       </para>
-    </caution>
+    </warning>
 
     <para>
       Select <guibutton>Next</guibutton> to proceed.
diff --git a/en-US/upgrading.xml b/en-US/upgrading.xml
index 1e0ae4e..844e90b 100644
--- a/en-US/upgrading.xml
+++ b/en-US/upgrading.xml
@@ -50,14 +50,14 @@
 
   <section id="sn-upgrade-tree">
     <title>Upgrading Using the Installer</title>
-    <tip>
+    <note>
       <title>Installations are Recommended</title>
       <para>In general, the &FP; recommends that you keep user data on a
 	separate <filename class="partition">/home</filename> partition
 	and perform a fresh installation.  For more information on
 	partitions and how to set them up, refer to <xref
 	linkend="ch-disk-partitioning"/>.</para>
-    </tip>
+    </note>
     <para>If you choose to upgrade your system using the installation
       program, any software not provided by &DISTRO; that conflicts with
       &DISTRO; software is overwritten.  Before you begin an upgrade
diff --git a/en_US/other-instmethods.xml b/en_US/other-instmethods.xml
index 3e3fdde..25a98c4 100644
--- a/en_US/other-instmethods.xml
+++ b/en_US/other-instmethods.xml
@@ -162,7 +162,7 @@
       image files.  The following table shows some examples of how to
       enter this information:
     </para>
-    <segmentedlist>
+    <!-- <segmentedlist>
       <segtitle>Partition type</segtitle>
       <segtitle>Volume</segtitle>
       <segtitle>Original path to files</segtitle>
@@ -179,7 +179,7 @@
 	<seg>/home/user1/&FCX;&FCVER;</seg>
 	<seg>/user1/&FCX;&FCVER;</seg>
       </seglistitem>
-    </segmentedlist>
+    </segmentedlist> -->
     <tip>
       <title>Use a leading slash</title>
       <para>
diff --git a/nl-NL/diskpartitioning.po b/nl-NL/diskpartitioning.po
index 1a45f1d..37e0bf0 100644
--- a/nl-NL/diskpartitioning.po
+++ b/nl-NL/diskpartitioning.po
@@ -1026,7 +1026,7 @@ msgid ""
 "Select <guilabel>Encrypt system</guilabel> to encrypt all partitions except "
 "the <filename class=\"partition\">/boot</filename> partition."
 msgstr ""
-"Selecteer <guilabel>Systeem versleutelen</guilabel om alle partities te "
+"Selecteer <guilabel>Systeem versleutelen</guilabel> om alle partities te "
 "versleutelen behalve de <filename class=\"partition\">/boot</filename> "
 "partitie"
 
diff --git a/nl-NL/preparing-media.po b/nl-NL/preparing-media.po
index a0f10d6..4b9fc8f 100644
--- a/nl-NL/preparing-media.po
+++ b/nl-NL/preparing-media.po
@@ -394,7 +394,7 @@ msgid ""
 "detection of a new SCSI device. Linux systems treat USB media as SCSI "
 "devices."
 msgstr ""
-"Zoek in de <command>dmesg</command output naar items die gerelateert zijn "
+"Zoek in de <command>dmesg</command> output naar items die gerelateert zijn "
 "aan de detectie van een nieuw SCSI device. Linux systemen behandelen USB "
 "media als SCSI devices."
 
diff --git a/zh-CN/diskpartitioning.po b/zh-CN/diskpartitioning.po
index 2f1b186..d8fa73b 100644
--- a/zh-CN/diskpartitioning.po
+++ b/zh-CN/diskpartitioning.po
@@ -551,8 +551,8 @@ msgid ""
 "and should not be used for sensitive data."
 msgstr ""
 "你可以选择加密所有分区或是仅选定的分区。一个典型的使用例子包括加密包含有"
-"<filename class=\"目录\">/home</filename>,<filename class=\"目录\">/var</"
-"filename>, 和 <filename class=\"目录\">/tmp</filename> 的分区,以及 swap 分"
+"<filename class=\"directory\">/home</filename>,<filename class=\"directory\">/var</"
+"filename>, 和 <filename class=\"directory\">/tmp</filename> 的分区,以及 swap 分"
 "区。通常不需要加密 <filename class=\"directory\">/usr</filename>,因为这个目"
 "录通常仅含有系统执行和库文件,这些文件本身没有隐私价值。<filename class="
 "\"partition\">/boot</filename> 分区永远不会加密,也不应当用于敏感数据。"




More information about the docs-commits mailing list