The ref '31e4597f7160adffef5fe7a8fbb784d3a2e94237' was updated from:
86d15d2e2ba74b00053d76717294d74e8eca3772
To:
86d15d2e2ba74b00053d76717294d74e8eca3772
This is unexpected because:
'31e4597f7160adffef5fe7a8fbb784d3a2e94237' is not in refs/heads/ or refs/tags/
The ref '86d15d2e2ba74b00053d76717294d74e8eca3772' was updated from:
1244d8c3ecf821e3abaabf6c681d8f235edfa91e
To:
1244d8c3ecf821e3abaabf6c681d8f235edfa91e
This is unexpected because:
'86d15d2e2ba74b00053d76717294d74e8eca3772' is not in refs/heads/ or refs/tags/
en-US/Graphical_Installation_x86_Starting.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 529d98e83ba3ccc420836d60f4e558d16a6f3ada
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 15:11:23 2010 +1000
move UEFI warning to start of chapter
diff --git a/en-US/Graphical_Installation_x86_Starting.xml b/en-US/Graphical_Installation_x86_Starting.xml
index 4e2398b..b28ee2d 100644
--- a/en-US/Graphical_Installation_x86_Starting.xml
+++ b/en-US/Graphical_Installation_x86_Starting.xml
@@ -13,6 +13,7 @@
<primary>starting</primary>
<secondary>installation</secondary>
</indexterm>
+ <xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<para>
To start, first make sure that you have all necessary resources for the installation. If you have already read through <xref linkend="ch-steps-x86"/>, and followed the instructions, you should be ready to start the installation process. When you have verified that you are ready to begin, boot the installation program using the Fedora DVD or CD-ROM #1 or any boot media that you have created.
</para>
@@ -39,7 +40,7 @@
<secondary>installation program</secondary>
<tertiary>x86, AMD64 and <trademark class="registered">Intel</trademark> 64</tertiary>
</indexterm>
- <xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
<para>
You can boot the installation program using any one of the following media (depending upon what your system can support):
</para>
en-US/Boot-x86.xml | 44 ----------------------------
en-US/Graphical_Installation-x86.xml | 3 +
en-US/Graphical_and_Text_Interfaces.xml | 49 ++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 44 deletions(-)
New commits:
commit 3b6b340f5faa7c8e7c1bd475f9dbb83a83d40eb4
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 14:54:56 2010 +1000
move section 6.4 to chapter 7
diff --git a/en-US/Boot-x86.xml b/en-US/Boot-x86.xml
index 5c637d6..69f313c 100644
--- a/en-US/Boot-x86.xml
+++ b/en-US/Boot-x86.xml
@@ -130,50 +130,6 @@
</section>
- <section id="sn-graphics-problem">
- <title>Graphical and Text Interfaces</title>
- <important>
- <title>Graphical Interface Usage</title>
- <para>
- Installing in text mode does not prevent you from using a graphical interface on your system once it is installed.
- </para>
- </important>
- <important>
- <title>Installation requires 137 MB of RAM</title>
- <para>
- If your system has less than 137 MB of RAM, installation will not continue.
- </para>
- <para>
- Furthermore, installation from a hard drive or a network location requires an image of stage 2 of the installation program (<filename>installer.img</filename>) to be stored in memory. This additional requirement increases the minimum RAM required to 243 MB for these installation methods.
- </para>
- </important>
- <para>
- Fedora &PRODVER; supports graphical and text-based installations. Only systems with more than 397 MB of RAM can use the graphical installer. Systems with less RAM automatically scale back to using the text-based installer. Note that you must still have a minimum of 137 MB of RAM for installation to proceed even in text mode. If you prefer to use the text-based installer, type <option>linux text</option> at the <prompt>boot:</prompt> prompt.
- </para>
- <para>
- If one of the following situations occurs, the installation program uses text mode:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- The installation system fails to identify the display hardware on your computer
- </para>
- </listitem>
- <listitem>
- <para>
- Your computer has less than 397 MB of RAM
- </para>
- </listitem>
- <listitem>
- <para>
- You choose the text mode installation from the boot menu
- </para>
- </listitem>
- </itemizedlist>
- <para>
- The text screens provide most of the same functions as the standard screens, although disk partitioning is simplified, and bootloader configuration and package selection are handled automatically in text mode. If you choose to install Fedora in text mode, you can still configure your system to use a graphical interface after installation. Refer to <xref linkend="sn-switching-to-gui-login"/> for instructions.
- </para>
- </section>
</chapter>
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index b1d6f9c..350c721 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -15,6 +15,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-1.xml"/>
<!-- Contains: Becoming familiar with the installation program's user interface, etc. -->
+ <xi:include href="Graphical_and_Text_Interfaces.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Graphical Interface Usage - Installing in text mode does not prevent you from using a graphical interface. -->
+
<section id="s1-guimode-interface-x86">
<title>The Graphical Installation Program User Interface</title>
<indexterm significance="normal">
diff --git a/en-US/Graphical_and_Text_Interfaces.xml b/en-US/Graphical_and_Text_Interfaces.xml
new file mode 100644
index 0000000..5f5085e
--- /dev/null
+++ b/en-US/Graphical_and_Text_Interfaces.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<section>
+ <title>Graphical and Text Interfaces</title>
+ <important>
+ <title>Graphical Interface Usage</title>
+ <para>
+ Installing in text mode does not prevent you from using a graphical interface on your system once it is installed.
+ </para>
+ </important>
+ <important>
+ <title>Important — Minimum RAM requirements</title>
+ <para>
+ If your system has less than 137 MB of RAM, installation will not continue on any architecture.
+ </para>
+ <para>
+ Furthermore, installation from a hard drive or a network location requires an image of stage 2 of the installation program (<filename>installer.img</filename>) to be stored in memory. This additional requirement increases the minimum RAM required to at least 256 MB for these installation methods.
+ </para>
+ </important>
+ <para>
+ Fedora &PRODVER; supports graphical and text-based installations. Only systems with more than 397 MB of RAM can use the graphical installer. Systems with less RAM automatically scale back to using the text-based installer. Note that you must still have a minimum of 137 MB of RAM for installation to proceed even in text mode, and some architectures and installation methods require more RAM than others. If you prefer to use the text-based installer, type <option>linux text</option> at the <prompt>boot:</prompt> prompt.
+ </para>
+ <para>
+ If one of the following situations occurs, the installation program uses text mode:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The installation system fails to identify the display hardware on your computer
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Your computer has less the minimum amount of RAM required for graphical installation on your architecture with your chosen installation method (397 MB at the very least).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ You choose the text mode installation from the boot menu
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ The text screens provide most of the same functions as the standard screens, although disk partitioning is simplified, and bootloader configuration and package selection are handled automatically in text mode. If you choose to install Fedora in text mode, you can still configure your system to use a graphical interface after installation. Refer to <xref linkend="sn-switching-to-gui-login"/> for instructions.
+ </para>
+</section>
+
en-US/Boot-x86.xml | 135 ++++++----------------------------
en-US/Boot_x86_ppc-para-7.xml | 8 ++
en-US/Boot_x86_ppc-para-8.xml | 8 ++
en-US/Boot_x86_ppc-procedure-1.xml | 23 +++++
en-US/Boot_x86_ppc-title-4.xml | 8 ++
en-US/Boot_x86_ppc-variablelist-1.xml | 9 ++
en-US/Graphical_Installation-x86.xml | 5 +
en-US/Ksconfig.xml | 2
en-US/Note-Multiple_NICs_and_PXE.xml | 21 +++++
en-US/Verifying_Media.xml | 15 +++
10 files changed, 121 insertions(+), 113 deletions(-)
New commits:
commit d7bbd968162c5f2bbd40867d7f38a91cee09573d
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 14:32:10 2010 +1000
revise section 6.3
diff --git a/en-US/Boot-x86.xml b/en-US/Boot-x86.xml
index e8cb1d0..5c637d6 100644
--- a/en-US/Boot-x86.xml
+++ b/en-US/Boot-x86.xml
@@ -104,119 +104,32 @@
Refer to <xref linkend="s1-installmethod-x86"/> for information about installing from locations other than the media with which you booted the system.
</para>
</section>
- <section id="sn-verifying-media">
- <title>Verifying Media</title>
- <para>The distribution DVD media and the Live CD media offer an
- option to verify the integrity of the media. Recording errors
- sometimes occur while producing CD or DVD media in home computer
- equipment. An error in the data for package chosen in the
- installation program can cause the installation to abort. To
- minimize the chances of data errors affecting the installation,
- verify the media before installing.</para>
-<!-- <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>
- </note> -->
- <section id="sn-verifying-livecd">
- <title>Verifying the Live CD</title>
- <para>If you boot from the Live CD, choose <guilabel>Verify and
- Boot</guilabel> from the boot menu. The
- verification process runs automatically during the boot process,
- and if it succeeds, the Live CD continues loading. If the
- verification fails, create a new Live CD using the ISO image you
- downloaded earlier.</para>
- </section>
- <section id="sn-verifying-dvd">
- <title>Verifying the DVD</title>
- <para>If you boot from the Fedora distribution DVD, the option
- to verify the media appears after you choose to install
- Fedora. If the verification succeeds, the installation
- process proceeds normally. If the process fails, create a new
- DVD using the ISO image you downloaded earlier.</para>
- </section>
- </section>
-
- <section id="sn-booting-from-pxe">
- <title>Booting from the Network using PXE</title>
-
- <para>
- To boot with <indexterm>
- <primary>PXE (Pre-boot eXecution Environment)</primary>
- </indexterm> PXE, you need a properly configured server, and a
- network interface in your computer that supports PXE. For
- information on how to configure a PXE server, refer to <xref
- linkend="ap-install-server"/>.
- </para>
-
- <para>
- Configure the computer to boot from the network interface. This
- option is in the BIOS, and may be labeled <option>Network
- Boot</option> or <option>Boot Services</option>. Once you
- properly configure PXE booting, the computer can boot the Fedora
- installation system without any other media.
- </para>
-
- <para>
- To boot a computer from a PXE server:
- </para>
-
- <procedure>
- <step>
- <para>
- Ensure that the network cable is attached. The link indicator
- light on the network socket should be lit, even if the
- computer is not switched on.
- </para>
- </step>
- <step>
- <para>
- Switch on the computer.
- </para>
- </step>
- <step>
- <para>
- A menu screen appears. Press the number key that corresponds
- to the desired option.
- </para>
- </step>
- </procedure>
-
- <note>
- <title>PXE Troubleshooting</title>
- <para>
- If your PC does not boot from the netboot server, ensure that
- the BIOS is configured to boot first from the correct network
- interface. Some BIOS systems specify the network interface as a
- possible boot device, but do not support the PXE standard. Refer
- to your hardware documentation for more information.
- </para>
- </note>
-<note>
- <title>Multiple NICs and PXE installation </title>
- <para>
- Some servers with multiple network interfaces may
- not assign eth0 to the first network interface as BIOS
- knows it, which can cause the installer to try using a
- different network interface than was used by PXE. To
- change this behavior, use the following in <filename>pxelinux.cfg/*</filename>
- config files: </para>
- <para><option>IPAPPEND 2</option>
- </para>
- <para><option>APPEND ksdevice=bootif</option>
- </para>
- <para>The configuration options above cause the installer to use the
- same network interface as BIOS and PXE use. You can also use the following option:
+ <section id="sn-booting-from-pxe-x86">
+ <xi:include href="Boot_x86_ppc-title-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Booting from the Network using PXE -->
+
+ <xi:include href="Boot_x86_ppc-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- To boot with PXE, you need a properly configured server -->
+
+ <para>
+ Configure the computer to boot from the network interface. This option is in the BIOS, and may be labeled <option>Network Boot</option> or <option>Boot Services</option>. Once you properly configure PXE booting, the computer can boot the Fedora installation system without any other media.
</para>
- <para><option>ksdevice=link</option>
+
+ <xi:include href="Boot_x86_ppc-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- To boot a computer from a PXE server: -->
+
+ <xi:include href="Boot_x86_ppc-procedure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Ensure that the network cable is attached -->
+
+ <para>
+ If your PC does not boot from the netboot server, ensure that the BIOS is configured to boot first from the correct network interface. Some BIOS systems specify the network interface as a possible boot device, but do not support the PXE standard. Refer to your hardware documentation for more information.
</para>
- <para>This option causes the installer to use the first network device
- it finds that is linked to a network switch.
- </para>
- </note>
- </section>
+
+ <xi:include href="Note-Multiple_NICs_and_PXE.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Some servers with multiple network interfaces might not assign -->
+
+ </section>
+
<section id="sn-graphics-problem">
<title>Graphical and Text Interfaces</title>
<important>
diff --git a/en-US/Boot_x86_ppc-para-7.xml b/en-US/Boot_x86_ppc-para-7.xml
new file mode 100644
index 0000000..d354203
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-7.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ To boot with <indexterm> <primary>PXE (Pre-boot eXecution Environment)</primary> </indexterm> PXE, you need a properly configured server, and a network interface in your computer that supports PXE. For information on how to configure a PXE server, refer to <xref linkend="ap-install-server"/>.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-8.xml b/en-US/Boot_x86_ppc-para-8.xml
new file mode 100644
index 0000000..2cb4461
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-8.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ To boot a computer from a PXE server:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-procedure-1.xml b/en-US/Boot_x86_ppc-procedure-1.xml
new file mode 100644
index 0000000..7118848
--- /dev/null
+++ b/en-US/Boot_x86_ppc-procedure-1.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE procedure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<procedure>
+ <step>
+ <para>
+ Ensure that the network cable is attached. The link indicator light on the network socket should be lit, even if the computer is not switched on.
+ </para>
+ </step>
+ <step>
+ <para>
+ Switch on the computer.
+ </para>
+ </step>
+ <step>
+ <para>
+ A menu screen appears. Press the number key that corresponds to the desired option.
+ </para>
+ </step>
+</procedure>
+
+
diff --git a/en-US/Boot_x86_ppc-title-4.xml b/en-US/Boot_x86_ppc-title-4.xml
new file mode 100644
index 0000000..662c75f
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<title>
+ Booting from the Network using PXE
+</title>
+
diff --git a/en-US/Boot_x86_ppc-variablelist-1.xml b/en-US/Boot_x86_ppc-variablelist-1.xml
index c3aa0b5..c6eece6 100644
--- a/en-US/Boot_x86_ppc-variablelist-1.xml
+++ b/en-US/Boot_x86_ppc-variablelist-1.xml
@@ -43,5 +43,14 @@
</para>
</listitem>
</varlistentry> -->
+ <!-- <section id="sn-verifying-livecd">
+ <title>Verifying the Live CD</title>
+ <para>If you boot from the Live CD, choose <guilabel>Verify and
+ Boot</guilabel> from the boot menu. The
+ verification process runs automatically during the boot process,
+ and if it succeeds, the Live CD continues loading. If the
+ verification fails, create a new Live CD using the ISO image you
+ downloaded earlier.</para>
+ </section> -->
</variablelist>
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index 25f7b9d..b1d6f9c 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -229,7 +229,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-x86.xml"/>
<!-- Installing via FTP or HTTP -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
+ <xi:include href="Verifying_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Verifying Media - The DVD offers an option to verify the integrity of the media. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
<!-- Welcome to Red Hat Enterprise Linux -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
diff --git a/en-US/Ksconfig.xml b/en-US/Ksconfig.xml
index e32079e..cbd46f3 100644
--- a/en-US/Ksconfig.xml
+++ b/en-US/Ksconfig.xml
@@ -166,7 +166,7 @@
<listitem>
<para>
- <guilabel>Hard Drive</guilabel> — Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO (or CD-ROM) images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux mediacheck</command> boot option as discussed in <xref linkend="sn-verifying-media"/>. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
+ <guilabel>Hard Drive</guilabel> — Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO (or CD-ROM) images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux mediacheck</command> boot option as discussed in <xref linkend="sn-boot-mediacheck"/>. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
</para>
</listitem>
</itemizedlist>
diff --git a/en-US/Note-Multiple_NICs_and_PXE.xml b/en-US/Note-Multiple_NICs_and_PXE.xml
new file mode 100644
index 0000000..53242be
--- /dev/null
+++ b/en-US/Note-Multiple_NICs_and_PXE.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<note>
+ <title>Note — Multiple NICs and PXE installation </title>
+ <para>
+ Some servers with multiple network interfaces might not assign eth0 to the first network interface as the firmware interface knows it, which can cause the installer to try to use a different network interface from the one that was used by PXE. To change this behavior, use the following in <filename>pxelinux.cfg/*</filename> config files:
+ </para>
+<programlisting>IPAPPEND 2
+APPEND ksdevice=bootif</programlisting>
+ <para>
+ These configuration options above cause the installer to use the same network interface the firmware interface and PXE use. You can also use the following option:
+ </para>
+<programlisting>ksdevice=link</programlisting>
+ <para>
+ This option causes the installer to use the first network device it finds that is linked to a network switch.
+ </para>
+</note>
+
+
diff --git a/en-US/Verifying_Media.xml b/en-US/Verifying_Media.xml
new file mode 100644
index 0000000..c388669
--- /dev/null
+++ b/en-US/Verifying_Media.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<section>
+ <title>Verifying Media</title>
+ <para>
+ The DVD offers an option to verify the integrity of the media. Recording errors sometimes occur while producing CD or DVD media. An error in the data for package chosen in the installation program can cause the installation to abort. To minimize the chances of data errors affecting the installation, verify the media before installing.
+ </para>
+ <para>
+ If the verification succeeds, the installation process proceeds normally. If the process fails, create a new DVD using the ISO image you downloaded earlier.
+ </para>
+</section>
+
+
en-US/Boot-x86.xml | 293 +++-------
en-US/Boot_x86_ppc-figure-1.xml | 16
en-US/Boot_x86_ppc-indexterm-1.xml | 9
en-US/Boot_x86_ppc-indexterm-2.xml | 9
en-US/Boot_x86_ppc-para-1.xml | 8
en-US/Boot_x86_ppc-para-2.xml | 8
en-US/Boot_x86_ppc-para-3.xml | 8
en-US/Boot_x86_ppc-para-4.xml | 8
en-US/Boot_x86_ppc-para-5.xml | 8
en-US/Boot_x86_ppc-para-6.xml | 8
en-US/Boot_x86_ppc-table-1.xml | 29
en-US/Boot_x86_ppc-title-1.xml | 6
en-US/Boot_x86_ppc-title-2.xml | 6
en-US/Boot_x86_ppc-title-3.xml | 9
en-US/Boot_x86_ppc-variablelist-1.xml | 47 +
en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml | 2
en-US/Graphical_Installation_x86-Installation-methods.xml | 2
en-US/Important_UEFI.xml | 1
en-US/Note_Aborting_Installation.xml | 11
19 files changed, 289 insertions(+), 199 deletions(-)
New commits:
commit 09e8bcfa431eeb3ef4cc7754e1ce9aedd75a24d4
Author: Ruediger Landmann <r.landmann(a)redhat.com>
Date: Thu Apr 29 12:23:09 2010 +1000
revise section 6.2
diff --git a/en-US/Boot-x86.xml b/en-US/Boot-x86.xml
index 019aa80..e8cb1d0 100644
--- a/en-US/Boot-x86.xml
+++ b/en-US/Boot-x86.xml
@@ -2,209 +2,108 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- $Id: -->
-<chapter id="ch-beginninginstallation">
- <title>Booting the Installer</title>
+<chapter id="ch-Boot-x86">
+ <xi:include href="Boot_x86_ppc-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Booting the Installer -->
- <indexterm>
- <primary>BIOS (Basic Input/Output System)</primary>
- </indexterm>
- <indexterm>
- <primary>CD/DVD media</primary>
- <secondary>booting</secondary>
- </indexterm>
- <indexterm>
- <primary>USB flash media</primary>
- <secondary>booting</secondary>
- </indexterm>
- <xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <para>To start the installation program from minimal boot media, a
- Live image, or the distribution DVD, follow this procedure:</para>
- <procedure>
- <step>
- <para>Power off your computer system.</para>
- </step>
- <step>
- <para>Disconnect any external FireWire or USB disks that you do
- not need for installation. Refer to <xref
- linkend="sn-partitioning-fw-usb-x86"/> for more
- information.</para>
- </step>
- <step>
- <para>Insert the media in your computer and turn it on.</para>
- </step>
- </procedure>
+<!-- start indexterms -->
+ <indexterm>
+ <primary>BIOS (Basic Input/Output System)</primary>
+ </indexterm>
+ <xi:include href="Boot_x86_ppc-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- CD/DVD media - booting -->
+ <xi:include href="Boot_x86_ppc-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- USB flash media - booting -->
+<!-- end indexterms -->
+
+ <xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The CD and DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces -->
+
+ <xi:include href="Boot_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- To start the installation program from a Fedrora CD, DVD, or minimal boot media, -->
+
+ <procedure>
+ <step>
+ <para>
+ Disconnect any external FireWire or USB disks that you do not need for installation. Refer to <xref linkend="sn-partitioning-fw-usb-x86"/> for more information.
+ </para>
+ </step>
+ <step>
+ <para>
+ Power on your computer system.
+ </para>
+ </step>
+ <step>
+ <para>
+ Insert the media in your computer.
+ </para>
+ </step>
+ <step>
+ <para>
+ Power off your computer with the boot media still inside.
+ </para>
+ </step>
+ <step>
+ <para>
+ Power on your computer system.
+ </para>
+ </step>
+ </procedure>
+
+<!-- the following paras describe BIOS settings and are therefore relevant only to x86 -->
<xi:include href="Boot_Order-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <note>
- <title>Aborting the Installation</title>
- <para>
- To abort the installation, either press <keycombo><keycap>Ctrl
- </keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo>
- or power off your computer with the power switch. You may
- abort the installation process without consequence at any time
- prior to selecting <guibutton>Write changes to disk</guibutton>
- on the <guilabel>Write partitioning to disk</guilabel> screen.
- Fedora makes no permanent changes to your computer until
- that point. Please be aware that stopping the installation
- after partitioning has begun can leave your computer unusable.
- </para>
- </note>
- <section id="sn-boot-menu">
- <title>The Boot Menu</title>
- <para>The boot media displays a graphical boot menu with several
- options. If no key is hit within 60 seconds, the default boot
- option runs. To choose the default, either wait for the timer to
- run out or hit <keycap>Enter</keycap> on the keyboard. To select
- a different option than the default, use the arrow keys on your
- 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>
- <note>
- <title>Using Boot Options</title>
- <para>For a listing and explanation of common boot options, refer
- to <xref linkend="ap-admin-options"/>.</para>
- </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>
- <itemizedlist>
- <listitem>
- <formalpara>
- <title>Boot</title>
- <para>This option is the default. If you select this option,
- only the kernel and startup programs load into memory. This
- option takes less time to load. As you use programs, they
- are loaded from the disc, which takes more time. This mode
- can be used on machines with less total memory.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Verify and Boot</title>
- <para>This option lets you verify the disc before you run the
- Live CD environment. Refer to <xref
- linkend="sn-verifying-media"/> for more information on the
- verification process.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Memory Test</title>
- <para>
- This option runs an exhaustive test on the memory on your
- system. For more information, refer to <xref
- linkend="sn-memtest"/>.
- </para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Boot from local drive</title>
- <para>
- This option boots the system from the first installed disk.
- If you booted this disc accidentally, use this option to
- boot from the hard disk immediately without starting the
- installer.
- </para>
- </formalpara>
- </listitem>
- </itemizedlist>
- <para>If you boot the DVD, rescue CD, or minimal boot media, the
- boot menu options include:</para>
- <itemizedlist>
- <listitem>
- <formalpara>
- <title>Install or upgrade an existing system</title>
- <para>This option is the default. Choose this option to
- install Fedora onto your computer system using the
- graphical installation program.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Install system with basic video driver</title>
- <para>This option allows you to install Fedora in graphical mode even if the installation program is unable to load the correct driver for your video card. If your screen appears distorted or goes blank when using the the <guilabel>Install or upgrade an existing system</guilabel> option, restart your computer and try this option instead.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Rescue installed system</title>
- <para>Choose this option to repair a problem with your
- installed Fedora system that prevents you from booting
- normally. Although Fedora is an exceptionally stable
- computing platform, it is still possible for occasional
- problems to occur that prevent booting. The rescue
- environment contains utility programs that allow you fix a
- wide variety of these problems.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Boot from local drive</title>
- <para>
- (as for Live CD)
- </para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Memory Test</title>
- <para>
- (as for Live CD)
- </para>
- </formalpara>
- </listitem>
- </itemizedlist>
- </section>
- <section id="sn-install-diff-source">
- <title>Installing from a Different Source</title>
- <para>All boot media except the distribution DVD present a menu that
- allows you to choose the installation source, such as the network
- or a hard disk. If you are booting the distribution DVD and do
- not want to install from the DVD, hit <keycap>Tab</keycap> at the
- boot menu. Add a space and the option <option>linux askmethod</option>
- to the end of the line that appears below the menu.</para>
- <para>You can install Fedora from the ISO images stored on hard
- disk, or from a network using NFS, FTP, or HTTP methods.
- Experienced users frequently use one of these methods because it
- is often faster to read data from a hard disk or network server
- than from a CD or DVD.</para>
- <para>The following table summarizes the different boot methods and
- recommended installation methods to use with each:</para>
- <table frame='all'><title>Boot methods and installation methods</title>
- <tgroup cols='2' align='left' colsep='1' rowsep='1'>
- <thead>
- <row>
- <entry>Boot method</entry>
- <entry>Installation method</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>DVD</entry>
- <entry>DVD, network, or hard disk</entry>
- </row>
- <row>
- <entry>Minimal boot CD or USB, rescue CD</entry>
- <entry>Network or hard disk</entry>
- </row>
- <row>
- <entry>Live CD or USB</entry>
- <entry><application>Install to Hard Disk</application>
- application</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <para><xref
- linkend="s1-installmethod"/> contains detailed
- information about installing from alternate locations.
- </para>
- </section>
+<!-- end x86-specific material -->
+
+ <xi:include href="Note_Aborting_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The CD and DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces -->
+
+
+ <section id="sn-boot-menu-x86">
+ <xi:include href="Boot_x86_ppc-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The Boot Menu -->
+
+ <xi:include href="Boot_x86_ppc-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The boot media displays a graphical boot menu with several options. -->
+
+ <para>
+ When using Fedora Live media, press any key during the initial boot countdown to bring up the <guilabel>Boot Options</guilabel> menu.
+ </para>
+
+ <xi:include href="Boot_x86_ppc-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The boot screen. -->
+
+ <xi:include href="Boot_x86_ppc-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- For a listing and explanation of common boot options, refer -->
+
+ <xi:include href="Boot_x86_ppc-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- If you boot the DVD, rescue CD, or minimal boot media, the boot menu options include: -->
+
+ <xi:include href="Boot_x86_ppc-variablelist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Install or upgrade an existing system -->
+
+ </section>
+
+ <section id="sn-install-diff-source-x86">
+ <xi:include href="Boot_x86_ppc-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Installing from a Different Source -->
+
+ <xi:include href="Boot_x86_ppc-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- You can install Red Hat Enterprise Linux from the ISO images stored -->
+
+ <xi:include href="Boot_x86_ppc-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The following table summarizes the different boot methods -->
+
+ <xi:include href="Boot_x86_ppc-table-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Boot methods and installation methods -->
+
+ <para>
+ Refer to <xref linkend="s1-installmethod-x86"/> for information about installing from locations other than the media with which you booted the system.
+ </para>
+ </section>
<section id="sn-verifying-media">
<title>Verifying Media</title>
<para>The distribution DVD media and the Live CD media offer an
diff --git a/en-US/Boot_x86_ppc-figure-1.xml b/en-US/Boot_x86_ppc-figure-1.xml
new file mode 100644
index 0000000..8ed14dc
--- /dev/null
+++ b/en-US/Boot_x86_ppc-figure-1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<figure float="0">
+ <title>The boot screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/boot/boot_screen.png" format="PNG"/></imageobject>
+ <textobject><para>
+ The boot screen
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Boot_x86_ppc-indexterm-1.xml b/en-US/Boot_x86_ppc-indexterm-1.xml
new file mode 100644
index 0000000..4d9d0ed
--- /dev/null
+++ b/en-US/Boot_x86_ppc-indexterm-1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<indexterm>
+ <primary>CD/DVD media</primary>
+ <secondary>booting</secondary>
+</indexterm>
+
diff --git a/en-US/Boot_x86_ppc-indexterm-2.xml b/en-US/Boot_x86_ppc-indexterm-2.xml
new file mode 100644
index 0000000..a806ce0
--- /dev/null
+++ b/en-US/Boot_x86_ppc-indexterm-2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<indexterm>
+ <primary>USB media</primary>
+ <secondary>booting</secondary>
+</indexterm>
+
diff --git a/en-US/Boot_x86_ppc-para-1.xml b/en-US/Boot_x86_ppc-para-1.xml
new file mode 100644
index 0000000..3546650
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ To start the installation program from a Red Hat Enterprise Linux CD, DVD, or minimal boot media, follow this procedure:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-2.xml b/en-US/Boot_x86_ppc-para-2.xml
new file mode 100644
index 0000000..aa60d74
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ The boot media displays a graphical boot menu with several options. If no key is hit within 60 seconds, the default boot option runs. To choose the default, either wait for the timer to run out or hit <keycap>Enter</keycap> on the keyboard. To select a different option than the default, use the arrow keys on your keyboard, and hit <keycap>Enter</keycap> when the correct option is highlighted. If you want to customize the boot options for a particular option, press the <keycap>Tab</keycap> key.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-3.xml b/en-US/Boot_x86_ppc-para-3.xml
new file mode 100644
index 0000000..2c7524d
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ For a listing and explanation of common boot options, refer to <xref linkend="ap-admin-options"/>.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-4.xml b/en-US/Boot_x86_ppc-para-4.xml
new file mode 100644
index 0000000..6fbde22
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ If you boot the DVD, rescue CD, or minimal boot media, the boot menu options are:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-5.xml b/en-US/Boot_x86_ppc-para-5.xml
new file mode 100644
index 0000000..c704311
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ You can install Fedora from the ISO images stored on hard disk, or from a network using NFS, FTP, or HTTP methods. Experienced users frequently use one of these methods because it is often faster to read data from a hard disk or network server than from a CD or DVD.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-6.xml b/en-US/Boot_x86_ppc-para-6.xml
new file mode 100644
index 0000000..2d910c2
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-6.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ The following table summarizes the different boot methods and recommended installation methods to use with each:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-table-1.xml b/en-US/Boot_x86_ppc-table-1.xml
new file mode 100644
index 0000000..1dfcc1a
--- /dev/null
+++ b/en-US/Boot_x86_ppc-table-1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<table frame='all'><title>Boot methods and installation methods</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <thead>
+ <row>
+ <entry>Boot method</entry>
+ <entry>Installation method</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>DVD</entry>
+ <entry>DVD, network, or hard disk</entry>
+ </row>
+ <row>
+ <entry>Minimal boot CD or USB, rescue CD</entry>
+ <entry>Network or hard disk</entry>
+ </row>
+ <row>
+ <entry>Live CD or USB</entry>
+ <entry><application>Install to Hard Disk</application> application</entry>
+ </row>
+ </tbody>
+ </tgroup>
+</table>
+
diff --git a/en-US/Boot_x86_ppc-title-1.xml b/en-US/Boot_x86_ppc-title-1.xml
new file mode 100644
index 0000000..0d32370
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<title>Booting the Installer</title>
+
diff --git a/en-US/Boot_x86_ppc-title-2.xml b/en-US/Boot_x86_ppc-title-2.xml
new file mode 100644
index 0000000..6a25b30
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-2.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<title>The Boot Menu</title>
+
diff --git a/en-US/Boot_x86_ppc-title-3.xml b/en-US/Boot_x86_ppc-title-3.xml
new file mode 100644
index 0000000..7a9b500
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+
+<title>
+ Installing from a Different Source
+</title>
+
diff --git a/en-US/Boot_x86_ppc-variablelist-1.xml b/en-US/Boot_x86_ppc-variablelist-1.xml
new file mode 100644
index 0000000..c3aa0b5
--- /dev/null
+++ b/en-US/Boot_x86_ppc-variablelist-1.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<variablelist>
+ <varlistentry>
+ <term>Install or upgrade an existing system</term>
+ <listitem>
+ <para>
+ This option is the default. Choose this option to install Fedora onto your computer system using the graphical installation program.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Install system with basic video driver</term>
+ <listitem>
+ <para>
+ This option allows you to install Fedora in graphical mode even if the installation program is unable to load the correct driver for your video card. If your screen appears distorted or goes blank when using the the <guilabel>Install or upgrade an existing system</guilabel> option, restart your computer and try this option instead.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Rescue installed system</term>
+ <listitem>
+ <para>
+ Choose this option to repair a problem with your installed Fedora system that prevents you from booting normally. Although Fedora is an exceptionally stable computing platform, it is still possible for occasional problems to occur that prevent booting. The rescue environment contains utility programs that allow you fix a wide variety of these problems.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Boot from local drive</term>
+ <listitem>
+ <para>
+ This option boots the system from the first installed disk. If you booted this disc accidentally, use this option to boot from the hard disk immediately without starting the installer.
+ </para>
+ </listitem>
+ </varlistentry>
+ <!-- Not in RHEL6 Beta <varlistentry>
+ <term>Memory Test</term>
+ <listitem>
+ <para>
+ This option runs an exhaustive test on the memory on your system. For more information, refer to <xref linkend="sn-memtest"/>.
+ </para>
+ </listitem>
+ </varlistentry> -->
+</variablelist>
+
diff --git a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
index 95d129e..7fdc307 100644
--- a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
+++ b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
@@ -9,7 +9,7 @@
<!-- The following paragraph is in both x86 and ppc guides, but is included here because of the arch-specific link -->
<para>
- Refer to <xref linkend="sn-boot-menu"/> for a description of the Fedora boot menu and to <xref linkend="s1-guimode-textinterface-x86"/> for a brief overview of text mode installation instructions.
+ Refer to <xref linkend="sn-boot-menu-x86"/> for a description of the Fedora boot menu and to <xref linkend="s1-guimode-textinterface-x86"/> for a brief overview of text mode installation instructions.
</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml"/>
diff --git a/en-US/Graphical_Installation_x86-Installation-methods.xml b/en-US/Graphical_Installation_x86-Installation-methods.xml
index f24d779..8a57f23 100644
--- a/en-US/Graphical_Installation_x86-Installation-methods.xml
+++ b/en-US/Graphical_Installation_x86-Installation-methods.xml
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
]>
-<section id="s1-installmethod">
+<section id="s1-installmethod-x86">
<title>Selecting an Installation Method</title>
<indexterm significance="normal">
<primary>installation</primary>
diff --git a/en-US/Important_UEFI.xml b/en-US/Important_UEFI.xml
index 75ab6cf..2a7a23d 100644
--- a/en-US/Important_UEFI.xml
+++ b/en-US/Important_UEFI.xml
@@ -11,3 +11,4 @@
Note that the boot configurations of UEFI and BIOS differ significantly from each other. Therefore, the installed system must boot using the same firmware that was used during installation. You cannot install the operating system on a system that uses BIOS and then boot this installation on a system that uses UEFI.
</para>
</important>
+
diff --git a/en-US/Note_Aborting_Installation.xml b/en-US/Note_Aborting_Installation.xml
new file mode 100644
index 0000000..38bed17
--- /dev/null
+++ b/en-US/Note_Aborting_Installation.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<note>
+<title>Note — Aborting the Installation</title>
+ <para>
+ To abort the installation, either press <keycombo><keycap>Ctrl </keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo> or power off your computer with the power switch. You may abort the installation process without consequence at any time prior to selecting <guibutton>Write changes to disk</guibutton> on the <guilabel>Write partitioning to disk</guilabel> screen. Fedora makes no permanent changes to your computer until that point. Please be aware that stopping the installation after partitioning has begun can leave your computer unusable.
+ </para>
+</note>
+
es-ES/Networking.po | 84 +++++++++-------------------------------------------
1 file changed, 16 insertions(+), 68 deletions(-)
New commits:
commit abe0ebcce07e6eecf827842f436fcdebc7eee11e
Author: dennistobar <dennistobar(a)fedoraproject.org>
Date: Wed Apr 28 22:37:19 2010 +0000
l10n: Updates to Spanish (Castilian) (es) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/es-ES/Networking.po b/es-ES/Networking.po
index 051745b..8a018f9 100644
--- a/es-ES/Networking.po
+++ b/es-ES/Networking.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: release-notes.HEAD.es\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2010-04-26T21:47:52\n"
-"PO-Revision-Date: 2010-03-20 14:39-0300\n"
-"Last-Translator: Héctor Daniel Cabrera <logan(a)fedoraproject.org>\n"
+"PO-Revision-Date: 2010-04-28 18:36-0400\n"
+"Last-Translator: Dennis Tobar <dennis.tobar(a)gmail.com>\n"
"Language-Team: Spanish <trans-es(a)lists.fedoraproject.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,29 +31,18 @@ msgstr "NetworkManager"
#. Tag: para
#, no-c-format
-msgid ""
-"Many older phones support mobile broadband sharing to computers through "
-"Bluetooth Dial-Up Networking (DUN). When the phone is paired with a "
-"computer, the computer may request that the phone provide a virtual serial "
-"port, and then the computer treats that virtual serial port as a normal "
-"mobile broadband connection card, sending AT commands and starting PPP."
-msgstr ""
+msgid "Many older phones support mobile broadband sharing to computers through Bluetooth Dial-Up Networking (DUN). When the phone is paired with a computer, the computer may request that the phone provide a virtual serial port, and then the computer treats that virtual serial port as a normal mobile broadband connection card, sending AT commands and starting PPP."
+msgstr "Varios teléfonos antiguos soportan compartir banda ancha móvil a los computadores a través de Bluetooth Dial-Up Networking (DUN). Cuando el teléfono está contectado con un computador, el computador puede requerir que el teléfono entregue un puerto serial virtual, y entonces el computador trata el puerto serial virtual como una tarjeta de conexión de banda ancha móvil normal, enviando comandos AT e iniciando PPP."
#. Tag: para
#, no-c-format
-msgid ""
-"Enhanced functionality in the <package>gnome-bluetooth</package> plugin "
-"allows users to set up their network connection with a few clicks, after "
-"which the phone and the network connection are available from the "
-"<guilabel>nm-applet</guilabel> menu."
-msgstr ""
+msgid "Enhanced functionality in the <package>gnome-bluetooth</package> plugin allows users to set up their network connection with a few clicks, after which the phone and the network connection are available from the <guilabel>nm-applet</guilabel> menu."
+msgstr "Las funciones mejoradas del plugin <package>gnome-bluetooth</package> permite a los usuarios configurar sus conexiones de red con unos pocos clics, tras los cuales el teléfono y la conexión a la red estarán disponibles desde el menú de <guilabel>nm-applet</guilabel>."
#. Tag: para
#, no-c-format
-msgid ""
-"The Fedora user now will only have one tool to use instead of having to use "
-"a 3rd-party tool that doesn't fully function with Fedora."
-msgstr ""
+msgid "The Fedora user now will only have one tool to use instead of having to use a 3rd-party tool that doesn't fully function with Fedora."
+msgstr "El usuario de Fedora ahora posee una herramienta para usar en vez de usar una herramienta de otro fabricante que no es completamente funcional con Fedora."
#. Tag: title
#, fuzzy, no-c-format
@@ -62,27 +51,17 @@ msgstr "NetworkManager"
#. Tag: para
#, no-c-format
-msgid ""
-"NetworkManager Command Line allows a user to control the NetworkManager "
-"without using a GUI."
+msgid "NetworkManager Command Line allows a user to control the NetworkManager without using a GUI."
msgstr ""
#. Tag: para
#, no-c-format
-msgid ""
-"NetworkManager Command Line has created tools that will allow a user to "
-"control the <package>NetworkManager</package> from a terminal, headless "
-"machine, or the initscripts with a proper CLI client. The purpose of this "
-"program is to have very lightweight tool. Therefore, tools written in C are "
-"preferred over tools written in Python."
+msgid "NetworkManager Command Line has created tools that will allow a user to control the <package>NetworkManager</package> from a terminal, headless machine, or the initscripts with a proper CLI client. The purpose of this program is to have very lightweight tool. Therefore, tools written in C are preferred over tools written in Python."
msgstr ""
#. Tag: para
#, no-c-format
-msgid ""
-"NetworkManager Command Line tools will benefit the Fedora user by making the "
-"NetworkManager more suitable to the server enviroment and consolidating "
-"network configuration."
+msgid "NetworkManager Command Line tools will benefit the Fedora user by making the NetworkManager more suitable to the server enviroment and consolidating network configuration."
msgstr ""
#. Tag: title
@@ -92,19 +71,13 @@ msgstr "NetworkManager"
#. Tag: para
#, no-c-format
-msgid ""
-"The NetworkManager applet shows the current signal strength, cellular "
-"technology (GPRS/EDGE/UMTS/HSPA or 1x/EVDO etc), and roaming status while "
-"connected for cards where this functionality is supported."
-msgstr ""
+msgid "The NetworkManager applet shows the current signal strength, cellular technology (GPRS/EDGE/UMTS/HSPA or 1x/EVDO etc), and roaming status while connected for cards where this functionality is supported."
+msgstr "El applet de NetworkManager muestra la potencia actual de la señal, tecnología celular (GPRS/EDGE/UMTS/HSPA or 1x/EVDO etc), y el estado del roaming mientras esté conectado con tarjetas que soporten esta funcionalidad."
#. Tag: para
#, no-c-format
-msgid ""
-"The benefits to Fedora users are Mobile Status makes it easier to use mobile "
-"broadband. Users will be able to know when their device has a signal and if "
-"they are roaming or not. This could potentially save the user money."
-msgstr ""
+msgid "The benefits to Fedora users are Mobile Status makes it easier to use mobile broadband. Users will be able to know when their device has a signal and if they are roaming or not. This could potentially save the user money."
+msgstr "Los beneficios para los usuarios de Fedora son que Mobile Status hace mas fácil usar una conexión banda ancha móvil. Los usuarios serán capaces de conocer si el dispositivo posee una señal y si hay roaming o no. Esto podría ahorrar dinero al usuario."
#. Tag: title
#, no-c-format
@@ -119,14 +92,12 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ msgid "NetworkManager improvements including a command line interface"
#~ msgstr ""
#~ "Mejoras en NetworkManager, incluyendo una interfaz de línea de comandos"
-
#~ msgid ""
#~ "<application>NetworkManager</application> in Fedora 13 features the "
#~ "following major improvements:"
#~ msgstr ""
#~ "<application>NetworkManager</application> en Fedora 13 ofrece las "
#~ "siguientes importantes mejorías:"
-
#~ msgid ""
#~ "support for older Bluetooth dial-up networking, and features a command "
#~ "line interface and better signal strength indicators. The dial-up modem "
@@ -142,7 +113,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "teléfono, simplemente tilde la opción <guilabel>Ingresar a Internet "
#~ "utilizando su teléfono móvil</guilabel>, y seleccione su operador de "
#~ "telefonía. "
-
#~ msgid ""
#~ "command-line integration, though the <application>nmcli</application> "
#~ "utility. This feature finally makes <application>NetworkManager</"
@@ -158,7 +128,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "<application>NetworkManager</application> desde la línea de comandos, es "
#~ "útil además para los usuarios que quieren trabajar en modo texto para "
#~ "conservar energía, por ejemplo, mientras se está viajando. "
-
#~ msgid ""
#~ "mobile broadband signal strength and roaming status is now shown in the "
#~ "network status icon for many mobile broadband cards."
@@ -166,7 +135,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "La potencia de la señal de banda ancha móvil y el estado del roaming, "
#~ "ahora se muestran en el ícono de estado de red, para numerosas tarjetas "
#~ "de banda ancha."
-
#~ msgid ""
#~ "This beat is located here: <ulink type=\"http\" url=\"https://"
#~ "fedoraproject.org/wiki/Docs/Beats/Networking\">https://fedoraproject.org/"
@@ -175,7 +143,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "This beat is located here: <ulink type=\"http\" url=\"https://"
#~ "fedoraproject.org/wiki/Docs/Beats/Networking\">https://fedoraproject.org/"
#~ "wiki/Docs/Beats/Networking</ulink>"
-
#~ msgid ""
#~ "<application>NetworkManager</application> can now create and edit system-"
#~ "wide network connections in <filename>/etc/sysconfig</filename>. "
@@ -201,13 +168,10 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "conexiones vpn. Para conexiones que necesiten contraseñas, éstas serán "
#~ "almacenadas en archivos <filename>.keys</filename> dentro de <filename>/"
#~ "etc/sysconfig</filename>."
-
#~ msgid "<primary>GSM</primary>"
#~ msgstr "<primary>GSM</primary>"
-
#~ msgid "mobile-broadband-provider-info"
#~ msgstr "mobile-broadband-provider-info"
-
#~ msgid ""
#~ "By providing a database of preconfigured mobile broadband providers, "
#~ "supporting more hardware, and permitting scanning of GSM networks, "
@@ -223,17 +187,13 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "móvil. Su proveedor de banda ancha será automáticamente reconocido por "
#~ "<application>NetworkManager</application> y hará muy fácil el proceso de, "
#~ "por ejemplo, conectar su dispositivo USB y estar en línea en minutos. "
-
#~ msgid "Enhanced IPv6 support in <application>NetworkManager</application>"
#~ msgstr ""
#~ "Soporte de IPv6 mejorado en <application>NetworkManager</application>"
-
#~ msgid "IPv6"
#~ msgstr "IPv6"
-
#~ msgid "ifcfg"
#~ msgstr "ifcfg"
-
#~ msgid ""
#~ "For non-GUI users, and those that use <filename>ifcfg</filename> files "
#~ "directly, <application>NetworkManager</application> should bring up the "
@@ -246,7 +206,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "correctamente la ineterfaz para conexión IPv6 en el arranque. No es "
#~ "necesaria ningún tipo de modificación en los archivos <filename>ifcfg</"
#~ "filename>. "
-
#~ msgid ""
#~ "For GUI users, a new IPv6 tab will appear in the connection editor which "
#~ "will allow for control if the IPv6 settings similar to control of IPv4 "
@@ -266,19 +225,14 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "enrutador, y sólo intentará obtener informaciones DNS mediante DHCPv6), "
#~ "ingresar la información adicional que desee utilizar, guardar la "
#~ "configuración, y finalmente activar esa conexión"
-
#~ msgid "<title>Network Interface Management</title>"
#~ msgstr "<title>Administración de la Interfaz de Red</title>"
-
#~ msgid "<primary>Network Interface Management</primary>"
#~ msgstr "<primary>Administración de la Interfaz de Red</primary>"
-
#~ msgid "netcf"
#~ msgstr "netcf"
-
#~ msgid "libvirt"
#~ msgstr "libvirt"
-
#~ msgid ""
#~ "Configuring the network interfaces on a machine for moderately "
#~ "complicated yet common scenarios is generally only accessible to advanced "
@@ -294,7 +248,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "ejemplo, crear un puente y convertir un NIC físico en su esclavo, o "
#~ "asociar dos NICs, añadir una interfaz VLAN al conjunto y convertir todo "
#~ "en esclavo de un puente."
-
#~ msgid ""
#~ "Complicated bridge setups are commonly needed on virtualized hosts, and "
#~ "often have to be performed remotely by higher-level management tools, "
@@ -303,7 +256,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "Configuraciones de puente complicadas se necesitan comúnmente en equipos "
#~ "virtualizados, y a menudo se deben realizar remotamente con herramientas "
#~ "de administración de alto nivel, en vez de un usuario humano."
-
#~ msgid ""
#~ "This feature addresses these needs by providing a general-purpose network "
#~ "configuration library (<application>netcf</application>) and additions to "
@@ -317,7 +269,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "<application>libvirt</application> para exponer el API local de "
#~ "<application>netcf</application> mediante herramientas remotas de "
#~ "<application>libvirt</application>."
-
#~ msgid ""
#~ "With <application>netcf</application>, a logical network interface (for "
#~ "example, a bridge and its slaves) is described as a unit, and "
@@ -348,7 +299,6 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "con cualquier otro método de cambiar la configuración de la red, y muchos "
#~ "de los problemas de intentos anteriores de hacerlo — por ejemplo, "
#~ "como con los scripts de red de Xen — serán evitados."
-
#~ msgid ""
#~ "It is planned to switch <application>NetworkManager</application> to "
#~ "<application>netcf</application> as the backend for system-wide network "
@@ -364,13 +314,10 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "experiencia del usuario en cuanto a la configuración de la red. "
#~ "Similarmente, se planea exponer la funcionalidad de configuración de la "
#~ "red en una versión futura de <application>virt-manager</application>."
-
#~ msgid "Bluetooth Service On Demand"
#~ msgstr "Servicio Bluetooth a petición"
-
#~ msgid "Bluetooth"
#~ msgstr "Bluetooth"
-
#~ msgid ""
#~ "In order to support Bluetooth devices, the Bluetooth background service "
#~ "was started by default in previous versions of Fedora. In this release, "
@@ -383,3 +330,4 @@ msgstr "Vea <xref linkend=\"sect-Release_Notes-File_Systems\" />."
#~ "lanzamiento, el servicio Bluetooth se inicia por demanda cuando se "
#~ "necesita y se detiene automáticamente 30 segundos después del último uso "
#~ "del dispositivo. Esto reduce el tiempo de arranque y el uso de recursos."
+
es-ES/Devel-Tools.po | 58 +++++++++++----------------------------------------
1 file changed, 13 insertions(+), 45 deletions(-)
New commits:
commit c42190ec58cb2b8d7e68ace2f43bf1b2abe1e286
Author: dennistobar <dennistobar(a)fedoraproject.org>
Date: Wed Apr 28 22:25:52 2010 +0000
l10n: Updates to Spanish (Castilian) (es) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/es-ES/Devel-Tools.po b/es-ES/Devel-Tools.po
index 033aa55..60e04ef 100644
--- a/es-ES/Devel-Tools.po
+++ b/es-ES/Devel-Tools.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: release-notes.HEAD.es\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2010-04-26T21:47:52\n"
-"PO-Revision-Date: 2010-03-20 16:23-0300\n"
-"Last-Translator: Héctor Daniel Cabrera <logan(a)fedoraproject.org>\n"
+"PO-Revision-Date: 2010-04-28 18:12-0400\n"
+"Last-Translator: Dennis Tobar <dennis.tobar(a)gmail.com>\n"
"Language-Team: Spanish <trans-es(a)lists.fedoraproject.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,18 +25,13 @@ msgid "Tools"
msgstr "Herramientas"
#. Tag: title
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Boost"
-msgstr "Herramientas"
+msgstr "Boost"
#. Tag: para
#, no-c-format
-msgid ""
-"Fedora 12 includes <package>Boost</package> 1.39. In Fedora 13, there is an "
-"upgrade to Boost 1.40, which, due to some improvements in the way Boost is "
-"built, allows Fedora to be in closer sync with the upstream development. The "
-"release notes for <package>Boost</package> can be found at <ulink type=\"http"
-"\" url=\"http://www.boost.org/users/history/version_1_40_0\" />."
+msgid "Fedora 12 includes <package>Boost</package> 1.39. In Fedora 13, there is an upgrade to Boost 1.40, which, due to some improvements in the way Boost is built, allows Fedora to be in closer sync with the upstream development. The release notes for <package>Boost</package> can be found at <ulink type=\"http\" url=\"http://www.boost.org/users/history/version_1_40_0\" />."
msgstr ""
#. Tag: title
@@ -46,40 +41,28 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid ""
-"<package>Systemtap</package> has been extended to support user space "
-"tracing, and in particular to support static (dtrace compatible) markers "
-"enabled in various programs in Fedora. This enables users, developers and "
-"administrators a high level overview of what is going on with their system "
-"or deep down in a specific program or subsystem."
+msgid "<package>Systemtap</package> has been extended to support user space tracing, and in particular to support static (dtrace compatible) markers enabled in various programs in Fedora. This enables users, developers and administrators a high level overview of what is going on with their system or deep down in a specific program or subsystem."
msgstr ""
#. Tag: para
#, no-c-format
-msgid ""
-"<package>Systemtap</package> comes with a tutorial, a language reference "
-"manual, a tapsets reference and an examples directory."
+msgid "<package>Systemtap</package> comes with a tutorial, a language reference manual, a tapsets reference and an examples directory."
msgstr ""
#. Tag: title
#, no-c-format
msgid "Python 3"
-msgstr ""
+msgstr "Python 3"
#. Tag: para
#, no-c-format
-msgid ""
-"Fedora now includes a Python 3 runtime, parallel-installable with our "
-"existing Python 2 runtime."
+msgid "Fedora now includes a Python 3 runtime, parallel-installable with our existing Python 2 runtime."
msgstr ""
#. Tag: para
#, no-c-format
-msgid ""
-"Python 3 versions of many libraries are available with more underway. For an "
-"update on the current status refer to <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Features/Python3F13\" />."
-msgstr ""
+msgid "Python 3 versions of many libraries are available with more underway. For an update on the current status refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/Python3F13\" />."
+msgstr "La versión de Pyhton 3 de varias librarías están disponibles con más desarrollo. Para una actualización del estado actual, visite <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/Python3F13\" />."
#. Tag: title
#, no-c-format
@@ -88,12 +71,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid ""
-"The <package>gdb</package> debugger has been extended so that it can report "
-"detailed information on the internals of the Python 2 and Python 3 runtimes. "
-"Backtraces involving Python will now by default show mixed C and Python-"
-"level information on what such processes are doing, without requiring "
-"expertise in the use of gdb."
+msgid "The <package>gdb</package> debugger has been extended so that it can report detailed information on the internals of the Python 2 and Python 3 runtimes. Backtraces involving Python will now by default show mixed C and Python-level information on what such processes are doing, without requiring expertise in the use of gdb."
msgstr ""
#~ msgid ""
@@ -114,10 +92,8 @@ msgstr ""
#~ "desarrollo, vea las <citetitle>Notas Técnicas de Fedora &PRODVER;</"
#~ "citetitle> en <ulink type=\"http\" url=\"http://docs.fedoraproject.org\" /"
#~ ">."
-
#~ msgid "TODO"
#~ msgstr "Pendiente"
-
#~ msgid ""
#~ "This beat is located here: <ulink type=\"http\" url=\"https://"
#~ "fedoraproject.org/wiki/Docs/Beats/Devel/Tools\">https://fedoraproject.org/"
@@ -126,37 +102,30 @@ msgstr ""
#~ "This beat is located here: <ulink type=\"http\" url=\"https://"
#~ "fedoraproject.org/wiki/Docs/Beats/Devel/Tools\">https://fedoraproject.org/"
#~ "wiki/Docs/Beats/Devel/Tools</ulink>"
-
#~ msgid "emacs"
#~ msgstr "emacs"
-
#~ msgid ""
#~ "<package>emacs</package> has been updated to version 23. Emacs 23 has a "
#~ "wide variety of new features, including:"
#~ msgstr ""
#~ "<package>emacs</package> fue actualizado a la versión 23. Emacs 23 tiene "
#~ "una amplia variedad de nuevas características, que incluyen a:"
-
#~ msgid "Improved Unicode support."
#~ msgstr "Soporte Unicode mejorado."
-
#~ msgid "Font rendering with Fontconfig and Xft."
#~ msgstr "Renderizado de fuente con Fontconfig y Xft."
-
#~ msgid ""
#~ "Support for using X displays and text terminals in one session, and for "
#~ "running as a daemon."
#~ msgstr ""
#~ "Soporte para el uso de pantallas X y terminales de texto en una sesión, y "
#~ "para ejecución de un demonio."
-
#~ msgid ""
#~ "Support for multi-file commits in distributed version-control systems (VC-"
#~ "dir)."
#~ msgstr ""
#~ "Soporte para subidas multi-archivo en sistemas de control de versión "
#~ "distribuídos (VC-dir)."
-
#~ msgid ""
#~ "New modes and packages for viewing PDF and postscript files (Doc-view "
#~ "mode), connecting to processes through D-Bus (dbus), connecting to the "
@@ -167,13 +136,12 @@ msgstr ""
#~ "view), conexión con procesos a través de D-Bus (cbus), con GNU Privacy "
#~ "Guard (EasyPG), edición de documentos XML (nXML mode), edición de "
#~ "programas Ruby (modo Ruby), y más."
-
#~ msgid "mercurial"
#~ msgstr "mercurial"
-
#~ msgid ""
#~ "Version 1.3.1 of <package>mercurial</package> now includes experimental "
#~ "support for sub-repositories."
#~ msgstr ""
#~ "La version 1.3.1 de <package>mercurial</package> ahora incluye soporte "
#~ "experimental para subrepositorios."
+