10 commits - en-US/AMQP_Infrastructure.xml en-US/Appendix.xml en-US/Appliance_Building_Tools.xml en-US/Architecture_specific_notes.xml en-US/Architecture_Specific_Notes.xml en-US/ArchSpecific.xml en-US/Are_There_Hideous_Bugs_and_Terrible_Tigers.xml en-US/Backwards_compatibility.xml en-US/Backwards_Compatibility.xml en-US/BackwardsCompatibility.xml en-US/Colophon.xml en-US/Database_Servers.xml en-US/DatabaseServers.xml en-US/Desktop.xml en-US/Development.xml en-US/DevelToolsJava.xml en-US/Devel.xml en-US/Eclipse.xml en-US/Embedded.xml en-US/Entertainment.xml en-US/Fedora_10_boot-time.xml en-US/Fedora_10_Boot-Time.xml en-US/Fedora_desktop.xml en-US/Fedora_Desktop.xml en-US/Fedora_live_images.xml en-US/Fedora_Live_Images.xml en-US/Fedora_overview.xml en-US/Fedora_Overview.xml en-US/Fedora_Project.xml en-US/Feedback.xml en-US/File_servers.xml en-US/File_Servers.xml en-US/File_systems.xml en-US/File_Systems.xml en-US/FileSystems.xml en-US/Games_and_entertainment.xml en-US/Games_and_Entertainment_.xml en-US/GCC_Compiler_Collection.xml en-US/Hardware_overview.xml en-US/Hardware_Overview.xml en-US/How_are_Things_for_Developers.xml en-US/I18n.xml en-US/Improved_Haskell_support.xml en-US/Installation_notes.xml en-US/Installation_Notes.xml en-US/Installer.xml en-US/International_language_support.xml en-US/International_Language_Support.xml en-US/Introduction_to_Fedora_Project_and_technical_release_notes.xml en-US/Introduction_to_Fedora_Project_and_Technical_Release_Notes.xml en-US/Java.xml en-US/KDE_3_development_platform_and_libraries.xml en-US/KDE_3_Development_Platform_and_Libraries.xml en-US/KDE_4_development_platform.xml en-US/KDE_4_Development_Platform.xml en-US/Kernel.xml en-US/Legacy.xml en-US/Legal_Stuff_and_Administrivia.xml en-US/Legal.xml en-US/Linux_kernel.xml en-US/Linux_Kernel.xml en-US/Live.xml en-US/Mail_servers.xml en-US/Mail_Servers.xml en-US/MailServers.xml en-US/Multimedia.xml en-US/NetBeans.xml en-US/Networking.xml en-US/Objective_CAML_OCaml_coverage_greatly_extended.xml en-US/OverView.xml en-US/Package_changes.xml en-US/Package_Changes.xml en-US/PackageChanges.xml en-US/Package_notes.xml en-US/Package_Notes.xml en-US/PackageNotes.xml en-US/PPC_specifics_for_Fedora.xml en-US/PPC_Specifics_for_Fedora.xml en-US/Printing.xml en-US/ProjectOverview.xml en-US/Python_NSS_Bindings.xml en-US/Release_Notes.xml en-US/Revision_History.xml en-US/Runtime.xml en-US/Samba_-_Windows_compatibility.xml en-US/Samba_-_Windows_Compatibility.xml en-US/Security_SELinux.xml en-US/Security.xml en-US/Server_tools.xml en-US/Server_Tools.xml en-US/SystemDaemons.xml en-US/System_services.xml en-US/System_Services.xml en-US/Tools.xml en-US/Updated_packages_in_Fedora_10.xml en-US/Updated_Packages_in_Fedora_10.xml en-US/Upfront_About_Multimedia.xml en-US/Virtualization.xml en-US/Web_servers.xml en-US/Web_Servers.xml en-US/WebServers.xml en-US/Welcome_to_Fedora_10.xml en-US/Welcome_to_Fedora.xml en-US/Welcome.xml en-US/What_Do_System_Administrators_Care_About.xml en-US/What_is_New_for_Installation_and_Live_Images.xml en-US/What_is_the_Latest_on_the_Desktop.xml en-US/x86_64_specifics_for_Fedora.xml en-US/x86_64_Specifics_for_Fedora.xml en-US/x86_specifics_for_Fedora.xml en-US/x86_Specifics_for_Fedora.xml en-US/Xorg.xml en-US/X_Window_system_-_graphics.xml en-US/X_Window_System_-_Graphics.xml

Karsten Wade quaid at fedoraproject.org
Thu Oct 16 17:47:51 UTC 2008


 en-US/AMQP_Infrastructure.xml                                        |   42 
 en-US/Appendix.xml                                                   |   11 
 en-US/Appliance_Building_Tools.xml                                   |   33 
 en-US/ArchSpecific.xml                                               |  514 ------
 en-US/Architecture_Specific_Notes.xml                                |   33 
 en-US/Architecture_specific_notes.xml                                |   54 
 en-US/Are_There_Hideous_Bugs_and_Terrible_Tigers.xml                 |   25 
 en-US/BackwardsCompatibility.xml                                     |  206 --
 en-US/Backwards_Compatibility.xml                                    |   30 
 en-US/Backwards_compatibility.xml                                    |   30 
 en-US/Colophon.xml                                                   |    8 
 en-US/DatabaseServers.xml                                            |   76 
 en-US/Database_Servers.xml                                           |   47 
 en-US/Desktop.xml                                                    |  730 ---------
 en-US/Devel.xml                                                      |  254 ---
 en-US/DevelToolsJava.xml                                             |   40 
 en-US/Development.xml                                                |   46 
 en-US/Eclipse.xml                                                    |   31 
 en-US/Embedded.xml                                                   |    8 
 en-US/Entertainment.xml                                              |   50 
 en-US/Fedora_10_Boot-Time.xml                                        |   56 
 en-US/Fedora_10_boot-time.xml                                        |   56 
 en-US/Fedora_Desktop.xml                                             |  189 --
 en-US/Fedora_Live_Images.xml                                         |   80 -
 en-US/Fedora_Overview.xml                                            |   62 
 en-US/Fedora_Project.xml                                             |    4 
 en-US/Fedora_desktop.xml                                             |  189 ++
 en-US/Fedora_live_images.xml                                         |   80 +
 en-US/Fedora_overview.xml                                            |   62 
 en-US/Feedback.xml                                                   |    8 
 en-US/FileSystems.xml                                                |   83 -
 en-US/File_Servers.xml                                               |   32 
 en-US/File_Systems.xml                                               |   26 
 en-US/File_servers.xml                                               |   32 
 en-US/File_systems.xml                                               |   26 
 en-US/GCC_Compiler_Collection.xml                                    |   39 
 en-US/Games_and_Entertainment_.xml                                   |   25 
 en-US/Games_and_entertainment.xml                                    |   25 
 en-US/Hardware_Overview.xml                                          |   46 
 en-US/Hardware_overview.xml                                          |   46 
 en-US/How_are_Things_for_Developers.xml                              |   25 
 en-US/I18n.xml                                                       |  336 ----
 en-US/Improved_Haskell_support.xml                                   |   22 
 en-US/Installation_Notes.xml                                         |  182 --
 en-US/Installation_notes.xml                                         |  182 ++
 en-US/Installer.xml                                                  |  435 -----
 en-US/International_Language_Support.xml                             |  166 --
 en-US/International_language_support.xml                             |  166 ++
 en-US/Introduction_to_Fedora_Project_and_Technical_Release_Notes.xml |   36 
 en-US/Introduction_to_Fedora_Project_and_technical_release_notes.xml |   36 
 en-US/Java.xml                                                       |   22 
 en-US/KDE_3_Development_Platform_and_Libraries.xml                   |   70 
 en-US/KDE_3_development_platform_and_libraries.xml                   |  108 +
 en-US/KDE_4_Development_Platform.xml                                 |   43 
 en-US/KDE_4_development_platform.xml                                 |   35 
 en-US/Kernel.xml                                                     |  253 ---
 en-US/Legacy.xml                                                     |   28 
 en-US/Legal.xml                                                      |   27 
 en-US/Legal_Stuff_and_Administrivia.xml                              |   22 
 en-US/Linux_Kernel.xml                                               |  146 -
 en-US/Linux_kernel.xml                                               |  143 +
 en-US/Live.xml                                                       |  177 --
 en-US/MailServers.xml                                                |   59 
 en-US/Mail_Servers.xml                                               |   32 
 en-US/Mail_servers.xml                                               |   36 
 en-US/Multimedia.xml                                                 |  294 ++-
 en-US/NetBeans.xml                                                   |   42 
 en-US/Networking.xml                                                 |   50 
 en-US/Objective_CAML_OCaml_coverage_greatly_extended.xml             |   20 
 en-US/OverView.xml                                                   |  347 ----
 en-US/PPC_Specifics_for_Fedora.xml                                   |  122 -
 en-US/PPC_specifics_for_Fedora.xml                                   |  221 ++
 en-US/PackageChanges.xml                                             |   16 
 en-US/PackageNotes.xml                                               |  202 --
 en-US/Package_Changes.xml                                            |   37 
 en-US/Package_Notes.xml                                              |   30 
 en-US/Package_changes.xml                                            |   25 
 en-US/Package_notes.xml                                              |   44 
 en-US/Printing.xml                                                   |   83 -
 en-US/ProjectOverview.xml                                            |  110 -
 en-US/Python_NSS_Bindings.xml                                        |   22 
 en-US/Release_Notes.xml                                              |  148 -
 en-US/Revision_History.xml                                           |   14 
 en-US/Runtime.xml                                                    |   16 
 en-US/Samba_-_Windows_Compatibility.xml                              |   33 
 en-US/Samba_-_Windows_compatibility.xml                              |   25 
 en-US/Security.xml                                                   |  169 +-
 en-US/Security_SELinux.xml                                           |   35 
 en-US/Server_Tools.xml                                               |   30 
 en-US/Server_tools.xml                                               |   30 
 en-US/SystemDaemons.xml                                              |   63 
 en-US/System_Services.xml                                            |   55 
 en-US/System_services.xml                                            |   87 +
 en-US/Tools.xml                                                      |  434 +++--
 en-US/Updated_Packages_in_Fedora_10.xml                              |   24 
 en-US/Updated_packages_in_Fedora_10.xml                              |   16 
 en-US/Upfront_About_Multimedia.xml                                   |   14 
 en-US/Virtualization.xml                                             |  767 +++++-----
 en-US/WebServers.xml                                                 |   95 -
 en-US/Web_Servers.xml                                                |   49 
 en-US/Web_servers.xml                                                |   52 
 en-US/Welcome.xml                                                    |   82 -
 en-US/Welcome_to_Fedora.xml                                          |   96 -
 en-US/Welcome_to_Fedora_10.xml                                       |   26 
 en-US/What_Do_System_Administrators_Care_About.xml                   |   65 
 en-US/What_is_New_for_Installation_and_Live_Images.xml               |   29 
 en-US/What_is_the_Latest_on_the_Desktop.xml                          |   35 
 en-US/X_Window_System_-_Graphics.xml                                 |   32 
 en-US/X_Window_system_-_graphics.xml                                 |   32 
 en-US/Xorg.xml                                                       |  119 -
 en-US/x86_64_Specifics_for_Fedora.xml                                |   38 
 en-US/x86_64_specifics_for_Fedora.xml                                |   43 
 en-US/x86_Specifics_for_Fedora.xml                                   |   43 
 en-US/x86_specifics_for_Fedora.xml                                   |   56 
 114 files changed, 3405 insertions(+), 7333 deletions(-)

New commits:
commit 516bcd4db02cc4c856b0de53c6ad4522df4709a3
Merge: ff342fd... 656a5d4...
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Thu Oct 16 10:46:12 2008 -0700

    Merge branch 'master' into wip-release-notes
    
    Conflicts:
    
    	en-US/Package_Notes.xml

diff --cc en-US/KDE_3_development_platform_and_libraries.xml
index e688b06,0000000..52efe68
mode 100644,000000..100644
--- a/en-US/KDE_3_development_platform_and_libraries.xml
+++ b/en-US/KDE_3_development_platform_and_libraries.xml
@@@ -1,70 -1,0 +1,108 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
- <?
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
++
++ 
++<section lang="en" id="sn-KDE_3_development_platform_and_libraries">
++  <title>KDE 3 Development Platform and Libraries</title>
++  <para>Fedora now features KDE 4, and no longer offers KDE 3 as a full
++    desktop environment.  Fedora does provide the following KDE 3.5
++    library packages to run and build the many existing KDE 3
++    applications: 
++  </para>
++  <itemizedlist>
++    <listitem>
++      <para>
++	<package>qt3</package>, <package>qt3-devel</package> (and other
++	<package>qt3-*</package> packages): Qt 3.3.8b</para>
++    </listitem>
++    <listitem>
++      <para>
++	<package>kdelibs3</package>, <package>kdelibs3-devel</package>:
++	KDE 3 libraries</para>
++    </listitem>
++    <listitem>
++      <para>
++	<package>kdebase3</package>,
++	<package>kdebase3-pim-ioslaves</package>,
++	<package>kdebase3-devel</package>: KDE 3 core files required by
++	some applications</para>
++    </listitem>
++  </itemizedlist>
++  <para>Moreover, the KDE 4 <package>kdebase-runtime</package> package,
++    which provides <command>khelpcenter</command>, also sets up
++    <command>khelpcenter</command> as a service for KDE 3 applications,
++    so help in KDE 3 applications works.  The KDE 3 version of
++    <command>khelpcenter</command> is no longer provided, and the KDE 4
++    version is used instead.</para>
++  <para>These packages are designed to:</para>
++  <itemizedlist>
++    <listitem>
++      <para>comply with the Filesystem Hierarchy Standard (FHS),
++	and</para>
++    </listitem>
++    <listitem>
++      <para>be completely safe to install in parallel with KDE 4,
++	including the <package>-devel</package> packages.</para>
++    </listitem>
++  </itemizedlist>
++  <para>In order to achieve this goal, Fedora KDE SIG members have made
++    two changes to the KDE 4 <package>kdelibs-devel</package> packages:
++  </para>
++  <itemizedlist>
++    <listitem>
++      <para>The library symlinks are installed to
++	<filename>/usr/lib/kde4/devel</filename> or
++	<filename>/usr/lib64/kde4/devel</filename> depending on system
++	architecture.</para>
++    </listitem>
++    <listitem>
++      <para>The <command>kconfig_compiler</command> and
++	<command>makekdewidgets</command> tools have been renamed
++	<command>kconfig_compiler4</command> and
++	<command>makekdewidgets4</command>, respectively.</para>
++    </listitem>
++  </itemizedlist>
++  <para>These changes should be completely transparent to the vast
++    majority of KDE 4 applications that use <command>cmake</command> to
++    build, since <command>FindKDE4Internal.cmake</command> has
++    been patched to match these changes. The KDE SIG made these changes
++    to the KDE 4 <package>kdelibs-devel</package> rather than
++    to <package>kdelibs3-devel</package> because KDE
++    4 stores these locations in a central place, whereas KDE 3
++    applications usually contain hardcoded copies of the library search
++    paths and executable names.</para>
++  <para>Note that <package>kdebase3</package> does
++    <emphasis>not</emphasis> include the following:
++  </para><itemizedlist>
++    <listitem>
++      <para> A complete KDE 3 desktop (workspace) which could be used
++	instead of KDE 4; in particular, KDE 3 versions of KWin,
++	KDesktop, Kicker, KSplash and KControl are
++	<emphasis>not</emphasis> included.</para>
++    </listitem><listitem>
++      <para>The KDE 3 versions of <package>kdebase</package>
++	applications such as <application>Konqueror</application> and
++	<application>KWrite</application>, which are redundant with the
++	KDE 4 versions and would conflict with them.</para>
++    </listitem>
++    <listitem>
++      <para>The <systemitem class="library">libkdecorations</systemitem> library
++	required for <application>KWin</application> 3 window decorations, as those window
++	decorations cannot be used in the KDE 4 version of <application>KWin.</application></para>
++    </listitem><listitem>
++      <para> The <systemitem class="library">libkickermain</systemitem>
++	library required by some <application>Kicker</application>
++	applets, as there is no <application>Kicker</application> in
++	Fedora 10 and thus <application>Kicker</application> applets
++	cannot be used.</para>
++    </listitem>
++  </itemizedlist>
++  <note>
++    <title>Developing new software against the legacy API is
++      discouraged.</title> 
++    <para>As with any backwards-compatibility library, you would be
++      developing against a deprecated interface.</para>
++  </note>
++</section>
++
 +
-  <book>
-   <article lang="en">
-     <articleinfo>
-       <title>Docs/Beats/BackwardsCompatibility/KDE3</title>
-     </articleinfo><section id="sn-">
-       <title>Docs/Beats/BackwardsCompatibility/KDE3</title>
-       <section id="sn-">
-         <title>KDE 3 Development Platform and Libraries </title>
-         <para>Fedora now features KDE 4, and no longer offers KDE 3 as a full desktop environment.  Fedora does provide the following KDE 3.5 library packages to run and build the many existing KDE 3 applications: </para>
-         <itemizedlist>
-           <listitem>
-             <para>
-               <programlisting format="linespecific">qt3</programlisting>, <programlisting format="linespecific">qt3-devel</programlisting> (and other <programlisting format="linespecific">qt3-*</programlisting> packages): Qt 3.3.8b</para>
-           </listitem><listitem>
-             <para>
-               <programlisting format="linespecific">kdelibs3</programlisting>, <programlisting format="linespecific">kdelibs3-devel</programlisting>: KDE 3 libraries</para>
-           </listitem><listitem>
-             <para>
-               <programlisting format="linespecific">kdebase3</programlisting>, <programlisting format="linespecific">kdebase3-pim-ioslaves</programlisting>, <programlisting format="linespecific">kdebase3-devel</programlisting>: KDE 3 core files required by some applications</para>
-           </listitem>
-         </itemizedlist><para />
-         <para>Moreover, the KDE 4 <programlisting format="linespecific">kdebase-runtime</programlisting> package, which provides <programlisting format="linespecific">khelpcenter</programlisting>, also sets up <programlisting format="linespecific">khelpcenter</programlisting> as a service for KDE 3 applications, so help in KDE 3 applications works.  The KDE 3 version of <programlisting format="linespecific">khelpcenter</programlisting> is no longer provided, and the KDE 4 version is used instead.</para><para>These packages are designed to: </para>
-         <itemizedlist>
-           <listitem>
-             <para> comply with the Filesystem Hierarchy Standard (FHS), and</para>
-           </listitem><listitem>
-             <para> be completely safe to install in parallel with KDE 4, including the <programlisting format="linespecific">-devel</programlisting> packages.</para>
-           </listitem>
-         </itemizedlist><para />
-         <para>In order to achieve this goal, Fedora KDE SIG members have made two changes to the KDE 4 <programlisting format="linespecific">kdelibs-devel</programlisting> packages: </para><itemizedlist>
-           <listitem>
-             <para> The library symlinks are installed to <programlisting format="linespecific">/usr/lib/kde4/devel</programlisting> or <programlisting format="linespecific">/usr/lib64/kde4/devel</programlisting> depending on system architecture.</para>
-           </listitem><listitem>
-             <para> The <programlisting format="linespecific">kconfig_compiler</programlisting> and <programlisting format="linespecific">makekdewidgets</programlisting> tools have been renamed <programlisting format="linespecific">kconfig_compiler4</programlisting> and <programlisting format="linespecific">makekdewidgets4</programlisting>, respectively.</para>
-           </listitem>
-         </itemizedlist><para>These changes should be completely transparent to the vast majority of KDE 4 applications that use <programlisting format="linespecific">cmake</programlisting> to build, since <programlisting format="linespecific">FindKDE4Internal.cmake</programlisting> has been patched to match these changes. The KDE SIG made these changes to the KDE 4 <programlisting format="linespecific">kdelibs-devel</programlisting> rather than to <programlisting format="linespecific">kdelibs3-devel</programlisting> because KDE 4 stores these locations in a central place, whereas KDE 3 applications usually contain hardcoded copies of the library search paths and executable names.</para><para>Note that <programlisting format="linespecific">kdebase3</programlisting> does <emphasis>not</emphasis> include the following: </para><itemizedlist>
-           <listitem>
-             <para> A complete KDE 3 desktop (workspace) which could be used instead of KDE 4; in particular, KDE 3 versions of KWin, KDesktop, Kicker, KSplash and KControl are <emphasis>not</emphasis> included.</para>
-           </listitem><listitem>
-             <para> The KDE 3 versions of <programlisting format="linespecific">kdebase</programlisting> applications such as Konqueror and KWrite, which are redundant with the KDE 4 versions and would conflict with them.</para>
-           </listitem><listitem>
-             <para> The <programlisting format="linespecific">libkdecorations</programlisting> library required for KWin 3 window decorations, as those window decorations cannot be used in the KDE 4 version of KWin.</para>
-           </listitem><listitem>
-             <para> The <programlisting format="linespecific">libkickermain</programlisting> library required by some Kicker applets, as there is no Kicker in Fedora 10 and thus Kicker applets cannot be used.</para>
-           </listitem>
-         </itemizedlist><para />
-         <para>
-           <para>
-             <para>
-               <inlinemediaobject>
-                 <imageobject>
-                   <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                 </imageobject><caption>
-                   <para />
-                 </caption>
-               </inlinemediaobject>
-             </para><para>
-               <emphasis>Developing new software against the legacy API is discouraged.</emphasis>
-               <literallayout>
- </literallayout>As with any backwards-compatibility library, you would be developing against a deprecated interface.</para>
-           </para>
-         </para>
-       </section>
-     </section>
-   </article>
- </book>
diff --cc en-US/KDE_4_development_platform.xml
index 8226017,0000000..be50784
mode 100644,000000..100644
--- a/en-US/KDE_4_development_platform.xml
+++ b/en-US/KDE_4_development_platform.xml
@@@ -1,43 -1,0 +1,35 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
- <?
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 +
-  <book>
-   <article lang="en">
-     <articleinfo>
-       <title>Docs/Beats/Devel/KDE4DevelopmentPlatform</title>
-     </articleinfo><section id="sn-">
-       <title>Docs/Beats/Devel/KDE4DevelopmentPlatform</title>
-       <section id="sn-">
-         <title>KDE 4 Development Platform </title>
++<section lang="en" id="sn-KDE_4_development_platform">
++  <title>KDE 4 development platform</title>
 +        <para>Fedora 8 includes KDE 4.0 (beta) development libraries. The following new packages are provided: </para>
 +        <itemizedlist>
 +          <listitem>
 +            <para>
 +              <programlisting format="linespecific">kdelibs4</programlisting>: KDE 4 libraries</para>
 +          </listitem><listitem>
 +            <para>
 +              <programlisting format="linespecific">kdepimlibs</programlisting>: KDE 4 PIM libraries</para>
 +          </listitem><listitem>
 +            <para>
 +              <programlisting format="linespecific">kdebase4</programlisting>: KDE 4 core runtime files</para>
 +          </listitem>
 +        </itemizedlist><para>Use these packages to develop, build and run KDE 4 applications within KDE 3 or any other desktop environment.</para>
 +        <para>The <programlisting format="linespecific">kdebase4</programlisting> package also includes a beta version of the <emphasis>Dolphin</emphasis> file manager as a technology preview. As this is a beta version, some issues may still be present. If you need a stable version of <emphasis>Dolphin</emphasis>, please install the <programlisting format="linespecific">d3lphin</programlisting> package, which is based on KDE 3 and can be safely installed alongside <programlisting format="linespecific">kdebase4</programlisting>.</para><para>These packages are designed to: </para>
 +        <itemizedlist>
 +          <listitem>
 +            <para> comply with the Filesystem Hierarchy Standard (FHS), and</para>
 +          </listitem><listitem>
 +            <para> be completely safe to install in parallel with KDE 3, including the <programlisting format="linespecific">-devel</programlisting> packages.</para>
 +          </listitem>
 +        </itemizedlist><para>In order to achieve this, Fedora KDE SIG members made 2 changes to the <programlisting format="linespecific">-devel</programlisting> packages: </para><itemizedlist>
 +          <listitem>
 +            <para> The library symlinks are installed to <programlisting format="linespecific">/usr/lib/kde4/devel</programlisting> or <programlisting format="linespecific">/usr/lib64/kde4/devel</programlisting> depending on system architecture.</para>
 +          </listitem><listitem>
 +            <para> The <programlisting format="linespecific">kconfig_compiler</programlisting> and <programlisting format="linespecific">makekdewidgets</programlisting> tools have been renamed <programlisting format="linespecific">kconfig_compiler4</programlisting> and <programlisting format="linespecific">makekdewidgets4</programlisting>, respectively.</para>
 +          </listitem>
 +        </itemizedlist><para>These changes should be completely transparent to the vast majority of KDE 4 applications that use <programlisting format="linespecific">cmake</programlisting> to build, since <programlisting format="linespecific">FindKDE4Internal.cmake</programlisting> has been patched to match these changes.</para><para>Note that <programlisting format="linespecific">kdebase4</programlisting> does <emphasis>not</emphasis> include the KDE 4 Desktop package <programlisting format="linespecific">kdebase-workspace</programlisting> and its components such as <emphasis>Plasma</emphasis> and <emphasis>KWin</emphasis> version 4.  The <programlisting format="linespecific">kdebase-workspace</programlisting> package is still too incomplete and unstable for daily use and would conflict with KDE 3.</para>
 +      </section>
 +    </section>
-   </article>
- </book>
++  </section>
diff --cc en-US/Legal.xml
index ce7d91f,86222cd..4c32c0e
--- a/en-US/Legal.xml
+++ b/en-US/Legal.xml
@@@ -1,18 -1,18 +1,12 @@@
  <?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
--<?
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
  
-- <book>
--  <article lang="en">
--    <articleinfo>
--      <title>Docs/Beats/Legal</title>
-     </articleinfo><section id="sn-">
-       <title>Docs/Beats/Legal</title>
-       <section id="sn-">
 -    </articleinfo><section id="">
 -      <title>Docs/Beats/Legal</title>
 -      <section id="">
++ 
++  <section lang="en" id="sn-">
          <title>Legal</title>
          <para>The Fedora Project is sponsored by Red Hat, Inc.</para>
 -        <section id="">
 -          <title>License </title>
 +        <section id="sn-">
-           <title>License </title>
++          <title>License</title>
            <para>The Fedora License Agreement is included with each release.  A reference version is available on the Fedora Project website:</para>
            <para>
              <ulink url="http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement">http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement</ulink>
@@@ -41,5 -41,5 +35,4 @@@
          </section>
        </section>
      </section>
--  </article>
--</book>
++  </section>
diff --cc en-US/Legal_Stuff_and_Administrivia.xml
index e119274,0000000..7a26431
mode 100644,000000..100644
--- a/en-US/Legal_Stuff_and_Administrivia.xml
+++ b/en-US/Legal_Stuff_and_Administrivia.xml
@@@ -1,25 -1,0 +1,22 @@@
 +<?xml version='1.0'?>
 +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 +]>
 +
 +<chapter id="blah-Test">
 +	<title>Test</title>
- 	<para>
- 		This is a test paragraph
- 	</para>
- 	<section id="blah-Test-Section_1_Test">
- 		<title>Section 1 Test</title>
- 		<para>
- 			Test of a section &TEST_ENTITY;
- 		</para>
- 	</section>
- 	
- 	<section id="blah-Test-Section_2_Test">
- 		<title>Section 2 Test</title>
- 		<para>
- 			Test of a section
- 		</para>
- 	</section>
++	<para/>
++
++<!-- Fedora_overview.xml  -->
++
++  <xi:include href="Fedora_overview.xml"
++    xmlns:xi="http://www.w3.org/2001/XInclude" />
++
++<!-- Colophon.xml  -->
++
++  <xi:include href="Colophon.xml"
++    xmlns:xi="http://www.w3.org/2001/XInclude" />
++
++<!-- legalnotice pulled in automatically  -->
 +
 +</chapter>
 +
diff --cc en-US/Linux_kernel.xml
index 9b061b6,0000000..dd6c77c
mode 100644,000000..100644
--- a/en-US/Linux_kernel.xml
+++ b/en-US/Linux_kernel.xml
@@@ -1,145 -1,0 +1,143 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
++
++ 
++<section lang="en" id="sn-Linux_kernel">
++  <title>Linux_kernel</title>
++    <tip>
++      <title>Deprecated or out of date content?</title>
++      <para>
++	This content may be deprecated or out of date, it has not been
++	updated since the Fedora 9 release notes.</para>
++    </tip>
++  <para>This section covers changes and important information regarding
++    the 2.6.27 based kernel in Fedora 10.  The 2.6.27 kernel
++    includes:</para>
++  <itemizedlist>
++    <listitem>
++      <para>The Fedora kernel offers <option>paravirt_ops</option>
++	support in <option>domU</option>, as part of the kernel team's
++	efforts to reduce the work required to produce current Xen
++	kernels.</para>
++    </listitem>
++    <listitem>
++      <para>Xen fully virtualized guests can directly boot a kernel and
++	<command>initrd</command>
++	image and pass kernel boot args.  For more details refer to
++	<ulink
++	  url="http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot"/>
++      </para>
++    </listitem>
++  </itemizedlist>
++  <section id="sn-Version">
++    <title>Version</title>
++    <para>Fedora may include additional patches to the kernel for
++      improvements, bug fixes, or additional features. For this reason,
++      the Fedora kernel may not be line-for-line equivalent to the
++      so-called <firstterm>vanilla kernel</firstterm> from the kernel.org
++      web site:</para>
++    <para>
++      <ulink url="http://www.kernel.org/"/>
++    </para>
++    <para>To obtain a list of these patches, download the source
++      RPM package and run the following command against it:</para>
++    <screen>
++      <userinput>rpm -qpl kernel-&lt;version&gt;.src.rpm</userinput>
++    </screen>
++  </section>
++  <section id="sn-Changelog">
++    <title>Changelog</title>
++    <para>To retrieve a log of changes to the package, run the following
++      command:</para>
++    <screen>
++      <userinput>rpm -q --changelog kernel-&lt;version&gt;</userinput>
++    </screen>
++    <para>If you need a user friendly version of the changelog, refer to
++      <ulink url="http://wiki.kernelnewbies.org/LinuxChanges"/>. A short
++      and full diff of the kernel is available from <ulink
++	url="http://kernel.org/git"/>.  The Fedora version kernel is
++      based on the Linus tree.</para>
++    <para>Customizations made for the Fedora version are available from
++      <ulink url="http://cvs.fedoraproject.org"/>.
++    </para>
++  </section><section id="sn-Kernel_flavors">
++    <title>Kernel flavors</title>
++    <para>Fedora 10 includes the following kernel builds:</para>
++    <itemizedlist>
++      <listitem>
++	<para>Native kernel, for use in most systems.  Configured
++	  sources are available in the <package>kernel-devel</package>
++	  package.</para>
++      </listitem>
++      <listitem>
++	<para>The kernel-PAE, for use in 32-bit x86 systems with more
++	  than 4GB of RAM, or with CPUs that have a NX (No eXecute)
++	  feature.  This kernel support both uniprocessor and
++	  multi-processor systems.  Configured sources are available in
++	  the <package>kernel-PAE-devel</package> package.</para>
++      </listitem>
++      <listitem>
++	<para>Virtualization kernel for use with the Xen emulator
++	  package. Configured sources are available in the
++	  <package>kernel-xen-devel</package> package.</para>
++      </listitem>
++    </itemizedlist>
++    <para>You may install kernel headers for all four
++      kernel flavors at the same time. The files are installed in the
++      <filename>/usr/src/kernels/&lt;version&gt;[-PAE|-xen|-kdump]-&lt;arch&gt;/</filename> 
++      tree. Use the following
++      command:</para>
++    <screen>
++      <userinput>su -c 'yum install kernel{,-PAE,-xen,-kdump}-devel'</userinput>
++    </screen>
++    <para>Select one or more of these flavors, separated by commas and
++      no spaces, as appropriate.  Enter the root password when
++      prompted.</para>
++    <note>
++      <title>x86 Kernel Includes Kdump</title> 
++      <para>
++	Both the x86_64 and the i686 kernels are relocatable, so they no
++	longer require a separate kernel for kdump capability. PPC64
++	still requires a separate kdump kernel.</para>
++    </note>
++    <note>
++      <title>Default Kernel Provides SMP</title> 
++      <para>
++      There is no separate SMP kernel available for
++      Fedora on i386, x86_64, and ppc64.  Multiprocessor support is
++      provided by the native kernel.</para>
++    </note>
++    <note>
++      <title>PowerPC Kernel Support</title> 
++      <para>
++	There is no support for Xen or kdump for the PowerPC
++	architecture in Fedora. 32-bit PowerPC does still have a
++	separate SMP kernel.</para>
++    </note>
++  </section>
++  <section id="sn-Preparing_for_kernel_development">
++    <title>Preparing for kernel development</title>
++    <para>Fedora 10 does not include the kernel-source package provided
++      by older versions since only the kernel-devel package is required
++      now to build external modules. Configured sources are available,
++      as described <xref linkend="sn-Kernel_flavors"/>.</para>
++    <important>
++      <title>Custom Kernel Building</title> 
++      <para>
++	For information on kernel development and working with custom
++	kernels, refer to <ulink
++	  url="http://fedoraproject.org/wiki/Building_a_custom_kernel"/>
++      </para>
++    </important>
++  </section>
++  <section id="sn-Reporting_bugs">
++    <title>Reporting bugs</title>
++    <para>Refer to <ulink
++	url="http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html"/> 
++      for information on reporting bugs in the Linux kernel.  You may
++      also use <ulink url="http://bugzilla.redhat.com"/> for reporting
++      bugs that are specific to Fedora.</para>
++  </section>
++</section>
++
 +
-  <book>
-   <article lang="en">
-     <articleinfo>
-       <title>Docs/Beats/Kernel</title>
-     </articleinfo><section id="sn-">
-       <title>Docs/Beats/Kernel</title>
-       <section id="sn-">
-         <title>Linux Kernel </title>
-         <para>
-           <para>
-             <para>
-               <inlinemediaobject>
-                 <imageobject>
-                   <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                 </imageobject><caption>
-                   <para />
-                 </caption>
-               </inlinemediaobject>
-             </para><para>
-               <emphasis>Deprecated or out of date content?</emphasis>
-               <literallayout>
- </literallayout>This content may be deprecated or out of date, it has not been updated since the Fedora 9 release notes.</para>
-           </para>
-         </para><para>This section covers changes and important information regarding the 2.6.27 based kernel in Fedora 10.  The 2.6.27 kernel includes:</para>
-         <itemizedlist>
-           <listitem>
-             <para> The Fedora kernel offers <programlisting format="linespecific">paravirt_ops</programlisting> support in <programlisting format="linespecific">domU</programlisting>, as part of the kernel team's efforts to reduce the work required to produce current Xen kernels.</para>
-           </listitem>
-         </itemizedlist><itemizedlist>
-           <listitem>
-             <para> Xen fully virtualized guests can directly boot a kernel and <programlisting format="linespecific">initrd</programlisting> image and pass kernel boot args.  For more details refer to <ulink url="http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot.">http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot.</ulink>
-             </para>
-           </listitem>
-         </itemizedlist><section id="sn-">
-           <title>Version </title>
-           <para>Fedora may include additional patches to the kernel for improvements, bug fixes, or additional features. For this reason, the Fedora kernel may not be line-for-line equivalent to the so-called <emphasis>vanilla kernel</emphasis> from the kernel.org web site:</para><para>
-             <ulink url="http://www.kernel.org/">http://www.kernel.org/</ulink>
-           </para><para>To obtain a list of these patches, download the source RPM package and run the following command against it:</para>
-           <para />
-           <programlisting>rpm -qpl kernel-&lt;version&gt;.src.rpm</programlisting>
-           <para />
-         </section><section id="sn-">
-           <title>Changelog </title>
-           <para>To retrieve a log of changes to the package, run the following command:</para>
-           <para />
-           <programlisting>rpm -q --changelog kernel-&lt;version&gt;</programlisting>
-           <para />
-           <para>If you need a user friendly version of the changelog, refer to <ulink url="http://wiki.kernelnewbies.org/LinuxChanges.">http://wiki.kernelnewbies.org/LinuxChanges.</ulink> A short and full diff of the kernel is available from <ulink url="http://kernel.org/git.">http://kernel.org/git.</ulink> The Fedora version kernel is based on the Linus tree.</para><para>Customizations made for the Fedora version are available from <ulink url="http://cvs.fedoraproject.org.">http://cvs.fedoraproject.org.</ulink>
-           </para>
-         </section><section id="sn-">
-           <title>Kernel Flavors </title>
-           <para>Fedora 10 includes the following kernel builds: </para>
-           <itemizedlist>
-             <listitem>
-               <para> Native kernel, for use in most systems.  Configured sources are available in the <programlisting format="linespecific">kernel-devel</programlisting> package.</para>
-             </listitem>
-           </itemizedlist><itemizedlist>
-             <listitem>
-               <para> The kernel-PAE, for use in 32-bit x86 systems with more than 4GB of RAM, or with CPUs that have a NX (No eXecute) feature.  This kernel support both uniprocessor and multi-processor systems.  Configured sources are available in the <programlisting format="linespecific">kernel-PAE-devel</programlisting> package.</para>
-             </listitem>
-           </itemizedlist><itemizedlist>
-             <listitem>
-               <para> Virtualization kernel for use with the Xen emulator package. Configured sources are available in the <programlisting format="linespecific">kernel-xen-devel</programlisting> package.</para>
-             </listitem>
-           </itemizedlist><para>You may install kernel headers for all four kernel flavors at the same time. The files are installed in the <programlisting format="linespecific">/usr/src/kernels/&lt;version&gt;[-PAE|-xen|-kdump] -&lt;arch&gt;/</programlisting> tree. Use the following command:</para><para />
-           <programlisting>su -c 'yum install kernel{,-PAE,-xen,-kdump}-devel'</programlisting>
-           <para />
-           <para>Select one or more of these flavors, separated by commas and no spaces, as appropriate.  Enter the root password when prompted.</para>
-           <para>
-             <para>
-               <para>
-                 <inlinemediaobject>
-                   <imageobject>
-                     <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                   </imageobject><caption>
-                     <para />
-                   </caption>
-                 </inlinemediaobject>
-               </para><para>
-                 <emphasis>x86 Kernel Includes Kdump</emphasis>
-                 <literallayout>
- </literallayout>Both the x86_64 and the i686 kernels are relocatable, so they no longer require a separate kernel for kdump capability. PPC64 still requires a separate kdump kernel.</para>
-             </para>
-           </para><para>
-             <para>
-               <para>
-                 <inlinemediaobject>
-                   <imageobject>
-                     <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                   </imageobject><caption>
-                     <para />
-                   </caption>
-                 </inlinemediaobject>
-               </para><para>
-                 <emphasis>Default Kernel Provides SMP</emphasis>
-                 <literallayout>
- </literallayout>There is no separate SMP kernel available for Fedora on i386, x86_64, and ppc64.  Multiprocessor support is provided by the native kernel.</para>
-             </para>
-           </para><para>
-             <para>
-               <para>
-                 <inlinemediaobject>
-                   <imageobject>
-                     <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                   </imageobject><caption>
-                     <para />
-                   </caption>
-                 </inlinemediaobject>
-               </para><para>
-                 <emphasis>PowerPC Kernel Support</emphasis>
-                 <literallayout>
- </literallayout>There is no support for Xen or kdump for the PowerPC architecture in Fedora. 32-bit PowerPC does still have a separate SMP kernel.</para>
-             </para>
-           </para>
-         </section><section id="sn-">
-           <title>Preparing for Kernel Development </title>
-           <para>Fedora 10 does not include the kernel-source package provided by older versions since only the kernel-devel package is required now to build external modules. Configured sources are available, as described [#Kernel_Flavors above]. </para>
-           <para>
-             <para>
-               <para>
-                 <inlinemediaobject>
-                   <imageobject>
-                     <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/f/ff/Important.png" scalefit="1" width="35px" />
-                   </imageobject><caption>
-                     <para />
-                   </caption>
-                 </inlinemediaobject>
-               </para><para>
-                 <emphasis>Custom Kernel Building</emphasis>
-                 <literallayout>
- </literallayout>For information on kernel development and working with custom kernels, refer to <ulink url="http://fedoraproject.org/wiki/Building_a_custom_kernel.">http://fedoraproject.org/wiki/Building_a_custom_kernel.</ulink>
-               </para>
-             </para>
-           </para>
-         </section><section id="sn-">
-           <title>Reporting Bugs </title>
-           <para>Refer to <ulink url="http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html">http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html</ulink> for information on reporting bugs in the Linux kernel.  You may also use <ulink url="http://bugzilla.redhat.com">http://bugzilla.redhat.com</ulink> for reporting bugs that are specific to Fedora.</para>
-         </section>
-       </section>
-     </section>
-   </article>
- </book>
diff --cc en-US/Mail_servers.xml
index 634d38e,0000000..b27ab4c
mode 100644,000000..100644
--- a/en-US/Mail_servers.xml
+++ b/en-US/Mail_servers.xml
@@@ -1,32 -1,0 +1,36 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
- <?
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
++
++ 
++<section lang="en" id="sn-Mail_servers">
++  <title>Mail servers</title>
++  <para>This section concerns electronic mail servers or mail transfer
++    agents (MTAs).</para>
++  <section id="sn-Sendmail">
++    <title>Sendmail</title>
++    <para>By default, the Sendmail mail transport agent (MTA) does not
++      accept network connections from any host other than the local
++      computer.  To configure Sendmail as a server for other
++      clients:</para>
++    <orderedlist numeration="arabic">
++      <listitem>
++	<para>Edit <filename>/etc/mail/sendmail.mc</filename> and either
++	  change the <computeroutput>DAEMON_OPTIONS</computeroutput>
++	  line to also listen on network devices, or comment out this
++	  option entirely using the <computeroutput>dnl</computeroutput>
++	  comment delimiter.</para>
++      </listitem>
++      <listitem>
++	<para>Install the <package>sendmail-cf</package> package:
++	  <command>su -c 'yum install sendmail-cf'</command>
++	</para>
++      </listitem>
++      <listitem>
++	<para>Regenerate <filename>/etc/mail/sendmail.cf</filename>: 
++	  <command>su -c 'make -C /etc/mail'</command>
++	</para>
++      </listitem>
++    </orderedlist>
++  </section>
++</section>
 +
-  <book>
-   <article lang="en">
-     <articleinfo>
-       <title>Docs/Beats/MailServers</title>
-     </articleinfo><section id="sn-">
-       <title>Docs/Beats/MailServers</title>
-       <section id="sn-">
-         <title>Mail Servers </title>
-         <para>This section concerns electronic mail servers or mail transfer agents (MTAs).</para>
-         <section id="sn-">
-           <title>Sendmail </title>
-           <para>By default, the Sendmail mail transport agent (MTA) does not accept network connections from any host other than the local computer.  To configure Sendmail as a server for other clients:</para>
-           <orderedlist numeration="arabic">
-             <listitem>
-               <para> Edit <programlisting format="linespecific">/etc/mail/sendmail.mc</programlisting> and either change the <programlisting format="linespecific">DAEMON_OPTIONS</programlisting> line to also listen on network devices, or comment out this option entirely using the <programlisting format="linespecific">dnl</programlisting> comment delimiter.</para>
-             </listitem><listitem>
-               <para> Install the <programlisting format="linespecific">sendmail-cf</programlisting> package:  <programlisting>su -c 'yum install sendmail-cf'</programlisting>
-               </para>
-             </listitem><listitem>
-               <para> Regenerate <programlisting format="linespecific">/etc/mail/sendmail.cf</programlisting>:  <programlisting>su -c 'make -C /etc/mail'</programlisting>
-               </para>
-             </listitem>
-           </orderedlist>
-         </section>
-       </section>
-     </section>
-   </article>
- </book>
diff --cc en-US/Multimedia.xml
index 7225cfc,458c075..0de720d
--- a/en-US/Multimedia.xml
+++ b/en-US/Multimedia.xml
@@@ -1,107 -1,107 +1,191 @@@
  <?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
--<?
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
++
++ 
++<section id="sn-Multimedia" lang="en">
++  <title>Multimedia</title>
++  <para>Fedora includes applications for assorted multimedia functions,
++    including playback, recording, and editing.  Additional packages are
++    available through the Fedora Package Collection software repository.
++    For additional information about multimedia in Fedora, refer to the
++    Multimedia section of the Fedora Project website at <ulink
++      url="http://fedoraproject.org/wiki/Multimedia"/>.
++  </para>
++  <section id="sn-Multimedia_players">
++    <title>Multimedia players</title>
++    <para>The default installation of Fedora includes
++      <application>Rhythmbox</application> and <application>Totem</application> for
++      media playback.  Many other programs are available in the Fedora
++      repositories, including the popular <application>XMMS</application>
++      player and KDE's <application>Amarok</application>.  Both GNOME and KDE
++      have a selection of players that can be used with a variety of
++      formats.  Additional programs are available from third parties to
++      handle other formats.</para>
++    <para>
++      <application>Totem</application>, the default movie player for
++      GNOME, now has the ability to switch playback back-ends without
++      recompilation or switching packages. To install the Xine back-end,
++      use <guimenuitem>Add/Remove Software</guimenuitem> to install
++      <package>totem-xine</package> or run the following command:</para>
++    <screen>
++      <userinput>su -c 'yum install totem-xine'</userinput>
++    </screen>
++    <para>To run <application>Totem</application> with the Xine back-end
++      once:</para><para />
++    <screen>
++      <userinput>su -c 'totem-backend -b xine totem'</userinput>
++    </screen>
++    <para>To change the default back-end to xine for the entire
++      system:</para>
++    <screen>
++      <userinput>su -c 'totem-backend -b xine'</userinput>
++    </screen>
++    <para>While using the Xine back-end, it is possible to temporarily
++      use the GStreamer back-end. To use the GStreamer back-end, run the
++      following command:</para>
++    <para />
++    <programlisting>
++      su -c 'totem-backend -b gstreamer'
++    </programlisting>
++    <para />
++  </section><section id="sn-Ogg_and_Xiph.Org_foundation_formats">
++    <title>Ogg and Xiph.Org foundation formats</title>
++    <para>Fedora includes complete support for the Ogg media container
++      format and the Vorbis audio, Theora video, Speex audio, and FLAC
++      lossless audio formats.  These freely-distributable formats are
++      not encumbered by patent or license restrictions.  They provide
++      powerful and flexible alternatives to more popular, restricted
++      formats.  The Fedora Project encourages the use of open source
++      formats in place of restricted ones.  For more information on
++      these formats and how to use them, refer to:</para>
++    <itemizedlist>
++      <listitem>
++	<para>Xiph.Org Foundation at <ulink
++	    url="http://www.xiph.org/"/>
++	</para>
++      </listitem><listitem>
++	<para>
++	  <ulink
++	    url="http://fedoraproject.org/wiki/Multimedia/Xiph"/>
++	</para>
++      </listitem>
++    </itemizedlist>
++  </section><section id="sn-MP3,_DVD,_and_other_excluded_multimedia">
++    <title>MP3, DVD, and other excluded multimedia</title>
++    <para>Fedora cannot include support for MP3 or DVD video playback or
++      recording.  The MP3 formats are patented, and the patent holders
++      have not provided the necessary licenses.  DVD video formats are
++      patented and equipped with an encryption scheme.  The patent
++      holders have not provided the necessary licenses, and the code
++      needed to decrypt CSS-encrypted discs may violate the Digital
++      Millennium Copyright Act, a copyright law of the United States.
++      Fedora also excludes other multimedia software due to patent,
++      copyright, or license restrictions, including Adobe's Flash Player
++      and Real Media's Real Player.  For more on this subject, please
++      refer to <ulink
++	url="http://fedoraproject.org/wiki/ForbiddenItems"/>.
++    </para>
++    <para>While other MP3 options may be available for Fedora,
++      Fluendo now offers an MP3 plugin for GStreamer that has the
++      related patents licensed for end users.  This plugin enables MP3
++      support in applications that use the GStreamer framework as a
++      backend.  We cannot distribute this plugin in Fedora for licensing
++      reasons, but it offers a new solution for an old problem.  For
++      more information refer to these pages:</para>
++    <itemizedlist>
++      <listitem>
++	<para>
++	  <ulink
++	    url="http://fedoraproject.org/wiki/Multimedia/fluendo-mp3"/>
++	</para>
++      </listitem><listitem>
++	<para>
++	  <ulink
++	    url="http://fedoraproject.org/wiki/Multimedia/MP3"/>
++	</para>
++      </listitem><listitem>
++	<para>
++	  <ulink
++	    url="http://fedoraproject.org/wiki/Multimedia/DVD"/>
++	</para>
++      </listitem><listitem>
++	<para>
++	  <ulink
++	    url="http://fedoraproject.org/wiki/Multimedia/Flash"/>
++	</para>
++      </listitem>
++    </itemizedlist>
++  </section><section id="sn-CD_and_DVD_authoring_and_burning">
++    <title>CD and DVD authoring and burning</title>
++    <para>Default installations of Fedora and the Desktop Live spin
++      include a built-in feature for CD and DVD burning. Fedora includes
++      a variety of other tools for easily creating and burning CDs and
++      DVDs. Fedora includes graphical programs such as
++    <application>Brasero</application>, <application>GnomeBaker</application>, and
++      <application>K3b</application>.
++      Console programs including <command>wodim</command>, <application>readom</application>, and
++      <application>genisoimage</application>.  Graphical
++      programs are found under <guimenu>Applications</guimenu><guisubmenu>Sound &amp;
++	Video</guisubmenu>.</para>
++  </section>
++  <section id="sn-Screencasts">
++    <title>Screencasts</title>
++    <para>You can use Fedora to create and play back
++      <firstterm>screencasts</firstterm>, which are recorded desktop
++      sessions, using open technologies.  Fedora includes
++      <command>istanbul</command>, which creates screencasts using the
++      Theora video format, and <command>byzanz</command>, which creates
++      screencasts as animated GIF files.  You can play back these videos
++      using one of several players included in Fedora.  This is the
++      preferred way to submit screencasts to the Fedora Project for
++      either contributors or end-users.  For more comprehensive
++      instructions, refer to the screencasting
++      page:</para>
++    <para>
++      <ulink
++	url="http://fedoraproject.org/wiki/ScreenCasting"/>
++    </para>
++  </section>
++  <section id="sn-Extended_support_through_plugins">
++    <title>Extended support through plugins</title>
++    <para>Most of the media players in Fedora support the use of plugins
++      to add support for additional media formats and sound output
++      systems.  Some use powerful backends such as the
++      <package>gstreamer</package> package to handle media format
++      support and sound output.  Fedora offers plugin packages for these
++      backends and for individual applications, and third parties may
++      offer additional plugins to add even greater capabilities.</para>
++  </section>
++  <section id="sn-Infrared_remote_support">
++    <title>Infrared remote support</title>
++    <para>A new graphical frontend to LIRC is provided by
++      <command>gnome-lirc-properties</command>, making it easy to
++      connect and configure infrared remote controls. LIRC is routinely
++      used in multimedia applications to implement support for infrared
++      remote controls, and using it in
++      <application>Rhythmbox</application> and
++      <application>Totem</application> should be as easy as plugging the
++      remote receiver into your computer, then selecting
++      <guimenuitem>Auto-detect</guimenuitem> in the <guimenu>Infrared
++	Remote Control</guimenu> preferences.</para>
++    <para>If you had a previous setup with LIRC, it is recommended you
++      regenerate the configuration files with
++      <command>gnome-lirc-properties</command>. This is required so that
++      a majority of applications work with your new setup.</para>
++    <para>Refer to the feature page for more information:</para>
++    <para><ulink
++	url="https://fedoraproject.org/wiki/Features/BetterLIRCSupport"/></para>
++  </section>
++  <section id="sn-Glitch-free_PulseAudio">
++    <title>Glitch-free PulseAudio</title>
++    <para>The PulseAudio sound server has been rewritten to use
++      timer-based audio scheduling instead of the traditional
++      interrupt-driven approach. This is the approach that is taken by
++      other systems such as Apple's CoreAudio and the Windows Vista
++      audio subsystem.  The timer-based audio scheduling has a number of
++      advantages, including reduced power consumption, minimization of
++      drop-outs, and flexible adjustment of the latency for the needs of
++      the application.</para>
++  </section>
++</section>
  
-- <book>
--  <article lang="en">
--    <articleinfo>
--      <title>Docs/Beats/Multimedia</title>
-     </articleinfo><section id="sn-">
-       <title>Docs/Beats/Multimedia</title>
-       <section id="sn-">
-         <title>Multimedia </title>
-         <para>Fedora includes applications for assorted multimedia functions, including playback, recording, and editing.  Additional packages are available through the Fedora Package Collection software repository.  For additional information about multimedia in Fedora, refer to the Multimedia section of the Fedora Project website at <ulink url="http://fedoraproject.org/wiki/Multimedia.">http://fedoraproject.org/wiki/Multimedia.</ulink>
-         </para><section id="sn-">
-           <title>Multimedia players </title>
-           <para>The default installation of Fedora includes <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> for media playback.  Many other programs are available in the Fedora repositories, including the popular <emphasis>XMMS</emphasis> player and KDE's <emphasis>Amarok</emphasis>.  Both GNOME and KDE have a selection of players that can be used with a variety of formats.  Additional programs are available from third parties to handle other formats.</para><para>
-             <emphasis>Totem</emphasis>, the default movie player for GNOME, now has the ability to switch playback back-ends without recompilation or switching packages. To install the xine back-end, use <emphasis>Add/Remove Software</emphasis> to install <programlisting format="linespecific">totem-xine</programlisting> or run the following command:</para><para />
-           <programlisting>
- su -c 'yum install totem-xine'
- </programlisting>
-           <para />
-           <para>To run <emphasis>Totem</emphasis> with the xine back-end once:</para><para />
-           <programlisting>
- su -c 'totem-backend -b xine totem'
- </programlisting>
-           <para />
-           <para>To change the default back-end to xine for the entire system:</para>
-           <para />
-           <programlisting>
- su -c 'totem-backend -b xine'
- </programlisting>
-           <para />
-           <para>While using the Xine back-end, it is possible to temporarily use the GStreamer back-end. To use the GStreamer back-end, run the following command:</para>
-           <para />
-           <programlisting>
- su -c 'totem-backend -b gstreamer'
- </programlisting>
-           <para />
-         </section><section id="sn-">
-           <title>Ogg and Xiph.Org foundation formats </title>
-           <para>Fedora includes complete support for the Ogg media container format and the Vorbis audio, Theora video, Speex audio, and FLAC lossless audio formats.  These freely-distributable formats are not encumbered by patent or license restrictions.  They provide powerful and flexible alternatives to more popular, restricted formats.  The Fedora Project encourages the use of open source formats in place of restricted ones.  For more information on these formats and how to use them, refer to:</para>
-           <itemizedlist>
-             <listitem>
-               <para>  Xiph.Org Foundation at <ulink url="http://www.xiph.org/">http://www.xiph.org/</ulink>
-               </para>
-             </listitem><listitem>
-               <para>
-                 <ulink url="http://fedoraproject.org/wiki/Multimedia/Xiph">http://fedoraproject.org/wiki/Multimedia/Xiph</ulink>
-               </para>
-             </listitem>
-           </itemizedlist>
-         </section><section id="sn-">
-           <title>MP3, DVD, and other excluded multimedia </title>
-           <para>Fedora cannot include support for MP3 or DVD video playback or recording.  The MP3 formats are patented, and the patent holders have not provided the necessary licenses.  DVD video formats are patented and equipped with an encryption scheme.  The patent holders have not provided the necessary licenses, and the code needed to decrypt CSS-encrypted discs may violate the Digital Millennium Copyright Act, a copyright law of the United States. Fedora also excludes other multimedia software due to patent, copyright, or license restrictions, including Adobe's Flash Player and Real Media's Real Player.  For more on this subject, please refer to <ulink url="http://fedoraproject.org/wiki/ForbiddenItems.">http://fedoraproject.org/wiki/ForbiddenItems.</ulink>
-           </para><para>While other MP3 options may be available for Fedora, Fluendo now offers an MP3 plugin for GStreamer that has the related patents licensed for end users.  This plugin enables MP3 support in applications that use the GStreamer framework as a backend.  We cannot distribute this plugin in Fedora for licensing reasons, but it offers a new solution for an old problem.  For more information refer to these pages:</para>
-           <itemizedlist>
-             <listitem>
-               <para>
-                 <ulink url="http://fedoraproject.org/wiki/Multimedia/fluendo-mp3">http://fedoraproject.org/wiki/Multimedia/fluendo-mp3</ulink>
-               </para>
-             </listitem><listitem>
-               <para>
-                 <ulink url="http://fedoraproject.org/wiki/Multimedia/MP3">http://fedoraproject.org/wiki/Multimedia/MP3</ulink>
-               </para>
-             </listitem><listitem>
-               <para>
-                 <ulink url="http://fedoraproject.org/wiki/Multimedia/DVD">http://fedoraproject.org/wiki/Multimedia/DVD</ulink>
-               </para>
-             </listitem><listitem>
-               <para>
-                 <ulink url="http://fedoraproject.org/wiki/Multimedia/Flash">http://fedoraproject.org/wiki/Multimedia/Flash</ulink>
-               </para>
-             </listitem>
-           </itemizedlist>
-         </section><section id="sn-">
-           <title>CD and DVD authoring and burning </title>
-           <para>Default installations of Fedora and the Desktop Live spin include a built-in feature for CD and DVD burning. Fedora includes a variety of other tools for easily creating and burning CDs and DVDs. Fedora includes graphical programs such as <programlisting format="linespecific">brasero</programlisting>, <programlisting format="linespecific">gnomebaker</programlisting>, and <programlisting format="linespecific">k3b</programlisting>. Console programs including <programlisting format="linespecific">wodim</programlisting>, <programlisting format="linespecific">readom</programlisting>, and <programlisting format="linespecific">genisoimage</programlisting>.  Graphical programs are found under <emphasis>Applications &gt; Sound &amp; Video</emphasis>.</para>
-         </section><section id="sn-">
-           <title>Screencasts </title>
-           <para>You can use Fedora to create and play back <emphasis>screencasts</emphasis>, which are recorded desktop sessions, using open technologies.  Fedora includes <programlisting format="linespecific">istanbul</programlisting>, which creates screencasts using the Theora video format, and 'byzanz', which creates screencasts as animated GIF files.  You can play back these videos using one of several players included in Fedora.  This is the preferred way to submit screencasts to the Fedora Project for either developers or end-users.  For more comprehensive instructions, refer to the screencasting page:</para><itemizedlist>
-             <listitem>
-               <para>
-                 <ulink url="http://fedoraproject.org/wiki/ScreenCasting">http://fedoraproject.org/wiki/ScreenCasting</ulink>
-               </para>
-             </listitem>
-           </itemizedlist>
-         </section><section id="sn-">
-           <title>Extended support through plugins </title>
-           <para>Most of the media players in Fedora support the use of plugins to add support for additional media formats and sound output systems.  Some use powerful backends such as the <programlisting format="linespecific">gstreamer</programlisting> package to handle media format support and sound output.  Fedora offers plugin packages for these backends and for individual applications, and third parties may offer additional plugins to add even greater capabilities.</para>
-         </section><section id="sn-">
-           <title>Infrared remote support </title>
-           <para>A new graphical frontend to LIRC is provided by <programlisting format="linespecific">gnome-lirc-properties</programlisting>, making it easy to connect and configure infrared remote controls. LIRC is routinely used in multimedia applications to implement support for infrared remote controls, and using it in <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> should be as easy as plugging the remote receiver into your computer, then selecting <emphasis>[Auto-detect]</emphasis> in the <emphasis>Infrared Remote Control</emphasis> preferences.</para><para>If you had a previous setup with LIRC, it is recommended you regenerate the configuration files with <programlisting format="linespecific">gnome-lirc-properties</programlisting>. This is required so that a majority of applications work with your new setup.</para><para>Refer to the feature page for more information:</para>
-           <itemizedlist>
-             <listitem>
-               <para>
-                 <ulink url="https://fedoraproject.org/wiki/Features/BetterLIRCSupport">https://fedoraproject.org/wiki/Features/BetterLIRCSupport</ulink>
-               </para>
-             </listitem>
-           </itemizedlist>
-         </section><section id="sn-">
-           <title>Glitch-free PulseAudio </title>
-           <para>The PulseAudio sound server has been rewritten to use timer-based audio scheduling instead of the traditional interrupt-driven approach. This is the approach that is taken by other systems such as Apple's CoreAudio and the Windows Vista audio subsystem.  The timer-based audio scheduling has a number of advantages, including reduced power consumption, minimization of drop-outs, and flexible adjustment of the latency for the needs of the application.</para>
-         </section>
-       </section>
-     </section>
-   </article>
- </book>
 -    </articleinfo><section id="">
 -      <title>Docs/Beats/Multimedia</title>
 -      <section id="">
 -        <title>Multimedia </title>
 -        <para>Fedora includes applications for assorted multimedia functions, including playback, recording, and editing.  Additional packages are available through the Fedora Package Collection software repository.  For additional information about multimedia in Fedora, refer to the Multimedia section of the Fedora Project website at <ulink url="http://fedoraproject.org/wiki/Multimedia.">http://fedoraproject.org/wiki/Multimedia.</ulink>
 -        </para><section id="">
 -          <title>Multimedia players </title>
 -          <para>The default installation of Fedora includes <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> for media playback.  Many other programs are available in the Fedora repositories, including the popular <emphasis>XMMS</emphasis> player and KDE's <emphasis>Amarok</emphasis>.  Both GNOME and KDE have a selection of players that can be used with a variety of formats.  Additional programs are available from third parties to handle other formats.</para><para>
 -            <emphasis>Totem</emphasis>, the default movie player for GNOME, now has the ability to switch playback back-ends without recompilation or switching packages. To install the xine back-end, use <emphasis>Add/Remove Software</emphasis> to install <programlisting format="linespecific">totem-xine</programlisting> or run the following command:</para><para />
 -          <programlisting>
 -su -c 'yum install totem-xine'
 -</programlisting>
 -          <para />
 -          <para>To run <emphasis>Totem</emphasis> with the xine back-end once:</para><para />
 -          <programlisting>
 -su -c 'totem-backend -b xine totem'
 -</programlisting>
 -          <para />
 -          <para>To change the default back-end to xine for the entire system:</para>
 -          <para />
 -          <programlisting>
 -su -c 'totem-backend -b xine'
 -</programlisting>
 -          <para />
 -          <para>While using the Xine back-end, it is possible to temporarily use the GStreamer back-end. To use the GStreamer back-end, run the following command:</para>
 -          <para />
 -          <programlisting>
 -su -c 'totem-backend -b gstreamer'
 -</programlisting>
 -          <para />
 -        </section><section id="">
 -          <title>Ogg and Xiph.Org foundation formats </title>
 -          <para>Fedora includes complete support for the Ogg media container format and the Vorbis audio, Theora video, Speex audio, and FLAC lossless audio formats.  These freely-distributable formats are not encumbered by patent or license restrictions.  They provide powerful and flexible alternatives to more popular, restricted formats.  The Fedora Project encourages the use of open source formats in place of restricted ones.  For more information on these formats and how to use them, refer to:</para>
 -          <itemizedlist>
 -            <listitem>
 -              <para>  Xiph.Org Foundation at <ulink url="http://www.xiph.org/">http://www.xiph.org/</ulink>
 -              </para>
 -            </listitem><listitem>
 -              <para>
 -                <ulink url="http://fedoraproject.org/wiki/Multimedia/Xiph">http://fedoraproject.org/wiki/Multimedia/Xiph</ulink>
 -              </para>
 -            </listitem>
 -          </itemizedlist>
 -        </section><section id="">
 -          <title>MP3, DVD, and other excluded multimedia </title>
 -          <para>Fedora cannot include support for MP3 or DVD video playback or recording.  The MP3 formats are patented, and the patent holders have not provided the necessary licenses.  DVD video formats are patented and equipped with an encryption scheme.  The patent holders have not provided the necessary licenses, and the code needed to decrypt CSS-encrypted discs may violate the Digital Millennium Copyright Act, a copyright law of the United States. Fedora also excludes other multimedia software due to patent, copyright, or license restrictions, including Adobe's Flash Player and Real Media's Real Player.  For more on this subject, please refer to <ulink url="http://fedoraproject.org/wiki/ForbiddenItems.">http://fedoraproject.org/wiki/ForbiddenItems.</ulink>
 -          </para><para>While other MP3 options may be available for Fedora, Fluendo now offers an MP3 plugin for GStreamer that has the related patents licensed for end users.  This plugin enables MP3 support in applications that use the GStreamer framework as a backend.  We cannot distribute this plugin in Fedora for licensing reasons, but it offers a new solution for an old problem.  For more information refer to these pages:</para>
 -          <itemizedlist>
 -            <listitem>
 -              <para>
 -                <ulink url="http://fedoraproject.org/wiki/Multimedia/fluendo-mp3">http://fedoraproject.org/wiki/Multimedia/fluendo-mp3</ulink>
 -              </para>
 -            </listitem><listitem>
 -              <para>
 -                <ulink url="http://fedoraproject.org/wiki/Multimedia/MP3">http://fedoraproject.org/wiki/Multimedia/MP3</ulink>
 -              </para>
 -            </listitem><listitem>
 -              <para>
 -                <ulink url="http://fedoraproject.org/wiki/Multimedia/DVD">http://fedoraproject.org/wiki/Multimedia/DVD</ulink>
 -              </para>
 -            </listitem><listitem>
 -              <para>
 -                <ulink url="http://fedoraproject.org/wiki/Multimedia/Flash">http://fedoraproject.org/wiki/Multimedia/Flash</ulink>
 -              </para>
 -            </listitem>
 -          </itemizedlist>
 -        </section><section id="">
 -          <title>CD and DVD authoring and burning </title>
 -          <para>Default installations of Fedora and the Desktop Live spin include a built-in feature for CD and DVD burning. Fedora includes a variety of other tools for easily creating and burning CDs and DVDs. Fedora includes graphical programs such as <programlisting format="linespecific">brasero</programlisting>, <programlisting format="linespecific">gnomebaker</programlisting>, and <programlisting format="linespecific">k3b</programlisting>. Console programs including <programlisting format="linespecific">wodim</programlisting>, <programlisting format="linespecific">readom</programlisting>, and <programlisting format="linespecific">genisoimage</programlisting>.  Graphical programs are found under <emphasis>Applications &gt; Sound &amp; Video</emphasis>.</para>
 -        </section><section id="">
 -          <title>Screencasts </title>
 -          <para>You can use Fedora to create and play back <emphasis>screencasts</emphasis>, which are recorded desktop sessions, using open technologies.  Fedora includes <programlisting format="linespecific">istanbul</programlisting>, which creates screencasts using the Theora video format, and 'byzanz', which creates screencasts as animated GIF files.  You can play back these videos using one of several players included in Fedora.  This is the preferred way to submit screencasts to the Fedora Project for either developers or end-users.  For more comprehensive instructions, refer to the screencasting page:</para><itemizedlist>
 -            <listitem>
 -              <para>
 -                <ulink url="http://fedoraproject.org/wiki/ScreenCasting">http://fedoraproject.org/wiki/ScreenCasting</ulink>
 -              </para>
 -            </listitem>
 -          </itemizedlist>
 -        </section><section id="">
 -          <title>Extended support through plugins </title>
 -          <para>Most of the media players in Fedora support the use of plugins to add support for additional media formats and sound output systems.  Some use powerful backends such as the <programlisting format="linespecific">gstreamer</programlisting> package to handle media format support and sound output.  Fedora offers plugin packages for these backends and for individual applications, and third parties may offer additional plugins to add even greater capabilities.</para>
 -        </section><section id="">
 -          <title>Infrared remote support </title>
 -          <para>A new graphical frontend to LIRC is provided by <programlisting format="linespecific">gnome-lirc-properties</programlisting>, making it easy to connect and configure infrared remote controls. LIRC is routinely used in multimedia applications to implement support for infrared remote controls, and using it in <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> should be as easy as plugging the remote receiver into your computer, then selecting <emphasis>[Auto-detect]</emphasis> in the <emphasis>Infrared Remote Control</emphasis> preferences.</para><para>If you had a previous setup with LIRC, it is recommended you regenerate the configuration files with <programlisting format="linespecific">gnome-lirc-properties</programlisting>. This is required so that a majority of applications work with your new setup.</para><para>Refer to the feature page for more information:</para>
 -          <itemizedlist>
 -            <listitem>
 -              <para>
 -                <ulink url="https://fedoraproject.org/wiki/Features/BetterLIRCSupport">https://fedoraproject.org/wiki/Features/BetterLIRCSupport</ulink>
 -              </para>
 -            </listitem>
 -          </itemizedlist>
 -        </section><section id="">
 -          <title>Glitch-free PulseAudio </title>
 -          <para>The PulseAudio sound server has been rewritten to use timer-based audio scheduling instead of the traditional interrupt-driven approach. This is the approach that is taken by other systems such as Apple's CoreAudio and the Windows Vista audio subsystem.  The timer-based audio scheduling has a number of advantages, including reduced power consumption, minimization of drop-outs, and flexible adjustment of the latency for the needs of the application.</para>
 -        </section>
 -      </section>
 -    </section>
 -  </article>
 -</book>
diff --cc en-US/Networking.xml
index 38364fe,58c8d42..f99c30c
--- a/en-US/Networking.xml
+++ b/en-US/Networking.xml
@@@ -1,22 -1,22 +1,32 @@@
  <?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
--<?
++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
  
-- <book>
--  <article lang="en">
--    <articleinfo>
--      <title>Docs/Beats/Networking</title>
-     </articleinfo><section id="sn-">
-       <title>Docs/Beats/Networking</title>
-       <section id="sn-">
-         <title>Networking </title>
-         <para>This section contains information about networking changes in Fedora 10.</para>
-         <section id="sn-">
-           <title>Wireless Connection Sharing </title>
-           <para>Connection sharing makes it possible to easily set up an ad-hoc WiFi network on a machine with a network connection and a spare wireless card. If the machine has primary network connection (wired, 3G, second wireless card), routing is set up so that devices connected to the ad-hoc WiFi network can share the connection to the outside network.</para>
-           <para>This ability is provided by the <emphasis>NetworkManager</emphasis>' applet <programlisting format="linespecific">nm-applet</programlisting>. Although <programlisting format="linespecific">nm-applet</programlisting> has had a <emphasis>Create New Wireless Network</emphasis> menu item for a long time, this feature makes it work better.</para><para>When you create a new WiFi network, you have to specify the name of the network and what kind of wireless security to use. NetworkManager then sets up the wireless card to work as an ad-hoc WiFi node that others can join. The routing will be set up between the new network and the primary network connection, and DHCP is used for assigning IP addresses on the new shared WiFi network. DNS queries are also forwarded to upstream nameservers transparently.</para>
-         </section>
-       </section>
-     </section>
-   </article>
- </book>
 -    </articleinfo><section id="">
 -      <title>Docs/Beats/Networking</title>
 -      <section id="">
 -        <title>Networking </title>
 -        <para>This section contains information about networking changes in Fedora 10.</para>
 -        <section id="">
 -          <title>Wireless Connection Sharing </title>
 -          <para>Connection sharing makes it possible to easily set up an ad-hoc WiFi network on a machine with a network connection and a spare wireless card. If the machine has primary network connection (wired, 3G, second wireless card), routing is set up so that devices connected to the ad-hoc WiFi network can share the connection to the outside network.</para>
 -          <para>This ability is provided by the <emphasis>NetworkManager</emphasis>' applet <programlisting format="linespecific">nm-applet</programlisting>. Although <programlisting format="linespecific">nm-applet</programlisting> has had a <emphasis>Create New Wireless Network</emphasis> menu item for a long time, this feature makes it work better.</para><para>When you create a new WiFi network, you have to specify the name of the network and what kind of wireless security to use. NetworkManager then sets up the wireless card to work as an ad-hoc WiFi node that others can join. The routing will be set up between the new network and the primary network connection, and DHCP is used for assigning IP addresses on the new shared WiFi network. DNS queries are also forwarded to upstream nameservers transparently.</para>
 -        </section>
 -      </section>
 -    </section>
 -  </article>
 -</book>
++ 
++<section lang="en" id="sn-Networking">
++  <title>Networking</title>
++  <para>This section contains information about networking changes in
++    Fedora 10.</para>
++  <section id="sn-Wireless_Connection_Sharing">
++    <title>Wireless Connection Sharing</title>
++    <para>Connection sharing makes it possible to easily set up an
++      ad-hoc WiFi network on a machine with a network connection and a
++      spare wireless card. If the machine has primary network connection
++      (wired, 3G, second wireless card), routing is set up so that
++      devices connected to the ad-hoc WiFi network can share the
++      connection to the outside network.</para>
++    <para>This ability is provided by the
++      <application>NetworkManager</application> applet
++      <command>nm-applet</command>. Although
++      <command>nm-applet</command> has had a <guimenuitem>Create New
++	Wireless Network</guimenuitem> menu item for a long time, this
++      feature makes it work better.</para>
++    <para>When you create a new WiFi network, you have to specify the
++      name of the network and what kind of wireless security to use.
++      NetworkManager then sets up the wireless card to work as an ad-hoc
++      WiFi node that others can join. The routing will be set up between
++      the new network and the primary network connection, and DHCP is
++      used for assigning IP addresses on the new shared WiFi network.
++      DNS queries are also forwarded to upstream nameservers
++      transparently.</para>
++  </section>
++</section>


commit ff342fd26eb183de1f7c9da78cc69ba9497e73be
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Wed Oct 15 14:46:40 2008 -0700

    Small XML edit, editing incomplete and ongoing.

diff --git a/en-US/Linux_kernel.xml b/en-US/Linux_kernel.xml
index 5501efe..9b061b6 100644
--- a/en-US/Linux_kernel.xml
+++ b/en-US/Linux_kernel.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
 
  <book>
   <article lang="en">
@@ -143,4 +142,4 @@
       </section>
     </section>
   </article>
-</book>
\ No newline at end of file
+</book>


commit 9d49d83aa190e6fd12c7756e282b1496b3cd3a6d
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Wed Oct 15 14:44:17 2008 -0700

    New chapter containers created, pulling in different section XML pages as per the new organization.
    
    * New organization:
    ** https://fedoraproject.org/wiki/Release_notes_structure_for_F10
    * Need wiki container page equivalents as per ticket#28
    * New organization has been modified and is now living temporarily in the XML.  When the final shakedown of the XInclude organization is done, we'll update the wiki to reflect reality. :)

diff --git a/en-US/Are_There_Hideous_Bugs_and_Terrible_Tigers.xml b/en-US/Are_There_Hideous_Bugs_and_Terrible_Tigers.xml
new file mode 100644
index 0000000..e119274
--- /dev/null
+++ b/en-US/Are_There_Hideous_Bugs_and_Terrible_Tigers.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="blah-Test">
+	<title>Test</title>
+	<para>
+		This is a test paragraph
+	</para>
+	<section id="blah-Test-Section_1_Test">
+		<title>Section 1 Test</title>
+		<para>
+			Test of a section &TEST_ENTITY;
+		</para>
+	</section>
+	
+	<section id="blah-Test-Section_2_Test">
+		<title>Section 2 Test</title>
+		<para>
+			Test of a section
+		</para>
+	</section>
+
+</chapter>
+
diff --git a/en-US/How_are_Things_for_Developers.xml b/en-US/How_are_Things_for_Developers.xml
new file mode 100644
index 0000000..e119274
--- /dev/null
+++ b/en-US/How_are_Things_for_Developers.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="blah-Test">
+	<title>Test</title>
+	<para>
+		This is a test paragraph
+	</para>
+	<section id="blah-Test-Section_1_Test">
+		<title>Section 1 Test</title>
+		<para>
+			Test of a section &TEST_ENTITY;
+		</para>
+	</section>
+	
+	<section id="blah-Test-Section_2_Test">
+		<title>Section 2 Test</title>
+		<para>
+			Test of a section
+		</para>
+	</section>
+
+</chapter>
+
diff --git a/en-US/Legal_Stuff_and_Administrivia.xml b/en-US/Legal_Stuff_and_Administrivia.xml
new file mode 100644
index 0000000..e119274
--- /dev/null
+++ b/en-US/Legal_Stuff_and_Administrivia.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="blah-Test">
+	<title>Test</title>
+	<para>
+		This is a test paragraph
+	</para>
+	<section id="blah-Test-Section_1_Test">
+		<title>Section 1 Test</title>
+		<para>
+			Test of a section &TEST_ENTITY;
+		</para>
+	</section>
+	
+	<section id="blah-Test-Section_2_Test">
+		<title>Section 2 Test</title>
+		<para>
+			Test of a section
+		</para>
+	</section>
+
+</chapter>
+
diff --git a/en-US/Upfront_About_Multimedia.xml b/en-US/Upfront_About_Multimedia.xml
new file mode 100644
index 0000000..d37c7e0
--- /dev/null
+++ b/en-US/Upfront_About_Multimedia.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="Upfront_About_Multimedia">
+	<title>Upfront About Multimedia</title>
+	<para/>
+<!-- Multimedia.xml -->
+
+  <xi:include href="Multimedia.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</chapter>
+
diff --git a/en-US/Welcome_to_Fedora_10.xml b/en-US/Welcome_to_Fedora_10.xml
new file mode 100644
index 0000000..2c560eb
--- /dev/null
+++ b/en-US/Welcome_to_Fedora_10.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="Welcome_to_Fedora_10">
+	<title>Welcome to Fedora 10</title>
+	<para/>
+
+<!-- Welcome_to_Fedora.xml -->
+  <xi:include href="Welcome_to_Fedora.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Introduction_to_Fedora_Project_and_technical_release_notes.xml-->
+  <xi:include href="Introduction_to_Fedora_Project_and_technical_release_notes.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Fedora_Project.xml -->
+  <xi:include href="Fedora_Project.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Feedback.xml -->
+  <xi:include href="Feedback.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</chapter>
+
diff --git a/en-US/What_Do_System_Administrators_Care_About.xml b/en-US/What_Do_System_Administrators_Care_About.xml
new file mode 100644
index 0000000..a769416
--- /dev/null
+++ b/en-US/What_Do_System_Administrators_Care_About.xml
@@ -0,0 +1,65 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="What_Do_System_Adminstrators_Care_About">
+	<title>What Do System Adminstrators Care About</title>
+	<para/>
+
+<!-- Security.xml  -->
+
+  <xi:include href="Security.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- System_services.xml  -->
+
+  <xi:include href="System_services.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Virtualization.xml  -->
+
+  <xi:include href="Virtualization.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Web_servers.xml  -->
+
+  <xi:include href="Web_servers.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Samba_-_Windows_compatibility.xml  -->
+
+  <xi:include href="Samba_-_Windows_compatibility.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Mail_servers.xml  -->
+
+  <xi:include href="Mail_servers.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- File_servers.xml  -->
+
+  <xi:include href="File_servers.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Database_servers.xml  -->
+
+  <xi:include href="Database_servers.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Backwards_compatibility.xml  -->
+
+  <xi:include href="Backwards_compatibility.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Updated_packages_in_Fedora_10.xml  -->
+
+  <xi:include href="Updated_packages_in_Fedora_10.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Package_changes.xml  -->
+
+  <xi:include href="Package_changes.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</chapter>
+
diff --git a/en-US/What_is_New_for_Installation_and_Live_Images.xml b/en-US/What_is_New_for_Installation_and_Live_Images.xml
new file mode 100644
index 0000000..a1482ce
--- /dev/null
+++ b/en-US/What_is_New_for_Installation_and_Live_Images.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="What_is_New_for_Installation_and_Live_Images">
+	<title>What is New for Installation and Live Images</title>
+
+<!-- Installation_notes.xml  -->
+
+  <xi:include href="Installation_notes.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Fedora_live_images.xml  -->
+
+  <xi:include href="Fedora_live_images.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Hardware_overview.xml  -->
+
+  <xi:include href="Hardware_overview.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Architecture_specific_notes.xml  -->
+
+  <xi:include href="Architecture_specific_notes.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</chapter>
+
diff --git a/en-US/What_is_the_Latest_on_the_Desktop.xml b/en-US/What_is_the_Latest_on_the_Desktop.xml
new file mode 100644
index 0000000..a9cb6f3
--- /dev/null
+++ b/en-US/What_is_the_Latest_on_the_Desktop.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id="What_is_the_Latest_on_the_Desktop">
+	<title>What is the Latest on the Desktop</title>
+	<para/>
+
+<!-- Fedora_desktop.xml -->
+
+  <xi:include href="Fedora_desktop.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Networking.xml -->
+
+  <xi:include href="Networking.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Printing.xml -->
+
+  <xi:include href="Printing.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Package_notes.xml-->
+
+  <xi:include href="Package_notes.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- International_language_support.xml -->
+
+  <xi:include href="International_language_support.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</chapter>
+


commit 9ec40aecd793643404232d05a88005f3b7613bcc
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Wed Oct 15 14:40:35 2008 -0700

    New development tools container file holds all relevant developer tools content.
    
    * Content included now in one XML file:
    ** Eclipse
    ** GCC
    ** NetBeans
    ** Python NSS
    ** OCaml
    ** AMQP
    ** Haskell
    ** Appliance building tools
    * Equivalent individual pages with matching content deleted in previous commit

diff --git a/en-US/Tools.xml b/en-US/Tools.xml
new file mode 100644
index 0000000..55f903a
--- /dev/null
+++ b/en-US/Tools.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<section lang="en" id="sn-Tools">
+  <title>Tools </title>
+  <section id="sn-Eclipse">
+    <title>Eclipse </title>
+    <para>This release of Fedora includes Fedora Eclipse, based on the
+      Eclipse SDK version 3.4.  The 3.4 series of releases has a 
+	"What's New in 3.4" page:</para>
+    <para><ulink
+	url="http://help.eclipse.org/stable/index.jsp?topic=/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html"/></para>
+    <para>Release notes specific to 3.4 are also available.</para>
+    <para><ulink
+	url="http://www.eclipse.org/eclipse/development/readme_eclipse_3.4.html"/></para>
+    <para>Some of the notable features in 3.4 include a number of
+      improvements in handling bookmarks, easier ways to find and
+      install plug-ins, and additional help with refactoring.</para>
+    <section id="sn-Additional_plugins">
+      <title>Additional plugins</title>
+      <para>This release of Fedora includes plugins for C/C++
+	<command>eclipse-cdt</command>, RPM
+	specfile editing <command>eclipse-rpm-editor</command>, PHP
+	<command>eclipse-phpeclipse</command>,
+	Subversion <command>eclipse-subclipse</command>,
+	SELinux <command>eclipse-slide</command> and
+	<command>eclipse-setools</command>,
+	regular expression testing <command>eclipse-quickrex</command>,
+	Fortran <command>eclipse-photran</command>,
+	Bugzilla integration <command>eclipse-mylyn</command>, Git
+	<command>eclipse-egit</command>, Perl
+	<command>eclipse-epic</command>,
+	Checkstyle <command>eclipse-checkstyle</command>, and
+	Python <command>eclipse-pydev</command>.</para>
+      <section id="sn-Translations_from_the_Babel_project_-_eclipse-nls">
+	<title>Translations from the Babel project - eclipse-nls</title>
+	<para>This release also includes the Babel language packs, which
+	  provide translations for Eclipse and Eclipse plugins in a
+	  number of languages.  Note that some of the languages have
+	  very low coverage: even if you have the translations
+	  installed, you will probably still see many strings in
+	  English.  The Babel project accepts contributions if you would
+	  like to help their translation efforts.</para>
+	<para>
+	  <ulink
+	    url="http://www.eclipse.org/babel/"/>
+	</para>
+      </section>
+      <section id="sn-Upgrading_from_Fedora_9">
+	<title>Upgrading from Fedora 9</title>
+	<para>Users upgrading from Eclipse 3.3 will need to migrate any
+	  plug-ins they have installed from sources other than RPMs. The
+	  simplest way to do this is to re-install.  For plug-in
+	  developers migrating from 3.3, refer to the "Plug-in Migration
+	  Guide":</para>
+	<para><ulink
+	    url="http://help.eclipse.org/ganymede/nav/2_3"/>
+	</para>
+      </section>
+    </section>
+    <section id="sn-GCC_Compiler_Collection">
+      <title>GCC Compiler Collection</title>
+      <para>This release of Fedora has been built with GCC 4.3.2, which
+	is included with the distribution. </para>
+      <para> For more information on GCC 4.3, refer to:</para>
+      <para>
+	<ulink
+	  url="http://gcc.gnu.org/gcc-4.3/"/>
+      </para>
+      <section id="sn-Target-specific_improvements">
+	<title>Target-specific improvements</title>
+	<section id="sn-IA-32_x86-64">
+	  <title>IA-32 x86-64</title>
+	  <para>
+	    <emphasis>ABI changes</emphasis>
+	  </para><itemizedlist>
+	    <listitem>
+	      <para> Starting with GCC 4.3.1, decimal floating point
+		variables are aligned to their natural boundaries when
+		they are passed on the stack for i386.</para>
+	    </listitem>
+	  </itemizedlist><para>
+	    <emphasis>Command-line changes</emphasis>
+	  </para><itemizedlist>
+	    <listitem>
+	      <para> Starting with GCC 4.3.1, the <option>-mcld</option>
+		option has been added to automatically generate a
+		<computeroutput>cld</computeroutput> instruction in the
+		prologue of functions that use string instructions. This
+		option is used for backward compatibility on some
+		operating systems and can be enabled by default for
+		32-bit x86 targets by configuring GCC with the
+		<option>--enable-cld</option> configure option.</para>
+	    </listitem>
+	  </itemizedlist>
+	</section>
+      </section>
+    </section><section id="sn-Improved_Haskell_support">
+      <title>Improved Haskell support</title>
+      <para>Fedora 10 introduces better support for Haskell.  With a new
+	set of packaging guidelines and tools, it is incredibly easy to
+	support any Haskell program using the Glasgow Haskell Compiler.
+	Package creation and deployment, leveraging Fedora's quality
+	tools plus a few new friends has never been easier.  As support
+	for Haskell grows there will be continued development for
+	Haskell as more libraries are introduced.</para>
+      <para>Package creation is quite simple.  Haskell already provides
+	the infrastructure for compiling and deploying packages
+	consistently. Setting up a package for Fedora takes very little
+	time, meaning code that works in Haskell works in Fedora
+	too.</para>
+      <para>Fedora also provides tools for enterprise deployment of
+	Fedora packages.  With the inclusion of Haskell in Fedora, the
+	developer is now free to write enterprise level applications in
+	Haskell and feel secure knowing the code can be used in
+	Fedora.</para>
+      <para>
+	<ulink
+	  url="https://fedoraproject.org/wiki/Features/GoodHaskellSupport"/>
+      </para>
+    </section><section id="sn-Objective_CAML_OCaml_coverage_greatly_extended">
+      <title>Objective CAML OCaml coverage greatly extended</title>
+      <para>Fedora 10 contains the OCaml 3.10.2 advanced programming
+	language and a very comprehensive list of packages:</para>
+      <para>
+	<ulink
+	  url="http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora#Package_status"/>
+      </para><para>OCaml was available as an update to Fedora 9 but not
+	in the initial release. </para>
+    </section><section id="sn-NetBeans">
+      <title>NetBeans</title>
+      <para>This release of Fedora includes NetBeans IDE, version 6.1.
+	NetBeans IDE is an Integrated Development Environment (IDE) for
+	Java, C/C++, Ruby, PHP,  etc. Default configuration of the
+	NetBeans IDE (Java SE IDE configuration) supports development of
+	programs for the Java platform, Standard Edition (Java SE),
+	including development of the modules for the NetBeans
+	Platform.</para>
+      <para>The NetBeans IDE is a modular system and includes facilities
+	for updating and installing plugins. There is a wide spectrum of
+	plugins for the NetBeans IDE that are provided by community
+	members and third-party companies.</para>
+      <section id="sn-NetBean_resources">
+	<title>NetBean resources</title>
+	<itemizedlist>
+	  <listitem>
+	    <para>
+	      <ulink
+		url="http://www.netbeans.org/"/>
+	      - Official site of the NetBeans project.</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink
+		url="http://wiki.netbeans.org/"/>
+	      - NetBeans Wiki pages.</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink url="mailto:linux-packaging at installer.netbeans.org"/>
+	      - Mailing list for discussion of the packaging
+	      issues.</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink
+		url="https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans"/>
+	      - Bug list for the NetBeans IDE.</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink
+		url="https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans-platform8"/>
+	      - Bug list for the NetBeans Platform.</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink
+		url="http://www.netbeans.org/issues/"/>
+	      -  Issue Tracker of the NetBeans project. Please, use
+	      <menuchoice>Component: installer</menuchoice>, <menuchoice>OS:
+		Linux</menuchoice>, <menuchoice>Subcomponent: rpm</menuchoice>
+	      to file the issues related to the NetBeans RPMs.</para>
+	  </listitem>
+	</itemizedlist>
+      </section>
+    </section><section id="sn-AMQP_Infrastructure">
+      <title>AMQP Infrastructure</title>
+      <para> The AMQP Infrastructure package is a subset of the Red Hat
+	Enterprise MRG. The package allows for development of scalable,
+	interoperable, and high-performance enterprise applications.
+      </para>
+      <para>More specifically it consists of the following.  </para>
+      <itemizedlist>
+	<listitem>
+	  <para> AMQP (protocol version 0-10) messaging
+	    broker/server</para>
+	</listitem><listitem>
+	  <para> Client bindings for C++, Python, and Java (using the
+	    JMS interface)</para>
+	</listitem><listitem>
+	  <para> A set of command line interface
+	    configuration/management utilities</para>
+	</listitem><listitem>
+	  <para> A high-performance asynchronous message store for
+	    durable messages and messaging configuration.</para>
+	</listitem>
+      </itemizedlist><para />
+      <section id="sn-AMQP_resources">
+	<title>AMQP resources</title>
+	<para>For more information refer to the following
+	  resources.</para>
+	<itemizedlist>
+	  <listitem>
+	    <para>
+	      <ulink
+		url="http://www.redhat.com/mrg/resources"/>
+	      Red Hat MRG Documentation</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink url="http://amqp.org/"/>
+	      AMQP Project Site</para>
+	  </listitem>
+	</itemizedlist>
+      </section>
+    </section>
+    <section id="sn-Appliance_building_tools">
+      <title>Appliance building tools</title>
+      <para>Appliances are pre-installed and pre-configured system
+	images. This package includes tools and meta-data that make it
+	easier for ISVs, developers, OEMS, etc. to create and deploy
+	virtual appliances. The two components of this feature are the
+	ACT (Appliance Creation Tool) and the AOS (The Appliance
+	Operating System).  Install the <package>appliance-tools</package> package
+	with <menuchoice>Add/Remove Software</menuchoice> or <command>
+	</command>yum.
+      </para>
+      <section id="sn-Appliance_Creation_Tool">
+	<title>Appliance Creation Tool</title>
+	<para>The Appliance Creation Tool is a tool that creates
+	  Appliance Images from a kickstart file. This tool uses the
+	  live CD creator API as well as patches to the live CD API that
+	  allow for the creation of multi-partitioned disk images. These
+	  disk images can then be booted in a virtual container such as
+	  Xen, KVM, and VMware. This tool is included in the
+	  <package>appliance-tools</package>
+	  package. This package contains tools for building appliance
+	  images on Fedora based systems including derived distributions
+	  such as RHEL, CentOS, and others.</para>
+      </section>
+      <section id="sn-Appliance_Operating_System">
+	<title>Appliance Operating System</title>
+	<para>The Appliance Operating System is a scaled down version of
+	  Fedora with a small footprint. It contains only the packages
+	  necessary to run an appliance. The hardware supported by this
+	  spin of Fedora would be limited, primarily focusing on virtual
+	  containers such as KVM and VMware. The goal is to create a
+	  base that developers can build their applications on top of,
+	  only pulling in packages that their software requires.</para>
+      </section>
+      <section id="sn-Appliance_building_tools_resources">
+	<title>Appliance building tools resources</title>
+	<para>
+	  <ulink
+	    url="http://thincrust.net/"/>
+	  Appliance Tool Project Site </para>
+      </section>
+    </section><section id="sn-Python_NSS_bindings">
+      <title>Python NSS bindings</title>
+      <para>Python bindings for NSS/NSPR allow Python programs to
+	utilize the NSS cryptographic libraries for SSL/TLS and PKI
+	certificate management.  The <package>python-nss</package> package
+	provides a Python binding to the NSS and NSPR support
+	libraries.</para>
+      <para>Network Security Services (NSS) is a set
+	of libraries supporting security-enabled client and server
+	applications. Applications built with NSS can support SSL v2 and
+	v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
+	certificates and other security standards. NSS has received FIPS
+	140 validation from NIST. </para>
+      <section id="sn-Python_NSS_bindings_resources">
+	<title>Python NSS bindings resources</title>
+	<para>
+	  <ulink
+	    url="http://people.redhat.com/jdennis/python-nss/doc/api/html/index.html"/>
+	  -- Library Documentation</para>
+      </section>
+    </section>
+  </section>
+</section>
+


commit 59bf115e73142a0bb65aa195b6840860aa0a2847
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Wed Oct 15 13:37:45 2008 -0700

    Mass of XML edits for contextual markup as per wiki2xml guidelines; page renamings for Publican-proofing.
    
    * Most of these edits are for edits to the markup generated by mw-render; use as a lesson in what needs to be changed; some notes taken:
    ** https://fedoraproject.org/wiki/User:Kwade/Post-processing_wiki2xml_results
    * Page naming reflects that these got moved to <section>s from <chapter>s
    ** Trying to enforce all-leading-caps "Titles Like This" for only chapters, and use "Titles like this" for sections within chapters; something to fix on the wiki side
    *** https://fedorahosted.org/release-notes/ticket/28

diff --git a/en-US/Architecture_Specific_Notes.xml b/en-US/Architecture_Specific_Notes.xml
deleted file mode 100644
index e924ef2..0000000
--- a/en-US/Architecture_Specific_Notes.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-v<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/ArchSpecific</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/ArchSpecific</title>
-      <section id="">
-        <title>Architecture Specific Notes</title>
-        <para>This section provides notes that are specific to the supported hardware architectures of Fedora.</para>
-        <section id="">
-          <title>RPM multiarch support on 64-bit platforms (x86_64, ppc64) </title>
-          <para>
-            <emphasis>RPM</emphasis> supports parallel installation of multiple architectures of the same package.  A default package listing such as <programlisting format="linespecific">rpm -qa</programlisting> might appear to include duplicate packages, since the architecture is not displayed.  Instead, use the <programlisting format="linespecific">repoquery</programlisting> command, part of the <programlisting format="linespecific">yum-utils</programlisting> package, which displays architecture by default.  To install <programlisting format="linespecific">yum-utils</programlisting>, run the following command:</para><para />
-          <programlisting> su -c 'yum install yum-utils'
-</programlisting>
-          <para />
-          <para>To list all packages with their architecture using <programlisting format="linespecific">rpm</programlisting>, run the following command:</para><para />
-          <programlisting> rpm -qa --queryformat "%{name}-%{version}-%{release}.%{arch}\n"
-</programlisting>
-          <para />
-          <para>You can add this to <programlisting format="linespecific">/etc/rpm/macros</programlisting> (for a system wide setting) or <programlisting format="linespecific">~/.rpmmacros</programlisting> (for a per-user setting).  It changes the default query to list the architecture:</para><para />
-          <programlisting> %_query_all_fmt         %%{name}-%%{version}-%%{release}.%%{arch}
-</programlisting>
-          <para />
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
diff --git a/en-US/Architecture_specific_notes.xml b/en-US/Architecture_specific_notes.xml
new file mode 100644
index 0000000..5e737ea
--- /dev/null
+++ b/en-US/Architecture_specific_notes.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section lang="en" id="sn-Architecture_specific_notes">
+  <title>Architecture specific notes</title>
+  <para>This section provides notes that are specific to the supported
+    hardware architectures of Fedora.</para> 
+  <section id="sn-RPM_multiarch_support_on_64-bit_platforms_-_x86_64_and_ppc64">
+    <title>RPM multiarch support on 64-bit platforms - x86_64 and ppc64
+    </title>
+    <para>
+      RPM supports parallel installation of
+      multiple architectures of the same package.  A default package
+      listing such as <command>rpm
+	-qa</command> might appear to include duplicate packages,
+      since the architecture is not displayed.  Instead, use the
+      <command>repoquery</command>
+      command, part of the <package>yum-utils</package> package, which
+      displays architecture by default.  To install <package>yum-utils</package>, run the
+      following command:</para>
+    <screen>
+      <userinput>su -c 'yum install yum-utils'</userinput>
+    </screen>
+    <para>To list all packages with their architecture using
+      <command>rpm</command>, run the following command:</para>
+    <screen>
+      <userinput>rpm -qa --queryformat "%{name}-%{version}-%{release}.%{arch}\n"</userinput>
+    </screen>
+    <para>This setting changes the default query to list the
+      architecture.  Add it to <filename>/etc/rpm/macros</filename> (for
+      a system wide setting) or <filename>~/.rpmmacros</filename> (for a
+      per-user setting).</para>
+    <screen>
+      <userinput>%_query_all_fmt %%{name}-%%{version}-%%{release}.%%{arch}</userinput>
+    </screen>
+  </section>
+
+<!-- x86_specifics_for_Fedora.xml  -->
+
+  <xi:include href="x86_specifics_for_Fedora.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- x86_64_specifics_for_Fedora.xml  -->
+
+  <xi:include href="x86_64_specifics_for_Fedora.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- PPC_specifics_for_Fedora.xml  -->
+
+  <xi:include href="PPC_specifics_for_Fedora.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+
diff --git a/en-US/Backwards_Compatibility.xml b/en-US/Backwards_Compatibility.xml
deleted file mode 100644
index 0773c95..0000000
--- a/en-US/Backwards_Compatibility.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/BackwardsCompatibility</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/BackwardsCompatibility</title>
-      <section id="">
-        <title>Backwards Compatibility </title>
-        <para>Fedora provides legacy system libraries for compatibility with older software. This software is part of the <emphasis>Legacy Software Development</emphasis> group, which is not installed by default. Users who require this functionality may select this group either during installation or after the installation process is complete. To install the package group on a Fedora system, use <emphasis>Applications &gt; Add/Remove Software</emphasis> or enter the following command in a terminal window:</para><para />
-        <programlisting>
-su -c 'yum groupinstall "Legacy Software Development"'
-</programlisting>
-        <para />
-        <para>Enter the password for the <programlisting format="linespecific">root</programlisting> account when prompted.</para><section id="">
-          <title>Compiler compatibility </title>
-          <para>The <programlisting format="linespecific">compat-gcc-34</programlisting> package has been included for compatibility reasons:</para><para>
-            <ulink url="https://www.redhat.com/archives/fedora-devel-list/2006-August/msg00409.html">https://www.redhat.com/archives/fedora-devel-list/2006-August/msg00409.html</ulink>
-          </para>
-        </section><section id="">
-          <title>KDE3 development </title>
-          <para>Refer to <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/BackwardsCompatibility/KDE3">Docs/Beats/BackwardsCompatibility/KDE3</ulink>.</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Backwards_compatibility.xml b/en-US/Backwards_compatibility.xml
new file mode 100644
index 0000000..4e8c27b
--- /dev/null
+++ b/en-US/Backwards_compatibility.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/BackwardsCompatibility</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/BackwardsCompatibility</title>
+      <section id="sn-">
+        <title>Backwards Compatibility </title>
+        <para>Fedora provides legacy system libraries for compatibility with older software. This software is part of the <emphasis>Legacy Software Development</emphasis> group, which is not installed by default. Users who require this functionality may select this group either during installation or after the installation process is complete. To install the package group on a Fedora system, use <emphasis>Applications &gt; Add/Remove Software</emphasis> or enter the following command in a terminal window:</para><para />
+        <programlisting>
+su -c 'yum groupinstall "Legacy Software Development"'
+</programlisting>
+        <para />
+        <para>Enter the password for the <programlisting format="linespecific">root</programlisting> account when prompted.</para><section id="sn-">
+          <title>Compiler compatibility </title>
+          <para>The <programlisting format="linespecific">compat-gcc-34</programlisting> package has been included for compatibility reasons:</para><para>
+            <ulink url="https://www.redhat.com/archives/fedora-devel-list/2006-August/msg00409.html">https://www.redhat.com/archives/fedora-devel-list/2006-August/msg00409.html</ulink>
+          </para>
+        </section><section id="sn-">
+          <title>KDE3 development </title>
+          <para>Refer to <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/BackwardsCompatibility/KDE3">Docs/Beats/BackwardsCompatibility/KDE3</ulink>.</para>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Colophon.xml b/en-US/Colophon.xml
index 504e54c..2d6d24c 100644
--- a/en-US/Colophon.xml
+++ b/en-US/Colophon.xml
@@ -6,9 +6,9 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Colophon</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/Colophon</title>
-      <section id="">
+      <section id="sn-">
         <title>Colophon</title>
         <para>As we use the term, a <emphasis>colophon</emphasis>: </para><itemizedlist>
           <listitem>
@@ -17,7 +17,7 @@
             <para> explains tools and production methods.</para>
           </listitem>
         </itemizedlist><para />
-        <section id="">
+        <section id="sn-">
           <title>Contributors </title>
           <para>
             <para>
@@ -256,7 +256,7 @@
           <para>
             <ulink url="http://docs.fedoraproject.org/release-notes/">http://docs.fedoraproject.org/release-notes/</ulink>
           </para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Production Methods </title>
           <para>Beat writers produce the release notes directly on the Fedora Project Wiki.  They collaborate with other subject matter experts during the test release phase of Fedora to explain important changes and enhancements.  The editorial team ensures consistency and quality of the finished beats, and ports the Wiki material to DocBook XML in a revision control repository.  At this point, the team of translators produces other language versions of the release notes, and then they become available to the general public as part of Fedora.  The publication team also makes them, and subsequent errata, available via the Web.</para>
         </section>
diff --git a/en-US/Development.xml b/en-US/Development.xml
index 8046188..88be2cb 100644
--- a/en-US/Development.xml
+++ b/en-US/Development.xml
@@ -6,41 +6,41 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Devel</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/Devel</title>
-      <section id="">
+      <section id="sn-">
         <title>Development</title>
         <para>This section covers various development tools and features.</para>
-        <section id="">
+        <section id="sn-">
           <title>Runtime </title>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Tools </title>
-          <section id="">
+          <section id="sn-">
             <title>Eclipse </title>
             <para>This release of Fedora includes Fedora Eclipse, based on the <ulink url="http://www.eclipse.org"> Eclipse</ulink> SDK version 3.4.  The 3.4 series of releases has a <ulink url="http://help.eclipse.org/stable/index.jsp?topic=/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html"> "What's New in 3.4" page</ulink> , and <ulink url="http://www.eclipse.org/eclipse/development/readme_eclipse_3.4.html"> release notes specific to 3.4</ulink>  are also available.</para><para>Some of the notable features in 3.4 include a number of improvements in handling bookmarks, easier ways to find and install plug-ins, and additional help with refactoring.</para>
-          </section><section id="">
+          </section><section id="sn-">
             <title>Additional plugins </title>
-            <para>This release of Fedora includes plugins for C/C++ <programlisting format="linespecific">eclipse-cdt</programlisting>, RPM specfile editing <programlisting format="linespecific">eclipse-rpm-editor</programlisting>, PHP <programlisting format="linespecific">eclipse-phpeclipse</programlisting>, Subversion <programlisting format="linespecific">eclipse-subclipse</programlisting>, SELinux <programlisting format="linespecific">eclipse-slide</programlisting> and <programlisting format="linespecific">eclipse-setools</programlisting>, regular expression testing <programlisting format="linespecific">eclipse-quickrex</programlisting>, Fortran <programlisting format="linespecific">eclipse-photran</programlisting>, Bugzilla integration <programlisting format="linespecific">eclipse-mylyn</programlisting>, Git <programlisting format="linespecific">eclipse-egit</programlisting>, Perl <programlisting format="linespecific">eclipse-epic</programlisting>, Checkstyle <programlis
 ting format="linespecific">eclipse-checkstyle</programlisting>, and Python <programlisting format="linespecific">eclipse-pydev</programlisting>.</para><section id="">
+            <para>This release of Fedora includes plugins for C/C++ <programlisting format="linespecific">eclipse-cdt</programlisting>, RPM specfile editing <programlisting format="linespecific">eclipse-rpm-editor</programlisting>, PHP <programlisting format="linespecific">eclipse-phpeclipse</programlisting>, Subversion <programlisting format="linespecific">eclipse-subclipse</programlisting>, SELinux <programlisting format="linespecific">eclipse-slide</programlisting> and <programlisting format="linespecific">eclipse-setools</programlisting>, regular expression testing <programlisting format="linespecific">eclipse-quickrex</programlisting>, Fortran <programlisting format="linespecific">eclipse-photran</programlisting>, Bugzilla integration <programlisting format="linespecific">eclipse-mylyn</programlisting>, Git <programlisting format="linespecific">eclipse-egit</programlisting>, Perl <programlisting format="linespecific">eclipse-epic</programlisting>, Checkstyle <programlis
 ting format="linespecific">eclipse-checkstyle</programlisting>, and Python <programlisting format="linespecific">eclipse-pydev</programlisting>.</para><section id="sn-">
               <title>Translations from the Babel project [eclipse-nls] </title>
               <para>This release also includes the Babel language packs, which provide translations for Eclipse and Eclipse plugins in a number of languages.  Note that some of the languages have very low coverage: even if you have the translations installed, you will probably still see many strings in English.  The Babel project accepts contributions if you would like to help their translation efforts.</para>
               <para>
                 <ulink url="http://www.eclipse.org/babel/">http://www.eclipse.org/babel/</ulink>
               </para>
-            </section><section id="">
+            </section><section id="sn-">
               <title>Upgrading from Fedora 9 </title>
               <para>Users upgrading from Eclipse 3.3 will need to migrate any plug-ins they have installed from sources other than RPMs. The simplest way to do this is to re-install.  For plug-in developers migrating from 3.3, refer to the "Plug-in Migration Guide":</para>
               <para>[<ulink url="http://help.eclipse.org/ganymede/nav/2_3">http://help.eclipse.org/ganymede/nav/2_3</ulink>
               </para>
             </section>
-          </section><section id="">
+          </section><section id="sn-">
             <title>GCC Compiler Collection </title>
             <para>This release of Fedora has been built with GCC 4.3.2, which is included with the distribution. </para>
             <para> For more information on GCC 4.3, refer to:</para>
             <para>
               <ulink url="http://gcc.gnu.org/gcc-4.3/">http://gcc.gnu.org/gcc-4.3/</ulink>
-            </para><section id="">
+            </para><section id="sn-">
               <title>Target-Specific Improvements </title>
-              <section id="">
+              <section id="sn-">
                 <title>IA-32/x86-64 </title>
                 <para>
                   <emphasis>ABI changes</emphasis>
@@ -57,7 +57,7 @@
                 </itemizedlist>
               </section>
             </section>
-          </section><section id="">
+          </section><section id="sn-">
             <title>Improved Haskell support </title>
             <para>Fedora 10 introduces better support for Haskell.  With a new set of packaging guidelines and tools, it is incredibly easy to support any Haskell program using the Glasgow Haskell Compiler.  Package creation and deployment, leveraging Fedora's quality tools plus a few new friends has never been easier.  As support for Haskell grows there will be continued development for Haskell as more libraries are introduced.</para>
             <para>Package creation is quite simple.  Haskell already provides the infrastructure for compiling and deploying packages consistently. Setting up a package for Fedora takes very little time, meaning code that works in Haskell works in Fedora too.</para>
@@ -65,17 +65,17 @@
             <para>
               <ulink url="https://fedoraproject.org/wiki/Features/GoodHaskellSupport">https://fedoraproject.org/wiki/Features/GoodHaskellSupport</ulink>
             </para>
-          </section><section id="">
+          </section><section id="sn-">
             <title>Objective CAML (OCaml) coverage greatly extended </title>
             <para>Fedora 10 contains the OCaml 3.10.2 advanced programming language and a very comprehensive list of packages:</para>
             <para>
               <ulink url="http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora#Package_status">http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora#Package_status</ulink>
             </para><para>OCaml was available as an update to Fedora 9 but not in the initial release. </para>
-          </section><section id="">
+          </section><section id="sn-">
             <title>NetBeans </title>
             <para>This release of Fedora includes NetBeans IDE,  version 6.1. NetBeans IDE is an Integrated Development Environment (IDE) for Java, C/C++, Ruby, PHP,  etc. Default configuration of the NetBeans IDE (Java SE IDE configuration) supports development of programs for the Java platform, Standard Edition (Java SE), including development of the modules for the NetBeans Platform.</para>
             <para>The NetBeans IDE is a modular system and includes facilities for updating and installing plugins. There is a wide spectrum of plugins for the NetBeans IDE that are provided by community members and third-party companies.</para>
-            <section id="">
+            <section id="sn-">
               <title>Resources </title>
               <itemizedlist>
                 <listitem>
@@ -99,7 +99,7 @@
                 </listitem>
               </itemizedlist>
             </section>
-          </section><section id="">
+          </section><section id="sn-">
             <title>AMQP Infrastructure </title>
             <para> The AMQP Infrastructure package is a subset of the RedHat Enterprise MRG. The package allows for development of scalable, interoperable and high-performance enterprise applications. </para>
             <para>More specifically it consists of the following.  </para>
@@ -114,7 +114,7 @@
                 <para> A high-performance asynchronous message store for durable messages and messaging configuration.</para>
               </listitem>
             </itemizedlist><para />
-            <section id="">
+            <section id="sn-">
               <title>Resources </title>
               <para>For more information refer to the following resources.</para>
               <itemizedlist>
@@ -127,7 +127,7 @@
                 </listitem>
               </itemizedlist>
             </section>
-          </section><section id="">
+          </section><section id="sn-">
             <title>Appliance Building Tools </title>
             <para>Appliances are pre-installed and pre-configured system images. This package includes tools and meta-data that make it easier for ISVs, developers, OEMS, etc. to create and deploy virtual appliances. The two components of this feature are the ACT (Appliance Creation Tool) and the AOS (The Appliance Operating System).  Install the <programlisting format="linespecific">appliance-tools</programlisting> package with <emphasis>Add/Remove Software</emphasis> or <programlisting format="linespecific">
                 <para>yum<programlisting format="linespecific">
@@ -135,21 +135,21 @@
                   </programlisting>
                 </para>
               </programlisting>
-            </para><section id="">
+            </para><section id="sn-">
               <title>Appliance Creation Tool </title>
               <para>The Appliance Creation Tool is a tool that creates Appliance Images from a kickstart file. This tool uses the live CD creator API as well as patches to the live CD API that allow for the creation of multi-partitioned disk images. These disk images can then be booted in a virtual container such as Xen, KVM, and VMware. This tool is included in the <programlisting format="linespecific">appliance-tools</programlisting> package. This package contains tools for building appliance images on Fedora based systems including derived distributions such as RHEL, CentOS, and others.</para>
-            </section><section id="">
+            </section><section id="sn-">
               <title>Appliance Operating System </title>
               <para>The Appliance Operating System is a scaled down version of Fedora with a small footprint. It contains only the packages necessary to run an appliance. The hardware supported by this spin of Fedora would be limited, primarily focusing on virtual containers such as KVM and VMware. The goal is to create a base that developers can build their applications on top of, only pulling in packages that their software requires.</para>
-            </section><section id="">
+            </section><section id="sn-">
               <title>Resources </title>
               <para>
                 <ulink url="http://thincrust.net/">http://thincrust.net/</ulink> -- Appliance Tool Project Site </para>
             </section>
-          </section><section id="">
+          </section><section id="sn-">
             <title>Python NSS Bindings </title>
             <para>Python bindings for NSS/NSPR allow Python programs to utilize the NSS cryptographic libraries for SSL/TLS and PKI certificate management.  The <programlisting format="linespecific">python-nss</programlisting> package provides a Python binding to the NSS and NSPR support libraries.</para><para>Network Security Services (NSS) is a set of libraries supporting security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates and other security standards. NSS has received FIPS 140 validation from NIST. </para>
-            <section id="">
+            <section id="sn-">
               <title>Resources </title>
               <para>
                 <ulink url="http://people.redhat.com/jdennis/python-nss/doc/api/html/index.html">http://people.redhat.com/jdennis/python-nss/doc/api/html/index.html</ulink> -- Library Documentation</para>
diff --git a/en-US/Embedded.xml b/en-US/Embedded.xml
index 359ad71..6f9d404 100644
--- a/en-US/Embedded.xml
+++ b/en-US/Embedded.xml
@@ -6,10 +6,10 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Embedded</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Embedded</title>
       <para>Fedora 10 includes a number of applications to support embedded development on a variety of targets.  Included are assemblers, compilers, debuggers, programmers, IDEs and assorted utilities.</para>
-      <section id="">
+      <section id="sn-">
         <title>AVR</title>
         <para>
           <emphasis>avrdude</emphasis> Software for programming Atmel AVR microcontroller</para><para>AVRDUDE is a program for programming Atmel's AVR CPU's. It can program the Flash and EEPROM, and where supported by the serial programming protocol, it can program fuse and lock bits. AVRDUDE also supplies a direct instruction mode allowing one to issue any programming instruction to the AVR chip regardless of whether AVRDUDE implements that specific feature of a particular chip.</para>
@@ -26,7 +26,7 @@
           <emphasis>avr-gdb</emphasis> GDB for (remote) debugging avr binaries</para><para>This is a special version of GDB, the GNU Project debugger, for (remote) debugging avr binaries. GDB allows you to see what is going on inside another program while it executes or what another program was doing at the moment it crashed.</para>
         <para>
           <emphasis>avarice</emphasis> Program for interfacing the Atmel JTAG ICE to GDB</para><para>Program for interfacing the Atmel JTAG ICE to GDB to allow users to debug their embedded AVR target</para>
-      </section><section id="">
+      </section><section id="sn-">
         <title>Microchip PIC</title>
         <para>
           <emphasis>gputils</emphasis> Development utilities for Microchip (TM) PIC (TM) microcontrollers</para><para>This is a collection of development tools for Microchip (TM) PIC (TM) microcontrollers.  This is ALPHA software: there may be serious bugs in it, and it's nowhere near complete.  gputils currently only implements a subset of the features available with Microchip's tools.  See the documentation for an up-to-date list of what gputils can do.</para>
@@ -71,7 +71,7 @@
           <emphasis>piklab</emphasis> Development environment for applications based on PIC &amp; dsPIC</para><para>Piklab is a graphic development environment for PIC and dsPIC microcontrollers. It interfaces with various toochains for compiling and assembling and it supports several Microchip and direct programmers.  WARNING: Administrator have to see the README.Fedora file locate in the /usr/share/doc/piklab-0.15.0 directory to complete full feature installation.</para>
         <para>
           <emphasis>pikloops</emphasis> Code generator for PIC delays</para><para>PiKLoop generate for you code to create delays for Microchip PIC microcontrollers. It is an useful companion for Pikdev or Piklab IDE.</para>
-      </section><section id="">
+      </section><section id="sn-">
         <title>Others/Processor agnostic</title>
         <para>
           <emphasis>dfu-programmer</emphasis> A device firmware update based USB programmer for Atmel chips</para><para>A linux based command-line programmer for Atmel chips with a USB bootloader supporting ISP. This is a mostly Device Firmware Update (DFU) 1.0 compliant user-space application. Currently supported chips: 8051, AVR, at89c51snd1c, at90usb1287, at89c5130, at90usb1286, at89c5131, at90usb647, at89c5132, at90usb646, at90usb162, and at90usb82.</para>
diff --git a/en-US/Fedora_10_Boot-Time.xml b/en-US/Fedora_10_Boot-Time.xml
deleted file mode 100644
index 60f9a54..0000000
--- a/en-US/Fedora_10_Boot-Time.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Boot</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Boot</title>
-      <section id="">
-        <title>Fedora 10 Boot-Time </title>
-        <para>Fedora 10 includes multiple boot-time updates, including changes that allow for faster booting and graphic booting changes.</para>
-        <section id="">
-          <title>Plymouth </title>
-          <para>Plymouth is the graphical boot up system debuting with Fedora 10.</para>
-          <itemizedlist>
-            <listitem>
-              <para> Adding <programlisting format="linespecific">rhgb</programlisting> on the <programlisting format="linespecific">grub</programlisting> command line directs Plymouth to load the appropriate plugin for your hardware.</para>
-            </listitem><listitem>
-              <para> The graphical boot splash screen that comes with Plymouth requires kernel mode setting drivers to work best. There are not kernel modesetting drivers available for all hardware yet. To see the graphical splash before the drivers are generally available, add <programlisting format="linespecific">vga=0x318</programlisting> to the kernel <programlisting format="linespecific">grub</programlisting> command line. This uses <programlisting format="linespecific">vesafb</programlisting>, which does not necessarily give the native resolution for a flat panel, and may cause flickering or other weird interactions with X. Without kernel modesetting drivers or <programlisting format="linespecific">vga=0x318</programlisting>, Plymouth uses a text-based plugin that is plain but functional.</para>
-            </listitem><listitem>
-              <para> Currently, only Radeon R500 and higher users get kernel modesetting by default. There is work in progress to provide modesetting for R100 and R200. Additionally, Intel kernel modesetting drivers are in development, but not turned on by default.</para>
-            </listitem><listitem>
-              <para> The kernel modesetting drivers are still in development and buggy. If you end up with nothing but a black screen during boot up, or a screen with nothing but random noise on it, then adding will <programlisting format="linespecific">nomodeset</programlisting> to the kernel boot prompt in grub disables modesetting.</para>
-            </listitem><listitem>
-              <para> Plymouth hides boot messages. To view boot messages, press the <emphasis>[Esc]</emphasis> key during boot, or view them in <programlisting format="linespecific">/var/log/boot.log</programlisting> after boot up. Alternatively, remove <programlisting format="linespecific">rhgb</programlisting> from the kernel command line and plymouth displays all boot messages. There is also a status icon on the login screen to view boot warnings.</para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Faster Booting </title>
-          <para>Fedora 10 gets a faster boot from improvements in process start-up.</para>
-          <itemizedlist>
-            <listitem>
-              <para> Readahead is started in parallel with the boot process.</para>
-            </listitem><listitem>
-              <para> Udev may appear to be slower but in fact readahead reads all disk buffers needed for the boot process in the background and shortens the whole boot process. Creation of the readahead file list is done monthly and can be triggered manually by touching <programlisting format="linespecific">/.readahead_collect</programlisting>. The configuration file <programlisting format="linespecific">/etc/sysconfig/readahead</programlisting> can be edited to turn off readahead-collector and/or readahead. </para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Kernel Modesetting </title>
-          <para>Kernel modesetting (KMS) can default to either enabled or disabled in the DRM driver and it can be enabled or disabled at boot-time.</para>
-          <itemizedlist>
-            <listitem>
-              <para> Both Plymouth and the DDX drivers detect whether KMS is present and enabled. If it is present and enabled, Plymouth and DDX drivers will take advantage of them. </para>
-            </listitem><listitem>
-              <para> If KMS is not present or it is present but disabled then Plymouth will automatically fall back to the text splash and the DDX driver will automatically fall back to user-space modesetting.</para>
-            </listitem><listitem>
-              <para> Allows for faster user switching, seamless X server switching and graphical panic messages.</para>
-            </listitem>
-          </itemizedlist>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Fedora_10_boot-time.xml b/en-US/Fedora_10_boot-time.xml
new file mode 100644
index 0000000..d253102
--- /dev/null
+++ b/en-US/Fedora_10_boot-time.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Boot</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Boot</title>
+      <section id="sn-">
+        <title>Fedora 10 Boot-Time </title>
+        <para>Fedora 10 includes multiple boot-time updates, including changes that allow for faster booting and graphic booting changes.</para>
+        <section id="sn-">
+          <title>Plymouth </title>
+          <para>Plymouth is the graphical boot up system debuting with Fedora 10.</para>
+          <itemizedlist>
+            <listitem>
+              <para> Adding <programlisting format="linespecific">rhgb</programlisting> on the <programlisting format="linespecific">grub</programlisting> command line directs Plymouth to load the appropriate plugin for your hardware.</para>
+            </listitem><listitem>
+              <para> The graphical boot splash screen that comes with Plymouth requires kernel mode setting drivers to work best. There are not kernel modesetting drivers available for all hardware yet. To see the graphical splash before the drivers are generally available, add <programlisting format="linespecific">vga=0x318</programlisting> to the kernel <programlisting format="linespecific">grub</programlisting> command line. This uses <programlisting format="linespecific">vesafb</programlisting>, which does not necessarily give the native resolution for a flat panel, and may cause flickering or other weird interactions with X. Without kernel modesetting drivers or <programlisting format="linespecific">vga=0x318</programlisting>, Plymouth uses a text-based plugin that is plain but functional.</para>
+            </listitem><listitem>
+              <para> Currently, only Radeon R500 and higher users get kernel modesetting by default. There is work in progress to provide modesetting for R100 and R200. Additionally, Intel kernel modesetting drivers are in development, but not turned on by default.</para>
+            </listitem><listitem>
+              <para> The kernel modesetting drivers are still in development and buggy. If you end up with nothing but a black screen during boot up, or a screen with nothing but random noise on it, then adding will <programlisting format="linespecific">nomodeset</programlisting> to the kernel boot prompt in grub disables modesetting.</para>
+            </listitem><listitem>
+              <para> Plymouth hides boot messages. To view boot messages, press the <emphasis>[Esc]</emphasis> key during boot, or view them in <programlisting format="linespecific">/var/log/boot.log</programlisting> after boot up. Alternatively, remove <programlisting format="linespecific">rhgb</programlisting> from the kernel command line and plymouth displays all boot messages. There is also a status icon on the login screen to view boot warnings.</para>
+            </listitem>
+          </itemizedlist>
+        </section><section id="sn-">
+          <title>Faster Booting </title>
+          <para>Fedora 10 gets a faster boot from improvements in process start-up.</para>
+          <itemizedlist>
+            <listitem>
+              <para> Readahead is started in parallel with the boot process.</para>
+            </listitem><listitem>
+              <para> Udev may appear to be slower but in fact readahead reads all disk buffers needed for the boot process in the background and shortens the whole boot process. Creation of the readahead file list is done monthly and can be triggered manually by touching <programlisting format="linespecific">/.readahead_collect</programlisting>. The configuration file <programlisting format="linespecific">/etc/sysconfig/readahead</programlisting> can be edited to turn off readahead-collector and/or readahead. </para>
+            </listitem>
+          </itemizedlist>
+        </section><section id="sn-">
+          <title>Kernel Modesetting </title>
+          <para>Kernel modesetting (KMS) can default to either enabled or disabled in the DRM driver and it can be enabled or disabled at boot-time.</para>
+          <itemizedlist>
+            <listitem>
+              <para> Both Plymouth and the DDX drivers detect whether KMS is present and enabled. If it is present and enabled, Plymouth and DDX drivers will take advantage of them. </para>
+            </listitem><listitem>
+              <para> If KMS is not present or it is present but disabled then Plymouth will automatically fall back to the text splash and the DDX driver will automatically fall back to user-space modesetting.</para>
+            </listitem><listitem>
+              <para> Allows for faster user switching, seamless X server switching and graphical panic messages.</para>
+            </listitem>
+          </itemizedlist>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Fedora_Desktop.xml b/en-US/Fedora_Desktop.xml
deleted file mode 100644
index 0faef15..0000000
--- a/en-US/Fedora_Desktop.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Desktop</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Desktop</title>
-      <section id="">
-        <title>Fedora Desktop </title>
-        <para>This section details changes that affect Fedora graphical desktop users.</para>
-        <section id="">
-          <title>Better Webcam support </title>
-          <para>Fedora 10 comes with improved support for webcams.</para>
-          <para>This support follows on the improvements to the UVC driver first introduced in Fedora 9 that added support for any webcam with a Windows Vista compliant logo.  Fedora 10 features a new v4l2 version of <programlisting format="linespecific">gspca</programlisting>, a USB webcam driver framework with support for many different USB webcam bridges and sensors.</para><para>Userspace support for webcams has also been improved by adding <programlisting format="linespecific">libv4l</programlisting> and updating all webcam using applications to use <programlisting format="linespecific">libv4l</programlisting>.  This support, this makes these applications understand the often manufacturer specific and custom video formats emitted by many webcams, esp. by many of the webcams supported by gspca.</para><para>For a list of all webcams and applications with which Fedora-10's new webcam support has been tested see the <ulink url="https://fedoraproject.org/wiki/Features/BetterW
 ebcamSupport"> BetterWebcamSupport feature page</ulink>, for a list of all cams supported by the original version of gspca see the <ulink url="http://mxhaard.free.fr/spca5xx.html"> original gspca website</ulink>. The v4l2 version of gspca in Fedora-10 supports all these webcams and more.</para>
-        </section><section id="">
-          <title>Plymouth Graphical Boot </title>
-          <para>For information about the new grapical boot mode read <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/Boot%23Plymouth_Graphical_Boot">Docs/Beats/Boot#Plymouth_Graphical_Boot</ulink>.</para>
-        </section><section id="">
-          <title>Echo Icon Theme </title>
-          <para>Echo is an icon theme developed for Fedora by the volunteer Fedora Art community.  Echo inherits the isometric perspective from the classic Bluecurve theme while introducing a refreshing new look. It follows the freedesktop.org theme specification. The current version covers essential icons from the desktop menus and applications. Future revisions will bring broader coverage.  </para>
-          <para>Currently, both GNOME and Xfce use the Echo icon theme by default. KDE continues to use the Oxygen icon theme. The next release of Fedora may introduce Echo by default for KDE for a consistent look and feel across different desktop environments.</para>
-        </section><section id="">
-          <title>Infrared remote support </title>
-          <para>New to Fedora 10 is the <programlisting format="linespecific">gnome-lirc-properties</programlisting> package with a new graphical front-end for configuring LIRC to use with applications supporting the protocol.  For more information refer to <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/Multimedia%23Infrared_remote_support">Docs/Beats/Multimedia#Infrared_remote_support</ulink>.</para><para>LIRC is routinely used in multimedia applications to implement support for infrared remote controls, and using it in <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> should be as easy as plugging the remote receiver into your computer, then selecting <emphasis>[Auto-detect]</emphasis> in the <emphasis>Infrared Remote Control</emphasis> preferences. Refer to the feature page for more information:</para><para>
-            <ulink url="https://fedoraproject.org/wiki/Features/BetterLIRCSupport">https://fedoraproject.org/wiki/Features/BetterLIRCSupport</ulink>
-          </para>
-        </section><section id="">
-          <title>Bluetooth: BlueZ 4.0 </title>
-          <para>The Bluetooth support stack, called BlueZ (<ulink url="http://www.bluez.org),">http://www.bluez.org),</ulink> has been updated to version 4.x in Fedora 10. Most changes in this version are useful for application developers, but users can notice the new, easier to use wizard for setting up keyboards, mice, and other supported Bluetooth devices.  There is also the ability to turn-off the Bluetooth adapter on most brands of laptops through the preferences. This new version will also allow better support for audio devices in the future, through PulseAudio.</para><para>Note that the default Bluetooth kernel driver was also switched to <programlisting format="linespecific">btusb</programlisting>, which cuts down power consumption compared to its predecessor <programlisting format="linespecific">hci_usb</programlisting>.</para>
-        </section><section id="">
-          <title>GNOME </title>
-          <para>This release features GNOME 2.24.  For more details refer to:</para>
-          <para>
-            <ulink url="http://www.gnome.org/start/2.24/">http://www.gnome.org/start/2.24/</ulink>
-          </para><section id="">
-            <title>Empathy Instant Messenger </title>
-            <para>
-              <emphasis>Empathy</emphasis> instant messenger is the new default replacing <emphasis>Pidgin</emphasis> in this release. It has support for multiple protocols including IRC, XMPP(Jabber), Yahoo, MSN, and others via plugins. It also supports video and voice in the XMPP protocol, with support for other protocols under active development. Empathy uses the <programlisting format="linespecific">telepathy</programlisting> framework that has a number of additional plugins:</para><itemizedlist>
-              <listitem>
-                <para>
-                  <programlisting format="linespecific">telepathy-gabble</programlisting> - Jabber/XMPP lugin</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">telepathy-idle</programlisting> - IRC plugin</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">telepathy-butterfly</programlisting> - MSN plugin</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">telepathy-sofiasip</programlisting> - SIP plugin</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">telepathy-haze</programlisting> - Libpurple (Pidgin) library connection manager provides support for other protocols such as Yahoo</para>
-              </listitem>
-            </itemizedlist><para>
-              <emphasis>Pidgin</emphasis> continues to be available in the Fedora software repository and is retained as the default for users upgrading from previous releases of Fedora. </para>
-          </section><section id="">
-            <title>GNOME Display Manager </title>
-            <para>The GNOME Display Manager (<programlisting format="linespecific">gdm</programlisting>) has been updated to the latest upstream code, which is a complete rewrite driven by Fedora developers. PolicyKit can be used to control shutdown and reboot.  The configuration tool <programlisting format="linespecific">gdmsetup</programlisting> is missing currently, and is set to be replaced. For configuration changes, refer to:</para><para>
-              <ulink url="http://live.gnome.org/GDM/2.22/Configuration">http://live.gnome.org/GDM/2.22/Configuration</ulink>
-            </para>
-          </section><section id="">
-            <title>Codec installation helper </title>
-            <para>The GStreamer codec installation helper <programlisting format="linespecific">codeina</programlisting> was replaced by a PackageKit-based solution for Fedora 10. When Totem, Rhythmbox, or another GStreamer application require a plugin to read a film or song, a PackageKit dialogue appears, allowing the user to search for the necessary package in the configured repositories.</para><para>More details are available on the feature page:</para>
-            <para>
-              <ulink url="https://fedoraproject.org/wiki/Features/GStreamer_dependencies_in_RPM">https://fedoraproject.org/wiki/Features/GStreamer_dependencies_in_RPM</ulink>
-            </para>
-          </section>
-        </section><section id="">
-          <title>KDE </title>
-          <para>This release features KDE 4.1.2. As the <programlisting format="linespecific">kdevelop</programlisting> packages is not part of KDE 4.1 and <programlisting format="linespecific">kdewebdev</programlisting> is only partially available (no <emphasis>Quanta</emphasis>) in KDE 4.1, the KDE 3.5.10 versions of those packages are shipped. A <programlisting format="linespecific">kdegames3</programlisting> package containing the games not yet ported to KDE 4 is also available.</para><para>
-            <ulink url="http://kde.org/announcements/announce-4.1.2.php">http://kde.org/announcements/announce-4.1.2.php</ulink>
-          </para><para>KDE 4.1 is the latest release of KDE 4 and
-          provides several new features, many usability improvements,
-          and bugfixes over KDE 4.0, the first KDE 4 release series.
-          This new release includes a folder view desktop applet
-          (<firstterm>plasmoid</firstterm>), improvements to <emphasis>Dolphin</emphasis> and <emphasis>Konqueror</emphasis> and many new and improved applications. KDE 4.1.2 is a bugfix release from the KDE 4.1 release series.</para><para>Fedora 10 does <emphasis>not</emphasis> include the legacy KDE 3 Desktop. It does include a compatibility KDE 3 Development Platform, which can be used to build and run KDE 3 applications within KDE 4 or any other desktop environment. Refer to the <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/BackwardsCompatibility">Docs/Beats/BackwardsCompatibility</ulink> section for more details about what is included.</para><para>Fedora 10 includes a snapshot of <programlisting format="linespecific">knetworkmanager</programlisting>, which works with the prerelease of <emphasis>NetworkManager</emphasis> 0.7 in Fedora 10. As it was not considered ready for production use, the KDE Live images use <programlisting format="linespecific">n
 m-applet</programlisting> from <programlisting format="linespecific">NetworkManager-gnome</programlisting> instead (as in Fedora 8 and 9). The <programlisting format="linespecific">gnome-keyring-daemon</programlisting> facility saves passwords for these encryption technologies. If you wish to try <programlisting format="linespecific">knetworkmanager</programlisting> can be installed from the repository.</para><para>As the native <emphasis>KWin</emphasis> window manager now optionally supports compositing and desktop effects, the KDE Live images no longer include <emphasis>Compiz/Beryl</emphasis> (since Fedora 9). The <emphasis>KWin</emphasis> compositing/effects mode is disabled by default, but can be enabled in <programlisting format="linespecific">systemsettings</programlisting>. <emphasis>Compiz</emphasis> (with KDE 4 integration) is available from the repository by installing the <programlisting format="linespecific">compiz-kde</programlisting> package.</para><section id
 ="">
-            <title>Enhancements </title>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <emphasis>Plasma</emphasis> is more mature and panel configuration has been extended. The new panel controller makes it easy to customize your panel providing direct visual feedback. The <emphasis>Plasma</emphasis> <command>folderview</command> applet provides a view of a directory and thus allows you to store files on the desktop. It is replaces other well known icons on the desktop.</para>
-              </listitem>
-            </itemizedlist>
-          </section><section id="">
-            <title>Package and Application Changes </title>
-            <itemizedlist>
-              <listitem>
-                <para> Fedora 10 ships <programlisting format="linespecific">kdepim</programlisting> 4.1.2 instead of 3.5.x.</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">libkipi</programlisting>, <programlisting format="linespecific">libkexiv2</programlisting>, and <programlisting format="linespecific">libkdcraw</programlisting> have been obsoleted by the KDE 4 versions in the <programlisting format="linespecific">kdegraphics</programlisting> package. Accordingly, <programlisting format="linespecific">kipi-plugins</programlisting>, <programlisting format="linespecific">digikam</programlisting>, and <programlisting format="linespecific">kphotoalbum</programlisting> have been updated to KDE 4 versions.</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">kpackagekit</programlisting>, a KDE frontend to PackageKit, is now available. (It may be made available as an update for Fedora 9 at a later time.)</para>
-              </listitem>
-            </itemizedlist><para>In addition, the following changes made since the Fedora 9 release, which have been backported to Fedora 9 updates, are also part of Fedora 10: </para>
-            <itemizedlist>
-              <listitem>
-                <para> KDE has been upgraded from version 4.0.3 to 4.1.2.</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">qt</programlisting> and <programlisting format="linespecific">PyQt4</programlisting> have been upgraded from 4.3 to 4.4.</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">kdewebdev</programlisting>, <programlisting format="linespecific">kdevelop</programlisting>, <programlisting format="linespecific">kdegames3</programlisting>, and the KDE 3 backwards-compatibility libraries have been upgraded from KDE 3.5.9 to 3.5.10.</para>
-              </listitem><listitem>
-                <para>
-                  <emphasis>QtWebKit</emphasis> is now part of the <programlisting format="linespecific">qt</programlisting> package. The stand alone <programlisting format="linespecific">WebKit-qt</programlisting> package has been obsoleted.</para>
-              </listitem><listitem>
-                <para> The new package <programlisting format="linespecific">qgtkstyle</programlisting> contains a Qt 4 style using GTK+ for drawing, providing better integration of Qt 4 and KDE 4 applications into GNOME.</para>
-              </listitem><listitem>
-                <para> The <programlisting format="linespecific">phonon</programlisting> library, which was part of <programlisting format="linespecific">kdelibs</programlisting> in Fedora 9, is now a separate package. An optional <emphasis>GStreamer</emphasis> backend (<programlisting format="linespecific">phonon-backend-gstreamer</programlisting>) is now available, but the <emphasis>xine-lib</emphasis> backend, which is now packaged as <programlisting format="linespecific">phonon-backend-xine</programlisting>, is still the recommended default backend and is now required by the <programlisting format="linespecific">phonon</programlisting> package.</para>
-              </listitem><listitem>
-                <para> The <programlisting format="linespecific">kdegames3</programlisting> package no longer provides development support for the KDE 3 version of <programlisting format="linespecific">libkdegames</programlisting> because nothing in Fedora outside of <programlisting format="linespecific">kdegames3</programlisting> itself requires that library any longer.</para>
-              </listitem><listitem>
-                <para> The package <programlisting format="linespecific">okteta</programlisting> is now part of <programlisting format="linespecific">kdeutils</programlisting>.</para>
-              </listitem><listitem>
-                <para> The package <programlisting format="linespecific">dragonplayer</programlisting> is now part of <programlisting format="linespecific">kdemultimedia</programlisting>.</para>
-              </listitem><listitem>
-                <para> The program <programlisting format="linespecific">kaider</programlisting> has been renamed to <emphasis>Lokalize</emphasis> and is now part of <programlisting format="linespecific">kdesdk</programlisting>.</para>
-              </listitem><listitem>
-                <para> The package <programlisting format="linespecific">ksirk</programlisting> has been ported to KDE 4 and is now part of <programlisting format="linespecific">kdegames</programlisting>.</para>
-              </listitem><listitem>
-                <para> The package <programlisting format="linespecific">extragear-plasma</programlisting> has been renamed to <programlisting format="linespecific">kdeplasma-addons</programlisting>.</para>
-              </listitem>
-            </itemizedlist><para />
-          </section>
-        </section><section id="">
-          <title>Sugar Desktop </title>
-          <para>The Sugar Desktop originated with the OLPC initiative. It allows for Fedora users and developers to do the following.</para>
-          <itemizedlist>
-            <listitem>
-              <para> Build upon the collaborative environment.</para>
-            </listitem><listitem>
-              <para> Test out Sugar on an existing Fedora system by selecting the Sugar environment from their display manager.</para>
-            </listitem><listitem>
-              <para> Developers interested in working on the Sugar interface or writing activities can have a development platform without needing an XO laptop. </para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Web Browsers </title>
-          <section id="">
-            <title>Enabling Flash Plugin </title>
-            <para>Fedora includes <programlisting format="linespecific">swfdec</programlisting> and <programlisting format="linespecific">gnash</programlisting>, which are free and open source implementations of Flash.  We encourage you to try either of them before seeking out Adobe's proprietary Flash Player plug-in software. The Adobe Flash Player plug-in uses a legacy sound framework that does not work correctly without additional support. Run the following command to enable this support:</para><para />
-            <programlisting>
-su -c 'yum install libflashsupport'
-</programlisting>
-            <para />
-            <para>If you are using Flash 10, you do not need libflashsupport anymore as the usage of ALSA has been fixed in this version. </para>
-            <para>Users of Fedora x86_64 must install the <programlisting format="linespecific">nspluginwrapper.i386</programlisting> package to enable the 32-bit Adobe Flash Player plug-in in <emphasis>Firefox</emphasis>, and the <programlisting format="linespecific">libflashsupport.i386</programlisting> package to enable sound from the plug-in.</para><para>Install the <programlisting format="linespecific">nspluginwrapper.i386</programlisting>, <programlisting format="linespecific">nspluginwrapper.x86_64</programlisting>, and <programlisting format="linespecific">libflashsupport.i386</programlisting> packages:</para><para />
-            <programlisting>su -c 'yum install nspluginwrapper.{i386,x86_64} libflashsupport.i386'
-</programlisting>
-            <para />
-            <para>Install <programlisting format="linespecific">flash-plugin</programlisting> after <programlisting format="linespecific">nspluginwrapper.i386</programlisting> is installed:</para><para />
-            <programlisting>su -c 'yum install libflashsupport'
-</programlisting>
-            <para />
-            <para>Run <programlisting format="linespecific">mozilla-plugin-config</programlisting> to register the flash plugin:</para><para />
-            <programlisting>su -c "mozilla-plugin-config -i -g -v"
-</programlisting>
-            <para />
-            <para>Close all <emphasis>Firefox</emphasis> windows, and then relaunch <emphasis>Firefox</emphasis>. Type <emphasis>about:plugins</emphasis> in the URL bar to ensure the plugin is loaded.</para>
-          </section>
-        </section><section id="">
-          <title>Disabling PC Speaker </title>
-          <para>PC speaker is enabled by default in Fedora.  If you do not prefer this, there are two ways to circumvent the sounds:</para>
-          <itemizedlist>
-            <listitem>
-              <para> Reduce its volume to a acceptable level or completely mute the PC speaker in <programlisting format="linespecific">alsamixer</programlisting> with the setting for <emphasis>PC Speak</emphasis>.</para>
-            </listitem>
-          </itemizedlist><itemizedlist>
-            <listitem>
-              <para> Disable the PC speaker system wide by running the following commands in a console.</para>
-            </listitem>
-          </itemizedlist><para />
-          <programlisting>
-su -c 'modprobe -r pcspkr'
-su -c 'echo "install pcspkr :" &gt;&gt; /etc/modprobe.conf'
-</programlisting>
-          <para />
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
diff --git a/en-US/Fedora_Live_Images.xml b/en-US/Fedora_Live_Images.xml
deleted file mode 100644
index 9cc1356..0000000
--- a/en-US/Fedora_Live_Images.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Live</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Live</title>
-      <section id="">
-        <title>Fedora Live Images </title>
-        <para>The Fedora 10 release includes several Fedora Live ISO images in addition to the traditional installation images.  These ISO images are bootable, and you can burn them to media and use them to try out Fedora.  They also include a feature that allows you to install the Fedora Live image content to your hard drive for persistence and higher performance. </para>
-        <section id="">
-          <title>Available Images </title>
-          <para>For a complete list of current spins available, and instructions for using them, refer to:</para>
-          <para>
-            <ulink url="http://fedoraproject.org/wiki/CustomSpins">http://fedoraproject.org/wiki/CustomSpins</ulink>
-          </para>
-        </section><section id="">
-          <title>Usage Information </title>
-          <para>To boot from the Fedora Live image, insert it into your computer and restart. To log in and use the desktop environment, enter the username <programlisting format="linespecific">fedora</programlisting>.  There is no password on this account.  The GNOME-based Fedora Live images automatically login after one minute, so users have time to select a preferred language. After logging in, if you wish to install the contents of the live image to your hard drive, click on the <emphasis>Install to Hard Drive</emphasis> icon on the desktop.</para>
-        </section><section id="">
-          <title>Text Mode Installation </title>
-          <para>You can do a text mode installation of the Fedora Live images using the <programlisting format="linespecific">liveinst</programlisting> command in the console.</para>
-        </section><section id="">
-          <title>USB Booting </title>
-          <para>Another way to use these Fedora Live images is to put them on a USB stick.  To do this, you can use liveusb-creator graphical interface. You can use Add/Remove software, search and install liveusb-creator or install using yum:</para>
-          <para />
-          <programlisting>
-su -c 'yum install liveusb-creator'
-</programlisting>
-          <para />
-          <para>You can also use the command line interface, install the <programlisting format="linespecific">livecd-tools</programlisting> package from the repository.  Then, run the <programlisting format="linespecific">livecd-iso-to-disk</programlisting> script:</para><para />
-          <programlisting>/usr/bin/livecd-iso-to-disk /path/to/live.iso /dev/sdb1
-</programlisting>
-          <para />
-          <para>Replace <emphasis>/dev/sdb1</emphasis> with the partition where you want to put the image.</para><para>This is <emphasis>not</emphasis> a destructive process; any data you currently have on your USB stick <emphasis>is preserved</emphasis>.</para>
-        </section><section id="">
-          <title>Persistent Home Directory </title>
-          <para>Support for keeping a persistent <programlisting format="linespecific">/home</programlisting> with the rest of the system stateless has been added for Fedora 10.  This includes support for encrypting <programlisting format="linespecific">/home</programlisting> to protect your system in the case where your USB stick is lost or stolen.  To use this, download the live image and run the following command:</para><para />
-          <programlisting>livecd-iso-to-disk --home-size-mb 512 /path/to/live.iso /dev/sdb1
-</programlisting>
-          <para />
-          <para>Replace <programlisting format="linespecific">/dev/sdb1</programlisting> with the partition where you want to put the image.</para><para>Replace <programlisting format="linespecific">512</programlisting> with the desired size in megabytes of the persistent <programlisting format="linespecific">/home</programlisting>.  The <programlisting format="linespecific">livecd-iso-to-disk</programlisting> shell script is stored in the <programlisting format="linespecific">LiveOS</programlisting> directory at the top level of the CD image. The USB media must have sufficient free space for the Fedora Live image, plus the <programlisting format="linespecific">/home</programlisting>, plus any other data to be stored on the media.  By default, this encrypts your data and prompts for a passphrase to use.  If you want to have an unencrypted <programlisting format="linespecific">/home</programlisting>, then you can specify <programlisting format="linespecific">--unencrypted-hom
 e</programlisting>.</para><para>Note that later runs of <programlisting format="linespecific">livecd-iso-to-disk</programlisting> preserve the <programlisting format="linespecific">/home</programlisting> that is created on the USB stick, continuing to use it even if you change your live image.  </para>
-        </section><section id="">
-          <title>Live USB Persistence </title>
-          <para>Support for persistent changes with a Fedora Live image exists for Fedora 9 and later. The primary use case is booting from a Fedora Live image on a USB flash drive and storing changes to that same device. To do this, download the Fedora Live image and then run the following command:</para>
-          <para />
-          <programlisting>livecd-iso-to-disk --overlay-size-mb 512 /path/to/live.iso /dev/sdb1
-</programlisting>
-          <para />
-          <para>Replace <programlisting format="linespecific">/dev/sdb1</programlisting> with the partition where you want to put the image.</para><para>Replace <programlisting format="linespecific">512</programlisting> with the desired size in megabytes of the persistent data, or <programlisting format="linespecific">overlay</programlisting>.  The <programlisting format="linespecific">livecd-iso-to-disk</programlisting> shell script is stored in the <programlisting format="linespecific">LiveOS</programlisting> directory at the top level of the CD image. The USB media must have sufficient free space for the Fedora Live image, plus the overlay, plus any other data to be stored on the media.</para>
-        </section><section id="">
-          <title>Booting a Fedora Live Image Off of USB on Intel-based Apple Hardware </title>
-          <para>Fedora 10 includes support for putting the live image onto a USB image and then booting it on Intel processor-based Apple hardware.  Unlike for most x86 machines, this unfortunately requires reformatting the USB stick that you are using.  To set up a stick for this, you can run</para>
-          <para />
-          <programlisting>/usr/bin/livecd-iso-to-disk --mactel /path/to/live.iso /dev/sdb1
-</programlisting>
-          <para />
-          <para>Replace <programlisting format="linespecific">/dev/sdb1</programlisting> with the partition where you want to put the image.</para><para>Note that all of the other arguments for the <programlisting format="linespecific">livecd-iso-to-disk</programlisting> tool as described above can be used here as well.</para>
-        </section><section id="">
-          <title>Differences From a Regular Fedora Install </title>
-          <para>The following items are different from a normal Fedora install with the Fedora Live images.</para>
-          <itemizedlist>
-            <listitem>
-              <para> Fedora Live images provide a subset of packages available in the regular DVD image. Both connect to the same repository that has all the packages.</para>
-            </listitem><listitem>
-              <para> The SSH daemon <programlisting format="linespecific">sshd</programlisting> is disabled by default. The daemon is disabled because the default username in the Fedora Live images does not have a password. However, installation to hard disk prompts for creating a new username and password.</para>
-            </listitem><listitem>
-              <para> Fedora Live image installations do not allow any package selection or upgrade capability since they copy the entire file system from media or USB disks to the hard disk. After the installation is complete, and your system has been rebooted, you can add and remove packages as desired with the <emphasis>Add/Remove Packages</emphasis> tool, <programlisting format="linespecific">yum</programlisting>, or the other software management tools.</para>
-            </listitem><listitem>
-              <para> Fedora Live images do not work on <programlisting format="linespecific">i586</programlisting> architecture.</para>
-            </listitem>
-          </itemizedlist>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Fedora_Overview.xml b/en-US/Fedora_Overview.xml
deleted file mode 100644
index 5712bf1..0000000
--- a/en-US/Fedora_Overview.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/OverView</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/OverView</title>
-      <section id="">
-        <title>Fedora Overview </title>
-        <para>As always, Fedora continues to develop (<ulink url="http://www.fedoraproject.org/wiki/RedHatContributions)">http://www.fedoraproject.org/wiki/RedHatContributions)</ulink> and integrate the latest free and open source software (<ulink url="http://www.fedoraproject.org/wiki/Features).">http://www.fedoraproject.org/wiki/Features).</ulink> The following sections provide a brief overview of major changes from the last release of Fedora. For more details about other features that are included in Fedora 10, refer to their individual wiki pages that detail feature goals and progress:</para><para>
-          <ulink url="http://www.fedoraproject.org/wiki/Releases/10/FeatureList">http://www.fedoraproject.org/wiki/Releases/10/FeatureList</ulink>
-        </para><para>Throughout the release cycle, there are interviews with the developers behind key features giving out the inside story:</para>
-        <para>
-          <ulink url="http://www.fedoraproject.org/wiki/Interviews">http://www.fedoraproject.org/wiki/Interviews</ulink>
-        </para><para>The following are major features for Fedora 10:</para>
-        <itemizedlist>
-          <listitem>
-            <para> Wireless connection sharing enables ad hoc network sharing -- <ulink url="http://www.fedoraproject.org/wiki/Features/ConnectionSharing">http://www.fedoraproject.org/wiki/Features/ConnectionSharing</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Better setup and use of printers through improved management tools -- <ulink url="http://www.fedoraproject.org/wiki/Features/BetterPrinting">http://www.fedoraproject.org/wiki/Features/BetterPrinting</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Virtualization storage provisioning for local and remote connections now simplified -- <ulink url="http://www.fedoraproject.org/wiki/Features/VirtStorage">http://www.fedoraproject.org/wiki/Features/VirtStorage</ulink>
-            </para>
-          </listitem><listitem>
-            <para> SecTool is a new security audit and intrusion detections system -- <ulink url="http://www.fedoraproject.org/wiki/Features/SecurityAudit">http://www.fedoraproject.org/wiki/Features/SecurityAudit</ulink>
-            </para>
-          </listitem><listitem>
-            <para> RPM 4.6 is a major update to the powerful, flexible software management libraries -- <ulink url="http://www.fedoraproject.org/wiki/Features/RPM4.6">http://www.fedoraproject.org/wiki/Features/RPM4.6</ulink>
-            </para>
-          </listitem>
-        </itemizedlist><para>Some other features in this release include: </para>
-        <itemizedlist>
-          <listitem>
-            <para> Glitch free audio and better performance is achieved through a rewrite of the PulseAudio sound server to use timer-based audio scheduling -- <ulink url="http://www.fedoraproject.org/wiki/Features/GlitchFreeAudio">http://www.fedoraproject.org/wiki/Features/GlitchFreeAudio</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Improved webcam support -- <ulink url="http://www.fedoraproject.org/wiki/Features/BetterWebcamSupport">http://www.fedoraproject.org/wiki/Features/BetterWebcamSupport</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Better support for infrared remote controls makes them easier to connect and work with many applications -- <ulink url="http://www.fedoraproject.org/wiki/Features/BetterLIRCSupport">http://www.fedoraproject.org/wiki/Features/BetterLIRCSupport</ulink>
-            </para>
-          </listitem><listitem>
-            <para> The paths <programlisting format="linespecific">/usr/local/sbin:/usr/sbin:/sbin</programlisting> have been added to the PATH for normal users, to simplify command-line administration tasks -- <ulink url="http://fedoraproject.org/wiki/Features/SbinSanity">http://fedoraproject.org/wiki/Features/SbinSanity</ulink>
-            </para>
-          </listitem><listitem>
-            <para> The online account service provides applications with credentials for online accounts listed on <ulink url="http://online.gnome.org">http://online.gnome.org</ulink> or stored in GConf -- <ulink url="http://www.fedoraproject.org/wiki/Features/OnlineAccountsService">http://www.fedoraproject.org/wiki/Features/OnlineAccountsService</ulink>
-            </para>
-          </listitem>
-        </itemizedlist><para />
-        <para>Features for Fedora 10 tracked on the feature list page:</para>
-        <para>
-          <ulink url="http://www.fedoraproject.org/wiki/Releases/10/FeatureList">http://www.fedoraproject.org/wiki/Releases/10/FeatureList</ulink>
-        </para>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Fedora_Project.xml b/en-US/Fedora_Project.xml
index 027a09c..570d374 100644
--- a/en-US/Fedora_Project.xml
+++ b/en-US/Fedora_Project.xml
@@ -6,9 +6,9 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/ProjectOverview</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/ProjectOverview</title>
-      <section id="">
+      <section id="sn-">
         <title>Fedora Project </title>
         <para> The goal of the Fedora Project is to work with the Linux community to build a complete, general-purpose operating system exclusively from free and open source software. The Fedora Project is driven by the individuals that contribute to it. As a tester, developer, documenter, or translator, you can make a difference. Refer to <ulink url="http://join.fedoraproject.org">http://join.fedoraproject.org</ulink> for details. For information on the channels of communication for Fedora users and contributors, refer to <ulink url="http://fedoraproject.org/wiki/Communicate.">http://fedoraproject.org/wiki/Communicate.</ulink>
         </para><para>In addition to the website, the following mailing lists are available:</para>
diff --git a/en-US/Fedora_desktop.xml b/en-US/Fedora_desktop.xml
new file mode 100644
index 0000000..1b69106
--- /dev/null
+++ b/en-US/Fedora_desktop.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Desktop</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Desktop</title>
+      <section id="sn-">
+        <title>Fedora Desktop </title>
+        <para>This section details changes that affect Fedora graphical desktop users.</para>
+        <section id="sn-">
+          <title>Better Webcam support </title>
+          <para>Fedora 10 comes with improved support for webcams.</para>
+          <para>This support follows on the improvements to the UVC driver first introduced in Fedora 9 that added support for any webcam with a Windows Vista compliant logo.  Fedora 10 features a new v4l2 version of <programlisting format="linespecific">gspca</programlisting>, a USB webcam driver framework with support for many different USB webcam bridges and sensors.</para><para>Userspace support for webcams has also been improved by adding <programlisting format="linespecific">libv4l</programlisting> and updating all webcam using applications to use <programlisting format="linespecific">libv4l</programlisting>.  This support, this makes these applications understand the often manufacturer specific and custom video formats emitted by many webcams, esp. by many of the webcams supported by gspca.</para><para>For a list of all webcams and applications with which Fedora-10's new webcam support has been tested see the <ulink url="https://fedoraproject.org/wiki/Features/BetterW
 ebcamSupport"> BetterWebcamSupport feature page</ulink>, for a list of all cams supported by the original version of gspca see the <ulink url="http://mxhaard.free.fr/spca5xx.html"> original gspca website</ulink>. The v4l2 version of gspca in Fedora-10 supports all these webcams and more.</para>
+        </section><section id="sn-">
+          <title>Plymouth Graphical Boot </title>
+          <para>For information about the new grapical boot mode read <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/Boot%23Plymouth_Graphical_Boot">Docs/Beats/Boot#Plymouth_Graphical_Boot</ulink>.</para>
+        </section><section id="sn-">
+          <title>Echo Icon Theme </title>
+          <para>Echo is an icon theme developed for Fedora by the volunteer Fedora Art community.  Echo inherits the isometric perspective from the classic Bluecurve theme while introducing a refreshing new look. It follows the freedesktop.org theme specification. The current version covers essential icons from the desktop menus and applications. Future revisions will bring broader coverage.  </para>
+          <para>Currently, both GNOME and Xfce use the Echo icon theme by default. KDE continues to use the Oxygen icon theme. The next release of Fedora may introduce Echo by default for KDE for a consistent look and feel across different desktop environments.</para>
+        </section><section id="sn-">
+          <title>Infrared remote support </title>
+          <para>New to Fedora 10 is the <programlisting format="linespecific">gnome-lirc-properties</programlisting> package with a new graphical front-end for configuring LIRC to use with applications supporting the protocol.  For more information refer to <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/Multimedia%23Infrared_remote_support">Docs/Beats/Multimedia#Infrared_remote_support</ulink>.</para><para>LIRC is routinely used in multimedia applications to implement support for infrared remote controls, and using it in <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> should be as easy as plugging the remote receiver into your computer, then selecting <emphasis>[Auto-detect]</emphasis> in the <emphasis>Infrared Remote Control</emphasis> preferences. Refer to the feature page for more information:</para><para>
+            <ulink url="https://fedoraproject.org/wiki/Features/BetterLIRCSupport">https://fedoraproject.org/wiki/Features/BetterLIRCSupport</ulink>
+          </para>
+        </section><section id="sn-">
+          <title>Bluetooth: BlueZ 4.0 </title>
+          <para>The Bluetooth support stack, called BlueZ (<ulink url="http://www.bluez.org),">http://www.bluez.org),</ulink> has been updated to version 4.x in Fedora 10. Most changes in this version are useful for application developers, but users can notice the new, easier to use wizard for setting up keyboards, mice, and other supported Bluetooth devices.  There is also the ability to turn-off the Bluetooth adapter on most brands of laptops through the preferences. This new version will also allow better support for audio devices in the future, through PulseAudio.</para><para>Note that the default Bluetooth kernel driver was also switched to <programlisting format="linespecific">btusb</programlisting>, which cuts down power consumption compared to its predecessor <programlisting format="linespecific">hci_usb</programlisting>.</para>
+        </section><section id="sn-">
+          <title>GNOME </title>
+          <para>This release features GNOME 2.24.  For more details refer to:</para>
+          <para>
+            <ulink url="http://www.gnome.org/start/2.24/">http://www.gnome.org/start/2.24/</ulink>
+          </para><section id="sn-">
+            <title>Empathy Instant Messenger </title>
+            <para>
+              <emphasis>Empathy</emphasis> instant messenger is the new default replacing <emphasis>Pidgin</emphasis> in this release. It has support for multiple protocols including IRC, XMPP(Jabber), Yahoo, MSN, and others via plugins. It also supports video and voice in the XMPP protocol, with support for other protocols under active development. Empathy uses the <programlisting format="linespecific">telepathy</programlisting> framework that has a number of additional plugins:</para><itemizedlist>
+              <listitem>
+                <para>
+                  <programlisting format="linespecific">telepathy-gabble</programlisting> - Jabber/XMPP lugin</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">telepathy-idle</programlisting> - IRC plugin</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">telepathy-butterfly</programlisting> - MSN plugin</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">telepathy-sofiasip</programlisting> - SIP plugin</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">telepathy-haze</programlisting> - Libpurple (Pidgin) library connection manager provides support for other protocols such as Yahoo</para>
+              </listitem>
+            </itemizedlist><para>
+              <emphasis>Pidgin</emphasis> continues to be available in the Fedora software repository and is retained as the default for users upgrading from previous releases of Fedora. </para>
+          </section><section id="sn-">
+            <title>GNOME Display Manager </title>
+            <para>The GNOME Display Manager (<programlisting format="linespecific">gdm</programlisting>) has been updated to the latest upstream code, which is a complete rewrite driven by Fedora developers. PolicyKit can be used to control shutdown and reboot.  The configuration tool <programlisting format="linespecific">gdmsetup</programlisting> is missing currently, and is set to be replaced. For configuration changes, refer to:</para><para>
+              <ulink url="http://live.gnome.org/GDM/2.22/Configuration">http://live.gnome.org/GDM/2.22/Configuration</ulink>
+            </para>
+          </section><section id="sn-">
+            <title>Codec installation helper </title>
+            <para>The GStreamer codec installation helper <programlisting format="linespecific">codeina</programlisting> was replaced by a PackageKit-based solution for Fedora 10. When Totem, Rhythmbox, or another GStreamer application require a plugin to read a film or song, a PackageKit dialogue appears, allowing the user to search for the necessary package in the configured repositories.</para><para>More details are available on the feature page:</para>
+            <para>
+              <ulink url="https://fedoraproject.org/wiki/Features/GStreamer_dependencies_in_RPM">https://fedoraproject.org/wiki/Features/GStreamer_dependencies_in_RPM</ulink>
+            </para>
+          </section>
+        </section><section id="sn-">
+          <title>KDE </title>
+          <para>This release features KDE 4.1.2. As the <programlisting format="linespecific">kdevelop</programlisting> packages is not part of KDE 4.1 and <programlisting format="linespecific">kdewebdev</programlisting> is only partially available (no <emphasis>Quanta</emphasis>) in KDE 4.1, the KDE 3.5.10 versions of those packages are shipped. A <programlisting format="linespecific">kdegames3</programlisting> package containing the games not yet ported to KDE 4 is also available.</para><para>
+            <ulink url="http://kde.org/announcements/announce-4.1.2.php">http://kde.org/announcements/announce-4.1.2.php</ulink>
+          </para><para>KDE 4.1 is the latest release of KDE 4 and
+          provides several new features, many usability improvements,
+          and bugfixes over KDE 4.0, the first KDE 4 release series.
+          This new release includes a folder view desktop applet
+          (<firstterm>plasmoid</firstterm>), improvements to <emphasis>Dolphin</emphasis> and <emphasis>Konqueror</emphasis> and many new and improved applications. KDE 4.1.2 is a bugfix release from the KDE 4.1 release series.</para><para>Fedora 10 does <emphasis>not</emphasis> include the legacy KDE 3 Desktop. It does include a compatibility KDE 3 Development Platform, which can be used to build and run KDE 3 applications within KDE 4 or any other desktop environment. Refer to the <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/BackwardsCompatibility">Docs/Beats/BackwardsCompatibility</ulink> section for more details about what is included.</para><para>Fedora 10 includes a snapshot of <programlisting format="linespecific">knetworkmanager</programlisting>, which works with the prerelease of <emphasis>NetworkManager</emphasis> 0.7 in Fedora 10. As it was not considered ready for production use, the KDE Live images use <programlisting format="linespecific">n
 m-applet</programlisting> from <programlisting format="linespecific">NetworkManager-gnome</programlisting> instead (as in Fedora 8 and 9). The <programlisting format="linespecific">gnome-keyring-daemon</programlisting> facility saves passwords for these encryption technologies. If you wish to try <programlisting format="linespecific">knetworkmanager</programlisting> can be installed from the repository.</para><para>As the native <emphasis>KWin</emphasis> window manager now optionally supports compositing and desktop effects, the KDE Live images no longer include <emphasis>Compiz/Beryl</emphasis> (since Fedora 9). The <emphasis>KWin</emphasis> compositing/effects mode is disabled by default, but can be enabled in <programlisting format="linespecific">systemsettings</programlisting>. <emphasis>Compiz</emphasis> (with KDE 4 integration) is available from the repository by installing the <programlisting format="linespecific">compiz-kde</programlisting> package.</para><section id
 ="sn-">
+            <title>Enhancements </title>
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <emphasis>Plasma</emphasis> is more mature and panel configuration has been extended. The new panel controller makes it easy to customize your panel providing direct visual feedback. The <emphasis>Plasma</emphasis> <command>folderview</command> applet provides a view of a directory and thus allows you to store files on the desktop. It is replaces other well known icons on the desktop.</para>
+              </listitem>
+            </itemizedlist>
+          </section><section id="sn-">
+            <title>Package and Application Changes </title>
+            <itemizedlist>
+              <listitem>
+                <para> Fedora 10 ships <programlisting format="linespecific">kdepim</programlisting> 4.1.2 instead of 3.5.x.</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">libkipi</programlisting>, <programlisting format="linespecific">libkexiv2</programlisting>, and <programlisting format="linespecific">libkdcraw</programlisting> have been obsoleted by the KDE 4 versions in the <programlisting format="linespecific">kdegraphics</programlisting> package. Accordingly, <programlisting format="linespecific">kipi-plugins</programlisting>, <programlisting format="linespecific">digikam</programlisting>, and <programlisting format="linespecific">kphotoalbum</programlisting> have been updated to KDE 4 versions.</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">kpackagekit</programlisting>, a KDE frontend to PackageKit, is now available. (It may be made available as an update for Fedora 9 at a later time.)</para>
+              </listitem>
+            </itemizedlist><para>In addition, the following changes made since the Fedora 9 release, which have been backported to Fedora 9 updates, are also part of Fedora 10: </para>
+            <itemizedlist>
+              <listitem>
+                <para> KDE has been upgraded from version 4.0.3 to 4.1.2.</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">qt</programlisting> and <programlisting format="linespecific">PyQt4</programlisting> have been upgraded from 4.3 to 4.4.</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">kdewebdev</programlisting>, <programlisting format="linespecific">kdevelop</programlisting>, <programlisting format="linespecific">kdegames3</programlisting>, and the KDE 3 backwards-compatibility libraries have been upgraded from KDE 3.5.9 to 3.5.10.</para>
+              </listitem><listitem>
+                <para>
+                  <emphasis>QtWebKit</emphasis> is now part of the <programlisting format="linespecific">qt</programlisting> package. The stand alone <programlisting format="linespecific">WebKit-qt</programlisting> package has been obsoleted.</para>
+              </listitem><listitem>
+                <para> The new package <programlisting format="linespecific">qgtkstyle</programlisting> contains a Qt 4 style using GTK+ for drawing, providing better integration of Qt 4 and KDE 4 applications into GNOME.</para>
+              </listitem><listitem>
+                <para> The <programlisting format="linespecific">phonon</programlisting> library, which was part of <programlisting format="linespecific">kdelibs</programlisting> in Fedora 9, is now a separate package. An optional <emphasis>GStreamer</emphasis> backend (<programlisting format="linespecific">phonon-backend-gstreamer</programlisting>) is now available, but the <emphasis>xine-lib</emphasis> backend, which is now packaged as <programlisting format="linespecific">phonon-backend-xine</programlisting>, is still the recommended default backend and is now required by the <programlisting format="linespecific">phonon</programlisting> package.</para>
+              </listitem><listitem>
+                <para> The <programlisting format="linespecific">kdegames3</programlisting> package no longer provides development support for the KDE 3 version of <programlisting format="linespecific">libkdegames</programlisting> because nothing in Fedora outside of <programlisting format="linespecific">kdegames3</programlisting> itself requires that library any longer.</para>
+              </listitem><listitem>
+                <para> The package <programlisting format="linespecific">okteta</programlisting> is now part of <programlisting format="linespecific">kdeutils</programlisting>.</para>
+              </listitem><listitem>
+                <para> The package <programlisting format="linespecific">dragonplayer</programlisting> is now part of <programlisting format="linespecific">kdemultimedia</programlisting>.</para>
+              </listitem><listitem>
+                <para> The program <programlisting format="linespecific">kaider</programlisting> has been renamed to <emphasis>Lokalize</emphasis> and is now part of <programlisting format="linespecific">kdesdk</programlisting>.</para>
+              </listitem><listitem>
+                <para> The package <programlisting format="linespecific">ksirk</programlisting> has been ported to KDE 4 and is now part of <programlisting format="linespecific">kdegames</programlisting>.</para>
+              </listitem><listitem>
+                <para> The package <programlisting format="linespecific">extragear-plasma</programlisting> has been renamed to <programlisting format="linespecific">kdeplasma-addons</programlisting>.</para>
+              </listitem>
+            </itemizedlist><para />
+          </section>
+        </section><section id="sn-">
+          <title>Sugar Desktop </title>
+          <para>The Sugar Desktop originated with the OLPC initiative. It allows for Fedora users and developers to do the following.</para>
+          <itemizedlist>
+            <listitem>
+              <para> Build upon the collaborative environment.</para>
+            </listitem><listitem>
+              <para> Test out Sugar on an existing Fedora system by selecting the Sugar environment from their display manager.</para>
+            </listitem><listitem>
+              <para> Developers interested in working on the Sugar interface or writing activities can have a development platform without needing an XO laptop. </para>
+            </listitem>
+          </itemizedlist>
+        </section><section id="sn-">
+          <title>Web Browsers </title>
+          <section id="sn-">
+            <title>Enabling Flash Plugin </title>
+            <para>Fedora includes <programlisting format="linespecific">swfdec</programlisting> and <programlisting format="linespecific">gnash</programlisting>, which are free and open source implementations of Flash.  We encourage you to try either of them before seeking out Adobe's proprietary Flash Player plug-in software. The Adobe Flash Player plug-in uses a legacy sound framework that does not work correctly without additional support. Run the following command to enable this support:</para><para />
+            <programlisting>
+su -c 'yum install libflashsupport'
+</programlisting>
+            <para />
+            <para>If you are using Flash 10, you do not need libflashsupport anymore as the usage of ALSA has been fixed in this version. </para>
+            <para>Users of Fedora x86_64 must install the <programlisting format="linespecific">nspluginwrapper.i386</programlisting> package to enable the 32-bit Adobe Flash Player plug-in in <emphasis>Firefox</emphasis>, and the <programlisting format="linespecific">libflashsupport.i386</programlisting> package to enable sound from the plug-in.</para><para>Install the <programlisting format="linespecific">nspluginwrapper.i386</programlisting>, <programlisting format="linespecific">nspluginwrapper.x86_64</programlisting>, and <programlisting format="linespecific">libflashsupport.i386</programlisting> packages:</para><para />
+            <programlisting>su -c 'yum install nspluginwrapper.{i386,x86_64} libflashsupport.i386'
+</programlisting>
+            <para />
+            <para>Install <programlisting format="linespecific">flash-plugin</programlisting> after <programlisting format="linespecific">nspluginwrapper.i386</programlisting> is installed:</para><para />
+            <programlisting>su -c 'yum install libflashsupport'
+</programlisting>
+            <para />
+            <para>Run <programlisting format="linespecific">mozilla-plugin-config</programlisting> to register the flash plugin:</para><para />
+            <programlisting>su -c "mozilla-plugin-config -i -g -v"
+</programlisting>
+            <para />
+            <para>Close all <emphasis>Firefox</emphasis> windows, and then relaunch <emphasis>Firefox</emphasis>. Type <emphasis>about:plugins</emphasis> in the URL bar to ensure the plugin is loaded.</para>
+          </section>
+        </section><section id="sn-">
+          <title>Disabling PC Speaker </title>
+          <para>PC speaker is enabled by default in Fedora.  If you do not prefer this, there are two ways to circumvent the sounds:</para>
+          <itemizedlist>
+            <listitem>
+              <para> Reduce its volume to a acceptable level or completely mute the PC speaker in <programlisting format="linespecific">alsamixer</programlisting> with the setting for <emphasis>PC Speak</emphasis>.</para>
+            </listitem>
+          </itemizedlist><itemizedlist>
+            <listitem>
+              <para> Disable the PC speaker system wide by running the following commands in a console.</para>
+            </listitem>
+          </itemizedlist><para />
+          <programlisting>
+su -c 'modprobe -r pcspkr'
+su -c 'echo "install pcspkr :" &gt;&gt; /etc/modprobe.conf'
+</programlisting>
+          <para />
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
diff --git a/en-US/Fedora_live_images.xml b/en-US/Fedora_live_images.xml
new file mode 100644
index 0000000..480ee8b
--- /dev/null
+++ b/en-US/Fedora_live_images.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Live</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Live</title>
+      <section id="sn-">
+        <title>Fedora Live Images </title>
+        <para>The Fedora 10 release includes several Fedora Live ISO images in addition to the traditional installation images.  These ISO images are bootable, and you can burn them to media and use them to try out Fedora.  They also include a feature that allows you to install the Fedora Live image content to your hard drive for persistence and higher performance. </para>
+        <section id="sn-">
+          <title>Available Images </title>
+          <para>For a complete list of current spins available, and instructions for using them, refer to:</para>
+          <para>
+            <ulink url="http://fedoraproject.org/wiki/CustomSpins">http://fedoraproject.org/wiki/CustomSpins</ulink>
+          </para>
+        </section><section id="sn-">
+          <title>Usage Information </title>
+          <para>To boot from the Fedora Live image, insert it into your computer and restart. To log in and use the desktop environment, enter the username <programlisting format="linespecific">fedora</programlisting>.  There is no password on this account.  The GNOME-based Fedora Live images automatically login after one minute, so users have time to select a preferred language. After logging in, if you wish to install the contents of the live image to your hard drive, click on the <emphasis>Install to Hard Drive</emphasis> icon on the desktop.</para>
+        </section><section id="sn-">
+          <title>Text Mode Installation </title>
+          <para>You can do a text mode installation of the Fedora Live images using the <programlisting format="linespecific">liveinst</programlisting> command in the console.</para>
+        </section><section id="sn-">
+          <title>USB Booting </title>
+          <para>Another way to use these Fedora Live images is to put them on a USB stick.  To do this, you can use liveusb-creator graphical interface. You can use Add/Remove software, search and install liveusb-creator or install using yum:</para>
+          <para />
+          <programlisting>
+su -c 'yum install liveusb-creator'
+</programlisting>
+          <para />
+          <para>You can also use the command line interface, install the <programlisting format="linespecific">livecd-tools</programlisting> package from the repository.  Then, run the <programlisting format="linespecific">livecd-iso-to-disk</programlisting> script:</para><para />
+          <programlisting>/usr/bin/livecd-iso-to-disk /path/to/live.iso /dev/sdb1
+</programlisting>
+          <para />
+          <para>Replace <emphasis>/dev/sdb1</emphasis> with the partition where you want to put the image.</para><para>This is <emphasis>not</emphasis> a destructive process; any data you currently have on your USB stick <emphasis>is preserved</emphasis>.</para>
+        </section><section id="sn-">
+          <title>Persistent Home Directory </title>
+          <para>Support for keeping a persistent <programlisting format="linespecific">/home</programlisting> with the rest of the system stateless has been added for Fedora 10.  This includes support for encrypting <programlisting format="linespecific">/home</programlisting> to protect your system in the case where your USB stick is lost or stolen.  To use this, download the live image and run the following command:</para><para />
+          <programlisting>livecd-iso-to-disk --home-size-mb 512 /path/to/live.iso /dev/sdb1
+</programlisting>
+          <para />
+          <para>Replace <programlisting format="linespecific">/dev/sdb1</programlisting> with the partition where you want to put the image.</para><para>Replace <programlisting format="linespecific">512</programlisting> with the desired size in megabytes of the persistent <programlisting format="linespecific">/home</programlisting>.  The <programlisting format="linespecific">livecd-iso-to-disk</programlisting> shell script is stored in the <programlisting format="linespecific">LiveOS</programlisting> directory at the top level of the CD image. The USB media must have sufficient free space for the Fedora Live image, plus the <programlisting format="linespecific">/home</programlisting>, plus any other data to be stored on the media.  By default, this encrypts your data and prompts for a passphrase to use.  If you want to have an unencrypted <programlisting format="linespecific">/home</programlisting>, then you can specify <programlisting format="linespecific">--unencrypted-hom
 e</programlisting>.</para><para>Note that later runs of <programlisting format="linespecific">livecd-iso-to-disk</programlisting> preserve the <programlisting format="linespecific">/home</programlisting> that is created on the USB stick, continuing to use it even if you change your live image.  </para>
+        </section><section id="sn-">
+          <title>Live USB Persistence </title>
+          <para>Support for persistent changes with a Fedora Live image exists for Fedora 9 and later. The primary use case is booting from a Fedora Live image on a USB flash drive and storing changes to that same device. To do this, download the Fedora Live image and then run the following command:</para>
+          <para />
+          <programlisting>livecd-iso-to-disk --overlay-size-mb 512 /path/to/live.iso /dev/sdb1
+</programlisting>
+          <para />
+          <para>Replace <programlisting format="linespecific">/dev/sdb1</programlisting> with the partition where you want to put the image.</para><para>Replace <programlisting format="linespecific">512</programlisting> with the desired size in megabytes of the persistent data, or <programlisting format="linespecific">overlay</programlisting>.  The <programlisting format="linespecific">livecd-iso-to-disk</programlisting> shell script is stored in the <programlisting format="linespecific">LiveOS</programlisting> directory at the top level of the CD image. The USB media must have sufficient free space for the Fedora Live image, plus the overlay, plus any other data to be stored on the media.</para>
+        </section><section id="sn-">
+          <title>Booting a Fedora Live Image Off of USB on Intel-based Apple Hardware </title>
+          <para>Fedora 10 includes support for putting the live image onto a USB image and then booting it on Intel processor-based Apple hardware.  Unlike for most x86 machines, this unfortunately requires reformatting the USB stick that you are using.  To set up a stick for this, you can run</para>
+          <para />
+          <programlisting>/usr/bin/livecd-iso-to-disk --mactel /path/to/live.iso /dev/sdb1
+</programlisting>
+          <para />
+          <para>Replace <programlisting format="linespecific">/dev/sdb1</programlisting> with the partition where you want to put the image.</para><para>Note that all of the other arguments for the <programlisting format="linespecific">livecd-iso-to-disk</programlisting> tool as described above can be used here as well.</para>
+        </section><section id="sn-">
+          <title>Differences From a Regular Fedora Install </title>
+          <para>The following items are different from a normal Fedora install with the Fedora Live images.</para>
+          <itemizedlist>
+            <listitem>
+              <para> Fedora Live images provide a subset of packages available in the regular DVD image. Both connect to the same repository that has all the packages.</para>
+            </listitem><listitem>
+              <para> The SSH daemon <programlisting format="linespecific">sshd</programlisting> is disabled by default. The daemon is disabled because the default username in the Fedora Live images does not have a password. However, installation to hard disk prompts for creating a new username and password.</para>
+            </listitem><listitem>
+              <para> Fedora Live image installations do not allow any package selection or upgrade capability since they copy the entire file system from media or USB disks to the hard disk. After the installation is complete, and your system has been rebooted, you can add and remove packages as desired with the <emphasis>Add/Remove Packages</emphasis> tool, <programlisting format="linespecific">yum</programlisting>, or the other software management tools.</para>
+            </listitem><listitem>
+              <para> Fedora Live images do not work on <programlisting format="linespecific">i586</programlisting> architecture.</para>
+            </listitem>
+          </itemizedlist>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Fedora_overview.xml b/en-US/Fedora_overview.xml
new file mode 100644
index 0000000..5ced28f
--- /dev/null
+++ b/en-US/Fedora_overview.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/OverView</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/OverView</title>
+      <section id="sn-">
+        <title>Fedora Overview </title>
+        <para>As always, Fedora continues to develop (<ulink url="http://www.fedoraproject.org/wiki/RedHatContributions)">http://www.fedoraproject.org/wiki/RedHatContributions)</ulink> and integrate the latest free and open source software (<ulink url="http://www.fedoraproject.org/wiki/Features).">http://www.fedoraproject.org/wiki/Features).</ulink> The following sections provide a brief overview of major changes from the last release of Fedora. For more details about other features that are included in Fedora 10, refer to their individual wiki pages that detail feature goals and progress:</para><para>
+          <ulink url="http://www.fedoraproject.org/wiki/Releases/10/FeatureList">http://www.fedoraproject.org/wiki/Releases/10/FeatureList</ulink>
+        </para><para>Throughout the release cycle, there are interviews with the developers behind key features giving out the inside story:</para>
+        <para>
+          <ulink url="http://www.fedoraproject.org/wiki/Interviews">http://www.fedoraproject.org/wiki/Interviews</ulink>
+        </para><para>The following are major features for Fedora 10:</para>
+        <itemizedlist>
+          <listitem>
+            <para> Wireless connection sharing enables ad hoc network sharing -- <ulink url="http://www.fedoraproject.org/wiki/Features/ConnectionSharing">http://www.fedoraproject.org/wiki/Features/ConnectionSharing</ulink>
+            </para>
+          </listitem><listitem>
+            <para> Better setup and use of printers through improved management tools -- <ulink url="http://www.fedoraproject.org/wiki/Features/BetterPrinting">http://www.fedoraproject.org/wiki/Features/BetterPrinting</ulink>
+            </para>
+          </listitem><listitem>
+            <para> Virtualization storage provisioning for local and remote connections now simplified -- <ulink url="http://www.fedoraproject.org/wiki/Features/VirtStorage">http://www.fedoraproject.org/wiki/Features/VirtStorage</ulink>
+            </para>
+          </listitem><listitem>
+            <para> SecTool is a new security audit and intrusion detections system -- <ulink url="http://www.fedoraproject.org/wiki/Features/SecurityAudit">http://www.fedoraproject.org/wiki/Features/SecurityAudit</ulink>
+            </para>
+          </listitem><listitem>
+            <para> RPM 4.6 is a major update to the powerful, flexible software management libraries -- <ulink url="http://www.fedoraproject.org/wiki/Features/RPM4.6">http://www.fedoraproject.org/wiki/Features/RPM4.6</ulink>
+            </para>
+          </listitem>
+        </itemizedlist><para>Some other features in this release include: </para>
+        <itemizedlist>
+          <listitem>
+            <para> Glitch free audio and better performance is achieved through a rewrite of the PulseAudio sound server to use timer-based audio scheduling -- <ulink url="http://www.fedoraproject.org/wiki/Features/GlitchFreeAudio">http://www.fedoraproject.org/wiki/Features/GlitchFreeAudio</ulink>
+            </para>
+          </listitem><listitem>
+            <para> Improved webcam support -- <ulink url="http://www.fedoraproject.org/wiki/Features/BetterWebcamSupport">http://www.fedoraproject.org/wiki/Features/BetterWebcamSupport</ulink>
+            </para>
+          </listitem><listitem>
+            <para> Better support for infrared remote controls makes them easier to connect and work with many applications -- <ulink url="http://www.fedoraproject.org/wiki/Features/BetterLIRCSupport">http://www.fedoraproject.org/wiki/Features/BetterLIRCSupport</ulink>
+            </para>
+          </listitem><listitem>
+            <para> The paths <programlisting format="linespecific">/usr/local/sbin:/usr/sbin:/sbin</programlisting> have been added to the PATH for normal users, to simplify command-line administration tasks -- <ulink url="http://fedoraproject.org/wiki/Features/SbinSanity">http://fedoraproject.org/wiki/Features/SbinSanity</ulink>
+            </para>
+          </listitem><listitem>
+            <para> The online account service provides applications with credentials for online accounts listed on <ulink url="http://online.gnome.org">http://online.gnome.org</ulink> or stored in GConf -- <ulink url="http://www.fedoraproject.org/wiki/Features/OnlineAccountsService">http://www.fedoraproject.org/wiki/Features/OnlineAccountsService</ulink>
+            </para>
+          </listitem>
+        </itemizedlist><para />
+        <para>Features for Fedora 10 tracked on the feature list page:</para>
+        <para>
+          <ulink url="http://www.fedoraproject.org/wiki/Releases/10/FeatureList">http://www.fedoraproject.org/wiki/Releases/10/FeatureList</ulink>
+        </para>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Feedback.xml b/en-US/Feedback.xml
index 8d1979f..6ef5241 100644
--- a/en-US/Feedback.xml
+++ b/en-US/Feedback.xml
@@ -6,16 +6,16 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Feedback</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/Feedback</title>
-      <section id="">
+      <section id="sn-">
         <title>Feedback</title>
         <para>Thank you for taking the time to provide your comments, suggestions, and bug reports to the Fedora community; this helps improve the state of Fedora, Linux, and free software worldwide.</para>
-        <section id="">
+        <section id="sn-">
           <title>Providing Feedback on Fedora Software </title>
           <para>To provide feedback on Fedora software or other system elements, please refer to <ulink url="http://fedoraproject.org/wiki/BugsAndFeatureRequests.">http://fedoraproject.org/wiki/BugsAndFeatureRequests.</ulink> A list of commonly reported bugs and known issues for this release is available from <ulink url="http://fedoraproject.org/wiki/Bugs/F10Common.">http://fedoraproject.org/wiki/Bugs/F10Common.</ulink>
           </para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Providing Feedback on Release Notes </title>
           <para>If you feel these release notes could be improved in any way, you can provide your feedback directly to the beat writers. There are several ways to provide feedback, in order of preference:</para>
           <itemizedlist>
diff --git a/en-US/File_Servers.xml b/en-US/File_Servers.xml
deleted file mode 100644
index ebe5999..0000000
--- a/en-US/File_Servers.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/FileServers</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/FileServers</title>
-      <section id="">
-        <title>File Servers </title>
-        <para>This section refers to file transfer and sharing servers. Refer to <ulink url="http://fedoraproject.org/wiki/Docs/Beats/WebServers">http://fedoraproject.org/wiki/Docs/Beats/WebServers</ulink> and <ulink url="http://fedoraproject.org/wiki/Docs/Beats/Samba">http://fedoraproject.org/wiki/Docs/Beats/Samba</ulink> for information on HTTP (Web) file transfer and Samba (Windows) file sharing services.</para><para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis>Maybe you know what should be on this page?</emphasis>
-              <literallayout>
-</literallayout>The Fedora release notes are a collective effort of dozens of people.  You can contribute by editing the wiki page that corresponds to this part of the release notes.</para>
-          </para>
-        </para><para>This section has not been updated for Fedora 10 by the beat writer (<ulink url="http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).">http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).</ulink>  If you have some ideas or knowledge of what should be in this part of the release notes, you are encouraged to edit the wiki directly.  Read <ulink url="https://fedoraproject.org/wiki/Docs/Beats/HowTo">https://fedoraproject.org/wiki/Docs/Beats/HowTo</ulink> for more information, then get an account and start writing.</para>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/File_Systems.xml b/en-US/File_Systems.xml
deleted file mode 100644
index 1e270e8..0000000
--- a/en-US/File_Systems.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/FileSystems</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/FileSystems</title>
-      <section id="">
-        <title>File Systems</title>
-        <section id="">
-          <title>eCryptfs</title>
-          <para> While Fedora 9 debuted encrypted fileystem support, F10 builds on that and fixes a number of problems that could have resulted in data corruption.</para>
-        </section><section id="">
-          <title>EXT4</title>
-          <para> Fedora 9 debuted a preview of ext4 support. F10 brings a fully ext4-compatible e2fsprogs. In addition Anaconda's partition screen has an ext4 filesystem option available if you launch the installer with the ext4 option. Fedora 10 also brings delayed allocation for ext4. However, ext4 in Fedora 10 doesn't currently support filesystems larger than 16 terabytes.</para>
-        </section><section id="">
-          <title>XFS</title>
-          <para>XFS is now a supported filesystem and an option with the the partitioning screen of Anaconda</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/File_servers.xml b/en-US/File_servers.xml
new file mode 100644
index 0000000..7d1a4f4
--- /dev/null
+++ b/en-US/File_servers.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/FileServers</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/FileServers</title>
+      <section id="sn-">
+        <title>File Servers </title>
+        <para>This section refers to file transfer and sharing servers. Refer to <ulink url="http://fedoraproject.org/wiki/Docs/Beats/WebServers">http://fedoraproject.org/wiki/Docs/Beats/WebServers</ulink> and <ulink url="http://fedoraproject.org/wiki/Docs/Beats/Samba">http://fedoraproject.org/wiki/Docs/Beats/Samba</ulink> for information on HTTP (Web) file transfer and Samba (Windows) file sharing services.</para><para>
+          <para>
+            <para>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
+                </imageobject><caption>
+                  <para />
+                </caption>
+              </inlinemediaobject>
+            </para><para>
+              <emphasis>Maybe you know what should be on this page?</emphasis>
+              <literallayout>
+</literallayout>The Fedora release notes are a collective effort of dozens of people.  You can contribute by editing the wiki page that corresponds to this part of the release notes.</para>
+          </para>
+        </para><para>This section has not been updated for Fedora 10 by the beat writer (<ulink url="http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).">http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).</ulink>  If you have some ideas or knowledge of what should be in this part of the release notes, you are encouraged to edit the wiki directly.  Read <ulink url="https://fedoraproject.org/wiki/Docs/Beats/HowTo">https://fedoraproject.org/wiki/Docs/Beats/HowTo</ulink> for more information, then get an account and start writing.</para>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/File_systems.xml b/en-US/File_systems.xml
new file mode 100644
index 0000000..010fd1a
--- /dev/null
+++ b/en-US/File_systems.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/FileSystems</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/FileSystems</title>
+      <section id="sn-">
+        <title>File Systems</title>
+        <section id="sn-">
+          <title>eCryptfs</title>
+          <para> While Fedora 9 debuted encrypted fileystem support, F10 builds on that and fixes a number of problems that could have resulted in data corruption.</para>
+        </section><section id="sn-">
+          <title>EXT4</title>
+          <para> Fedora 9 debuted a preview of ext4 support. F10 brings a fully ext4-compatible e2fsprogs. In addition Anaconda's partition screen has an ext4 filesystem option available if you launch the installer with the ext4 option. Fedora 10 also brings delayed allocation for ext4. However, ext4 in Fedora 10 doesn't currently support filesystems larger than 16 terabytes.</para>
+        </section><section id="sn-">
+          <title>XFS</title>
+          <para>XFS is now a supported filesystem and an option with the the partitioning screen of Anaconda</para>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Games_and_Entertainment_.xml b/en-US/Games_and_Entertainment_.xml
deleted file mode 100644
index 33de835..0000000
--- a/en-US/Games_and_Entertainment_.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Entertainment</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Entertainment</title>
-      <section id="">
-        <title>Games and Entertainment </title>
-        <para>Fedora provides a selection of games that cover a variety of genres.  Users can install a small package of games for GNOME (<programlisting format="linespecific">gnome-games</programlisting>) and KDE (<programlisting format="linespecific">kdegames</programlisting>).  There are also many additional games that span every major genre available in the repositories.</para><para>The Fedora Project website features a section dedicated to games that details many of the available games, including overviews and installation instructions.  For more information, refer to:</para>
-        <para>
-          <ulink url="http://fedoraproject.org/wiki/Games">http://fedoraproject.org/wiki/Games</ulink>
-        </para><para>For a list of other games that are available for installation, select <emphasis>Applications &gt; Add/Remove Software</emphasis>, or via the command line:</para><para />
-        <programlisting> yum groupinfo "Games and Entertainment"</programlisting>
-        <para />
-        <para>For help using <programlisting format="linespecific">yum</programlisting> to install the assorted game packages, refer to the guide available at:</para><para>
-          <ulink url="http://docs.fedoraproject.org/yum/">http://docs.fedoraproject.org/yum/</ulink>
-        </para>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Games_and_entertainment.xml b/en-US/Games_and_entertainment.xml
new file mode 100644
index 0000000..a749875
--- /dev/null
+++ b/en-US/Games_and_entertainment.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Entertainment</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Entertainment</title>
+      <section id="sn-">
+        <title>Games and Entertainment </title>
+        <para>Fedora provides a selection of games that cover a variety of genres.  Users can install a small package of games for GNOME (<programlisting format="linespecific">gnome-games</programlisting>) and KDE (<programlisting format="linespecific">kdegames</programlisting>).  There are also many additional games that span every major genre available in the repositories.</para><para>The Fedora Project website features a section dedicated to games that details many of the available games, including overviews and installation instructions.  For more information, refer to:</para>
+        <para>
+          <ulink url="http://fedoraproject.org/wiki/Games">http://fedoraproject.org/wiki/Games</ulink>
+        </para><para>For a list of other games that are available for installation, select <emphasis>Applications &gt; Add/Remove Software</emphasis>, or via the command line:</para><para />
+        <programlisting> yum groupinfo "Games and Entertainment"</programlisting>
+        <para />
+        <para>For help using <programlisting format="linespecific">yum</programlisting> to install the assorted game packages, refer to the guide available at:</para><para>
+          <ulink url="http://docs.fedoraproject.org/yum/">http://docs.fedoraproject.org/yum/</ulink>
+        </para>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Hardware_Overview.xml b/en-US/Hardware_Overview.xml
deleted file mode 100644
index 11a19b3..0000000
--- a/en-US/Hardware_Overview.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/HardwareOverview</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/HardwareOverview</title>
-      <section id="">
-        <title>Hardware Overview </title>
-        <para>Users often request that Fedora provide a <emphasis>hardware compatibility list</emphasis>, which we have carefully avoided doing.  Why?  It is a difficult and thankless task that is best handled by the community at large than by one little Linux distribution.</para><para>However, because of our stance against closed-source hardware drivers and the problems of binary firmware for hardware, there is some additional information the Fedora Project wants to provide Fedora users.</para>
-        <section id="">
-          <title>Useful hardware information in these release notes </title>
-          <itemizedlist>
-            <listitem>
-              <para> For 32-bit x86 - <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/ArchSpecific/x86"> Docs/Beats/ArchSpecific/x86</ulink>
-              </para>
-            </listitem><listitem>
-              <para> For 64-bit x86 - <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/ArchSpecific/x86_64"> Docs/Beats/ArchSpecific/x86_64</ulink>
-              </para>
-            </listitem><listitem>
-              <para> For PowerPC - <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/ArchSpecific/PPC"> Docs/Beats/ArchSpecific/PPC</ulink>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Hardware stance </title>
-          <para>From <ulink url="http://fedoraproject.org/wiki/ForbiddenItems">[1]</ulink> :</para><itemizedlist>
-            <listitem>
-              <para> If it is proprietary, it cannot be included in Fedora.</para>
-            </listitem><listitem>
-              <para> If it is legally encumbered, it cannot be included in Fedora.</para>
-            </listitem><listitem>
-              <para> If it violates United States federal law, it cannot be included in Fedora.</para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>What can you do? </title>
-          <para>1. Get active.  Tell your hardware vendors you only want free, open source drivers and firmware 1. Use your buying power and only purchase from hardware vendors that support their hardware with open drivers and firmware.  Refer to <ulink url="http://www.fsf.org/campaigns/hardware.html">http://www.fsf.org/campaigns/hardware.html</ulink> for more information.</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Hardware_overview.xml b/en-US/Hardware_overview.xml
new file mode 100644
index 0000000..49c5bf8
--- /dev/null
+++ b/en-US/Hardware_overview.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/HardwareOverview</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/HardwareOverview</title>
+      <section id="sn-">
+        <title>Hardware Overview </title>
+        <para>Users often request that Fedora provide a <emphasis>hardware compatibility list</emphasis>, which we have carefully avoided doing.  Why?  It is a difficult and thankless task that is best handled by the community at large than by one little Linux distribution.</para><para>However, because of our stance against closed-source hardware drivers and the problems of binary firmware for hardware, there is some additional information the Fedora Project wants to provide Fedora users.</para>
+        <section id="sn-">
+          <title>Useful hardware information in these release notes </title>
+          <itemizedlist>
+            <listitem>
+              <para> For 32-bit x86 - <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/ArchSpecific/x86"> Docs/Beats/ArchSpecific/x86</ulink>
+              </para>
+            </listitem><listitem>
+              <para> For 64-bit x86 - <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/ArchSpecific/x86_64"> Docs/Beats/ArchSpecific/x86_64</ulink>
+              </para>
+            </listitem><listitem>
+              <para> For PowerPC - <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/ArchSpecific/PPC"> Docs/Beats/ArchSpecific/PPC</ulink>
+              </para>
+            </listitem>
+          </itemizedlist>
+        </section><section id="sn-">
+          <title>Hardware stance </title>
+          <para>From <ulink url="http://fedoraproject.org/wiki/ForbiddenItems">[1]</ulink> :</para><itemizedlist>
+            <listitem>
+              <para> If it is proprietary, it cannot be included in Fedora.</para>
+            </listitem><listitem>
+              <para> If it is legally encumbered, it cannot be included in Fedora.</para>
+            </listitem><listitem>
+              <para> If it violates United States federal law, it cannot be included in Fedora.</para>
+            </listitem>
+          </itemizedlist>
+        </section><section id="sn-">
+          <title>What can you do? </title>
+          <para>1. Get active.  Tell your hardware vendors you only want free, open source drivers and firmware 1. Use your buying power and only purchase from hardware vendors that support their hardware with open drivers and firmware.  Refer to <ulink url="http://www.fsf.org/campaigns/hardware.html">http://www.fsf.org/campaigns/hardware.html</ulink> for more information.</para>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Installation_Notes.xml b/en-US/Installation_Notes.xml
deleted file mode 100644
index 8234731..0000000
--- a/en-US/Installation_Notes.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Installer</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Installer</title>
-      <section id="">
-        <title>Installation Notes </title>
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis> To learn how to install Fedora, refer to <ulink url="http://docs.fedoraproject.org/install-guide/.">http://docs.fedoraproject.org/install-guide/.</ulink>
-              </emphasis><literallayout>
-</literallayout>If you encounter a problem or have a question during installation that is not covered in these release notes, refer to <ulink url="http://www.fedoraproject.org/wiki/FAQ">http://www.fedoraproject.org/wiki/FAQ</ulink> and <ulink url="http://www.fedoraproject.org/wiki/Bugs/Common.">http://www.fedoraproject.org/wiki/Bugs/Common.</ulink>
-            </para>
-          </para>
-        </para><para>
-          <emphasis>Anaconda</emphasis> is the name of the Fedora installer. This section outlines issues related to <emphasis>Anaconda</emphasis> and installing Fedora 10.</para><section id="">
-          <title>Installation media </title>
-          <para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis> If you intend to download the Fedora DVD ISO image, keep in mind that not all file downloading tools can accommodate files larger than 2 GiB in size. </emphasis>
-                <literallayout>
-</literallayout>The programs <programlisting format="linespecific">wget</programlisting> 1.9.1-16 and above, <programlisting format="linespecific">curl</programlisting>, and <programlisting format="linespecific">ncftpget</programlisting> do not have this limitation, and can successfully download files larger than 2 GiB. BitTorrent is another method for downloading large files. For information about obtaining and using the torrent file, refer to <ulink url="http://torrent.fedoraproject.org/.">http://torrent.fedoraproject.org/.</ulink>
-              </para>
-            </para>
-          </para><para>
-            <emphasis>Anaconda</emphasis> asks if it should verify the installation medium when <emphasis>Install or upgrade an existing system</emphasis> is selected during boot from an installation-only media.</para><para>For Fedora Live media, press any key during the initial boot countdown, bringing up a boot option menu.  Select <emphasis>Verify and boot</emphasis> to perform the media test. The pure installation medium can be used to verify a Fedora Live medium. <emphasis>Anaconda</emphasis> asks during the mediacheck if you want to check any other disc than the one <emphasis>Anaconda</emphasis>' is running from.  To test another media, select <programlisting format="linespecific">eject</programlisting> to eject the inserted medium, then replace it with the medium you want to test instead.</para><para>Perform this test everytime after you create or receive a new installation or live medium.</para>
-          <para>The Fedora Project strongly recommends that you perform this test before reporting any installation-related bugs. Many of the bugs reported are actually due to improperly-burned CD or DVDs.</para>
-          <para>In rare cases, the testing procedure may report some usable discs as faulty. This result is often caused by disc writing software that does not include padding when creating discs from ISO files.</para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis> BitTorrent Automatically Verifies File Integrity.</emphasis>
-                <literallayout>
-</literallayout>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, you should still use <programlisting format="linespecific">mediacheck</programlisting> to test the integrity of the media.</para>
-            </para>
-          </para><para>Another reason for a failure during installation is faulty memory. To perform memory testing before you install Fedora, press any key to enter the boot menu, then select <emphasis>Memory Test</emphasis>. This option runs the <emphasis>Memtest86</emphasis> standalone memory testing software in place of <emphasis>Anaconda</emphasis>. <emphasis>Memtest86</emphasis> memory testing continues until you press the <emphasis>[Esc]</emphasis> key.</para><para>Fedora 10 supports graphical FTP and HTTP installations. However, the installer image must either fit in RAM or appear on local storage, such as the installation DVD or Live Media. Therefore, only systems with more than 192MiB of RAM or that boot from the installation DVD or Live Media can use the graphical installer. Systems with 192MiB RAM or less fall back to using the text-based installer automatically. If you prefer to use the text-based installer, type <programlisting format="linespecific">linux text<
 /programlisting> at the <programlisting format="linespecific">boot:</programlisting> prompt.</para>
-        </section><section id="">
-          <title>Changes in Anaconda </title>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <ulink url="http://www.fedoraproject.org/wiki/Anaconda/Features/NetConfigForNM"> NetConfig in NM</ulink> -- Anaconda is now using NetworkManager for configuring network interfaces during installation.  The previous backend tool was <programlisting format="linespecific">libdhcp</programlisting> (which was a replacement for <programlisting format="linespecific">libpump</programlisting>). Anaconda uses NetworkManager by communicating with it via D-Bus during installation. The move to NetworkManager in Anaconda is still ongoing and some things are not yet 100% functional, but the bulk of existing functionality has been retained. NetworkManager is enabled by default on newly installed systems, so moving to NetworkManager in Anaconda allows the installer to use the same network management tool that the final system uses. The move to NetworkManager brings some changes, most notably the removal of the network interface configuration screen in Anaconda. You are no lon
 ger asked to verify the network settings during installation. The screen now simply prompts for the hostname. The settings used during installation are written to the system.</para>
-            </listitem>
-          </itemizedlist><itemizedlist>
-            <listitem>
-              <para> When using the <programlisting format="linespecific">netinst.iso</programlisting> to boot the installer, Anaconda defaults to using the Fedora mirrorlist URL as the installation source. The method selection screen no longer appears by default. If you do not wish to use the mirrorlist URL, either add <programlisting format="linespecific">repo=&lt;your installation source&gt;</programlisting> or add <programlisting format="linespecific">askmethod</programlisting> to the installer boot parameters. The <programlisting format="linespecific">askmethod</programlisting> option causes the selection screen to appear as it did in previous releases. Boot parameters can be added by pressing the <emphasis>[Tab]</emphasis> key in the initial boot screen and appending your new parameters to the existing list. For more information, see the <programlisting format="linespecific">repo=</programlisting> and <programlisting format="linespecific">stage2=</programlisting> descr
 iptions at <ulink url="http://fedoraproject.org/wiki/Anaconda/Options">http://fedoraproject.org/wiki/Anaconda/Options</ulink>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Installation Related Issues </title>
-          <itemizedlist>
-            <listitem>
-              <para> When PXE booting and using a .iso file for the installation media via NFS you are now required to add method=nfsiso:server:/path to the command line.</para>
-            </listitem>
-          </itemizedlist><section id="">
-            <title>IDE device names </title>
-            <para>Use of <programlisting format="linespecific">/dev/hdX</programlisting> on i386 and x86_64 for IDE drives changed to <programlisting format="linespecific">/dev/sdX</programlisting> in Fedora 7.  If you are upgrading from an earlier version than Fedora 7, you need to research about the importance of labeling devices for upgrades and any partition limitations.</para>
-          </section><section id="">
-            <title>IDE RAID </title>
-            <para>Not all IDE RAID controllers are supported. If your RAID controller is not yet supported by <programlisting format="linespecific">dmraid</programlisting>, you may combine drives into RAID arrays by configuring Linux software RAID. For supported controllers, configure the RAID functions in the computer BIOS.</para>
-          </section><section id="">
-            <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 <programlisting format="linespecific">pxelinux.cfg/*</programlisting> config files:</para><para />
-            <programlisting>IPAPPEND 2
-APPEND ksdevice=bootif
-</programlisting>
-            <para />
-            <para>The configuration options above causes the installer to use the same network interface as BIOS and PXE use. You can also use the following option: </para>
-            <programlisting>ksdevice=link
-</programlisting>
-            <para />
-            <para>This option causes the installer to use the first network device it finds that is linked to a network switch.</para>
-          </section>
-        </section><section id="">
-          <title>Upgrade related issues </title>
-          <para>Refer to <ulink url="http://fedoraproject.org/wiki/DistributionUpgrades">http://fedoraproject.org/wiki/DistributionUpgrades</ulink> for detailed recommended procedures for upgrading Fedora.</para><section id="">
-            <title>SCSI driver partition limits </title>
-            <para>Whereas older IDE drivers supported up to 63 partitions per device, SCSI devices are limited to 15 partitions per device. <emphasis>Anaconda</emphasis> uses the <programlisting format="linespecific">libata</programlisting> driver in the same fashion as the rest of Fedora, so it is unable to detect more than 15 partitions on an IDE disk during the installation or upgrade process.</para><para>If you are upgrading a system with more than 15 partitions, you may need to migrate the disk to Logical Volume Management (LVM). This restriction may cause conflicts with other installed systems if they do not support LVM. Most modern Linux distributions support LVM and drivers are available for other operating systems as well.</para>
-          </section><section id="">
-            <title>Disk partitions must be labeled </title>
-            <para>A change in the way that the linux kernel handles storage devices means that device names like <programlisting format="linespecific">/dev/hdX</programlisting> or <programlisting format="linespecific">/dev/sdX</programlisting> may differ from the values used in earlier releases. <emphasis>Anaconda</emphasis> solves this problem by relying on partition labels or UUIDs for finding devices. If these are not present, then <emphasis>Anaconda</emphasis> presents a warning indicating that partitions need to be labelled and that the upgrade can not proceed. Systems that use Logical Volume Management (LVM) and the device mapper usually do not require relabeling.</para><section id="">
-              <title>To check disk partition labels </title>
-              <para>To view partition labels, boot the existing Fedora installation, and enter the following at a terminal prompt: </para>
-              <programlisting>/sbin/blkid
-</programlisting>
-              <para> Confirm that each volume line in the list has a <programlisting format="linespecific">LABEL=</programlisting> value, as shown below: </para><programlisting>/dev/hdd1: LABEL="/boot" UUID="ec6a9d6c-6f05-487e-a8bd-a2594b854406" SEC_TYPE="ext2" TYPE="ext3"
-</programlisting>
-              <para />
-            </section><section id="">
-              <title>To set disk partition labels </title>
-              <para>For ext2 and ext3 partitions without a label, use the following command: </para>
-              <programlisting>su -c 'e2label /dev/example f7-slash'
-</programlisting>
-              <para> For a VFAT filesystem use <programlisting format="linespecific">dosfslabel</programlisting> from the <programlisting format="linespecific">dosfstools</programlisting> package, and for NTFS filesystem use <programlisting format="linespecific">ntfslabel</programlisting> from the <programlisting format="linespecific">ntfsprogs</programlisting> package.  Before rebooting the machine, also update the file system mount entries, and the GRUB kernel root entry.</para>
-            </section><section id="">
-              <title>Update the file system mount entries </title>
-              <para>If any filesystem labels were added or modified, then the device entries in <programlisting format="linespecific">/etc/fstab</programlisting> must be adjusted to match: </para><programlisting>su -c 'cp /etc/fstab /etc/fstab.orig'
-su -c 'gedit /etc/fstab'
-</programlisting>
-              <para> An example of a mount by label entry is: </para>
-              <programlisting> LABEL=f7-slash  /  ext3  defaults  1 1
-</programlisting>
-              <para />
-            </section><section id="">
-              <title>Update the grub.conf kernel root entry </title>
-              <para>If the label for the / (root) filesystem was modified, the kernel boot parameter in the grub configuration file must also be modified: </para>
-              <programlisting>su -c 'gedit /boot/grub/grub.conf'
-</programlisting>
-              <para> A matching example kernel grub line is: </para>
-              <programlisting> kernel /vmlinuz-2.6.20-1.2948.fc6 ro root=LABEL=f7-slash rhgb quiet
-</programlisting>
-              <para />
-            </section><section id="">
-              <title>Test changes made to labels </title>
-              <para>If partition labels were adjusted, or the <programlisting format="linespecific">/etc/fstab</programlisting> file modified, then boot the existing Fedora installation to confirm that all partitions still mount normally and login is successful. When complete, reboot with the installation media to start the installer and begin the upgrade.</para>
-            </section>
-          </section><section id="">
-            <title>Upgrades versus fresh installations </title>
-            <para>In general, fresh installations are recommended over upgrades. This is particularly true for systems that include software from third-party repositories. Third-party packages remaining from a previous installation may not work as expected on an upgraded Fedora system. If you decide to perform an upgrade anyway, the following information may be helpful:</para>
-            <para>Before you upgrade, back up the system completely. In particular, preserve <programlisting format="linespecific">/etc</programlisting>, <programlisting format="linespecific">/home</programlisting>, and possibly <programlisting format="linespecific">/opt</programlisting> and <programlisting format="linespecific">/usr/local</programlisting> if customized packages are installed there. You may want to use a multi-boot approach with a "clone" of the old installation on alternate partition(s) as a fallback. In that case, create alternate boot media, such as a GRUB boot floppy.</para><para>
-              <para>
-                <para>
-                  <inlinemediaobject>
-                    <imageobject>
-                      <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
-                    </imageobject><caption>
-                      <para />
-                    </caption>
-                  </inlinemediaobject>
-                </para><para>
-                  <emphasis> Backups of configurations in <programlisting format="linespecific">/etc</programlisting> are also useful in reconstructing system settings after a fresh installation.</emphasis><literallayout>
-</literallayout>
-                </para>
-              </para>
-            </para><para>After you complete the upgrade, run the following command:</para>
-            <para />
-            <programlisting>rpm -qa --last &gt; RPMS_by_Install_Time.txt
-</programlisting>
-            <para />
-            <para>Inspect the end of the output for packages that pre-date the upgrade. Remove or upgrade those packages from third-party repositories, or otherwise deal with them as necessary. Some previously installed packages may no longer be available in any configured repository. To list all these packages, use the following command: </para>
-            <programlisting>su -c 'yum list extras'
-</programlisting>
-            <para />
-          </section>
-        </section><section id="">
-          <title>Kickstart HTTP Issue </title>
-          <para> When using a Kickstart configuration file via HTTP, kickstart file retrieval may fail with an error that indicates the file could not be retrieved. Click the <emphasis>OK</emphasis> button several times without making modifications to override this error successfully. As a workaround, use one of the other supported methods to retrieve Kickstart configurations.</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
diff --git a/en-US/Installation_notes.xml b/en-US/Installation_notes.xml
new file mode 100644
index 0000000..ecf2a80
--- /dev/null
+++ b/en-US/Installation_notes.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Installer</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Installer</title>
+      <section id="sn-">
+        <title>Installation Notes </title>
+        <para>
+          <para>
+            <para>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
+                </imageobject><caption>
+                  <para />
+                </caption>
+              </inlinemediaobject>
+            </para><para>
+              <emphasis> To learn how to install Fedora, refer to <ulink url="http://docs.fedoraproject.org/install-guide/.">http://docs.fedoraproject.org/install-guide/.</ulink>
+              </emphasis><literallayout>
+</literallayout>If you encounter a problem or have a question during installation that is not covered in these release notes, refer to <ulink url="http://www.fedoraproject.org/wiki/FAQ">http://www.fedoraproject.org/wiki/FAQ</ulink> and <ulink url="http://www.fedoraproject.org/wiki/Bugs/Common.">http://www.fedoraproject.org/wiki/Bugs/Common.</ulink>
+            </para>
+          </para>
+        </para><para>
+          <emphasis>Anaconda</emphasis> is the name of the Fedora installer. This section outlines issues related to <emphasis>Anaconda</emphasis> and installing Fedora 10.</para><section id="sn-">
+          <title>Installation media </title>
+          <para>
+            <para>
+              <para>
+                <inlinemediaobject>
+                  <imageobject>
+                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                  </imageobject><caption>
+                    <para />
+                  </caption>
+                </inlinemediaobject>
+              </para><para>
+                <emphasis> If you intend to download the Fedora DVD ISO image, keep in mind that not all file downloading tools can accommodate files larger than 2 GiB in size. </emphasis>
+                <literallayout>
+</literallayout>The programs <programlisting format="linespecific">wget</programlisting> 1.9.1-16 and above, <programlisting format="linespecific">curl</programlisting>, and <programlisting format="linespecific">ncftpget</programlisting> do not have this limitation, and can successfully download files larger than 2 GiB. BitTorrent is another method for downloading large files. For information about obtaining and using the torrent file, refer to <ulink url="http://torrent.fedoraproject.org/.">http://torrent.fedoraproject.org/.</ulink>
+              </para>
+            </para>
+          </para><para>
+            <emphasis>Anaconda</emphasis> asks if it should verify the installation medium when <emphasis>Install or upgrade an existing system</emphasis> is selected during boot from an installation-only media.</para><para>For Fedora Live media, press any key during the initial boot countdown, bringing up a boot option menu.  Select <emphasis>Verify and boot</emphasis> to perform the media test. The pure installation medium can be used to verify a Fedora Live medium. <emphasis>Anaconda</emphasis> asks during the mediacheck if you want to check any other disc than the one <emphasis>Anaconda</emphasis>' is running from.  To test another media, select <programlisting format="linespecific">eject</programlisting> to eject the inserted medium, then replace it with the medium you want to test instead.</para><para>Perform this test everytime after you create or receive a new installation or live medium.</para>
+          <para>The Fedora Project strongly recommends that you perform this test before reporting any installation-related bugs. Many of the bugs reported are actually due to improperly-burned CD or DVDs.</para>
+          <para>In rare cases, the testing procedure may report some usable discs as faulty. This result is often caused by disc writing software that does not include padding when creating discs from ISO files.</para>
+              <para>
+                <inlinemediaobject>
+                  <imageobject>
+                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                  </imageobject><caption>
+                    <para />
+                  </caption>
+                </inlinemediaobject>
+              </para><para>
+                <emphasis> BitTorrent Automatically Verifies File Integrity.</emphasis>
+                <literallayout>
+</literallayout>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, you should still use <programlisting format="linespecific">mediacheck</programlisting> to test the integrity of the media.</para>
+            </para>
+          </para><para>Another reason for a failure during installation is faulty memory. To perform memory testing before you install Fedora, press any key to enter the boot menu, then select <emphasis>Memory Test</emphasis>. This option runs the <emphasis>Memtest86</emphasis> standalone memory testing software in place of <emphasis>Anaconda</emphasis>. <emphasis>Memtest86</emphasis> memory testing continues until you press the <emphasis>[Esc]</emphasis> key.</para><para>Fedora 10 supports graphical FTP and HTTP installations. However, the installer image must either fit in RAM or appear on local storage, such as the installation DVD or Live Media. Therefore, only systems with more than 192MiB of RAM or that boot from the installation DVD or Live Media can use the graphical installer. Systems with 192MiB RAM or less fall back to using the text-based installer automatically. If you prefer to use the text-based installer, type <programlisting format="linespecific">linux text<
 /programlisting> at the <programlisting format="linespecific">boot:</programlisting> prompt.</para>
+        </section><section id="sn-">
+          <title>Changes in Anaconda </title>
+          <itemizedlist>
+            <listitem>
+              <para>
+                <ulink url="http://www.fedoraproject.org/wiki/Anaconda/Features/NetConfigForNM"> NetConfig in NM</ulink> -- Anaconda is now using NetworkManager for configuring network interfaces during installation.  The previous backend tool was <programlisting format="linespecific">libdhcp</programlisting> (which was a replacement for <programlisting format="linespecific">libpump</programlisting>). Anaconda uses NetworkManager by communicating with it via D-Bus during installation. The move to NetworkManager in Anaconda is still ongoing and some things are not yet 100% functional, but the bulk of existing functionality has been retained. NetworkManager is enabled by default on newly installed systems, so moving to NetworkManager in Anaconda allows the installer to use the same network management tool that the final system uses. The move to NetworkManager brings some changes, most notably the removal of the network interface configuration screen in Anaconda. You are no lon
 ger asked to verify the network settings during installation. The screen now simply prompts for the hostname. The settings used during installation are written to the system.</para>
+            </listitem>
+          </itemizedlist><itemizedlist>
+            <listitem>
+              <para> When using the <programlisting format="linespecific">netinst.iso</programlisting> to boot the installer, Anaconda defaults to using the Fedora mirrorlist URL as the installation source. The method selection screen no longer appears by default. If you do not wish to use the mirrorlist URL, either add <programlisting format="linespecific">repo=&lt;your installation source&gt;</programlisting> or add <programlisting format="linespecific">askmethod</programlisting> to the installer boot parameters. The <programlisting format="linespecific">askmethod</programlisting> option causes the selection screen to appear as it did in previous releases. Boot parameters can be added by pressing the <emphasis>[Tab]</emphasis> key in the initial boot screen and appending your new parameters to the existing list. For more information, see the <programlisting format="linespecific">repo=</programlisting> and <programlisting format="linespecific">stage2=</programlisting> descr
 iptions at <ulink url="http://fedoraproject.org/wiki/Anaconda/Options">http://fedoraproject.org/wiki/Anaconda/Options</ulink>
+              </para>
+            </listitem>
+          </itemizedlist>
+        </section><section id="sn-">
+          <title>Installation Related Issues </title>
+          <itemizedlist>
+            <listitem>
+              <para> When PXE booting and using a .iso file for the installation media via NFS you are now required to add method=nfsiso:server:/path to the command line.</para>
+            </listitem>
+          </itemizedlist><section id="sn-">
+            <title>IDE device names </title>
+            <para>Use of <programlisting format="linespecific">/dev/hdX</programlisting> on i386 and x86_64 for IDE drives changed to <programlisting format="linespecific">/dev/sdX</programlisting> in Fedora 7.  If you are upgrading from an earlier version than Fedora 7, you need to research about the importance of labeling devices for upgrades and any partition limitations.</para>
+          </section><section id="sn-">
+            <title>IDE RAID </title>
+            <para>Not all IDE RAID controllers are supported. If your RAID controller is not yet supported by <programlisting format="linespecific">dmraid</programlisting>, you may combine drives into RAID arrays by configuring Linux software RAID. For supported controllers, configure the RAID functions in the computer BIOS.</para>
+          </section><section id="sn-">
+            <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 <programlisting format="linespecific">pxelinux.cfg/*</programlisting> config files:</para><para />
+            <programlisting>IPAPPEND 2
+APPEND ksdevice=bootif
+</programlisting>
+            <para />
+            <para>The configuration options above causes the installer to use the same network interface as BIOS and PXE use. You can also use the following option: </para>
+            <programlisting>ksdevice=link
+</programlisting>
+            <para />
+            <para>This option causes the installer to use the first network device it finds that is linked to a network switch.</para>
+          </section>
+        </section><section id="sn-">
+          <title>Upgrade related issues </title>
+          <para>Refer to <ulink url="http://fedoraproject.org/wiki/DistributionUpgrades">http://fedoraproject.org/wiki/DistributionUpgrades</ulink> for detailed recommended procedures for upgrading Fedora.</para><section id="sn-">
+            <title>SCSI driver partition limits </title>
+            <para>Whereas older IDE drivers supported up to 63 partitions per device, SCSI devices are limited to 15 partitions per device. <emphasis>Anaconda</emphasis> uses the <programlisting format="linespecific">libata</programlisting> driver in the same fashion as the rest of Fedora, so it is unable to detect more than 15 partitions on an IDE disk during the installation or upgrade process.</para><para>If you are upgrading a system with more than 15 partitions, you may need to migrate the disk to Logical Volume Management (LVM). This restriction may cause conflicts with other installed systems if they do not support LVM. Most modern Linux distributions support LVM and drivers are available for other operating systems as well.</para>
+          </section><section id="sn-">
+            <title>Disk partitions must be labeled </title>
+            <para>A change in the way that the linux kernel handles storage devices means that device names like <programlisting format="linespecific">/dev/hdX</programlisting> or <programlisting format="linespecific">/dev/sdX</programlisting> may differ from the values used in earlier releases. <emphasis>Anaconda</emphasis> solves this problem by relying on partition labels or UUIDs for finding devices. If these are not present, then <emphasis>Anaconda</emphasis> presents a warning indicating that partitions need to be labelled and that the upgrade can not proceed. Systems that use Logical Volume Management (LVM) and the device mapper usually do not require relabeling.</para><section id="sn-">
+              <title>To check disk partition labels </title>
+              <para>To view partition labels, boot the existing Fedora installation, and enter the following at a terminal prompt: </para>
+              <programlisting>/sbin/blkid
+</programlisting>
+              <para> Confirm that each volume line in the list has a <programlisting format="linespecific">LABEL=</programlisting> value, as shown below: </para><programlisting>/dev/hdd1: LABEL="/boot" UUID="ec6a9d6c-6f05-487e-a8bd-a2594b854406" SEC_TYPE="ext2" TYPE="ext3"
+</programlisting>
+              <para />
+            </section><section id="sn-">
+              <title>To set disk partition labels </title>
+              <para>For ext2 and ext3 partitions without a label, use the following command: </para>
+              <programlisting>su -c 'e2label /dev/example f7-slash'
+</programlisting>
+              <para> For a VFAT filesystem use <programlisting format="linespecific">dosfslabel</programlisting> from the <programlisting format="linespecific">dosfstools</programlisting> package, and for NTFS filesystem use <programlisting format="linespecific">ntfslabel</programlisting> from the <programlisting format="linespecific">ntfsprogs</programlisting> package.  Before rebooting the machine, also update the file system mount entries, and the GRUB kernel root entry.</para>
+            </section><section id="sn-">
+              <title>Update the file system mount entries </title>
+              <para>If any filesystem labels were added or modified, then the device entries in <programlisting format="linespecific">/etc/fstab</programlisting> must be adjusted to match: </para><programlisting>su -c 'cp /etc/fstab /etc/fstab.orig'
+su -c 'gedit /etc/fstab'
+</programlisting>
+              <para> An example of a mount by label entry is: </para>
+              <programlisting> LABEL=f7-slash  /  ext3  defaults  1 1
+</programlisting>
+              <para />
+            </section><section id="sn-">
+              <title>Update the grub.conf kernel root entry </title>
+              <para>If the label for the / (root) filesystem was modified, the kernel boot parameter in the grub configuration file must also be modified: </para>
+              <programlisting>su -c 'gedit /boot/grub/grub.conf'
+</programlisting>
+              <para> A matching example kernel grub line is: </para>
+              <programlisting> kernel /vmlinuz-2.6.20-1.2948.fc6 ro root=LABEL=f7-slash rhgb quiet
+</programlisting>
+              <para />
+            </section><section id="sn-">
+              <title>Test changes made to labels </title>
+              <para>If partition labels were adjusted, or the <programlisting format="linespecific">/etc/fstab</programlisting> file modified, then boot the existing Fedora installation to confirm that all partitions still mount normally and login is successful. When complete, reboot with the installation media to start the installer and begin the upgrade.</para>
+            </section>
+          </section><section id="sn-">
+            <title>Upgrades versus fresh installations </title>
+            <para>In general, fresh installations are recommended over upgrades. This is particularly true for systems that include software from third-party repositories. Third-party packages remaining from a previous installation may not work as expected on an upgraded Fedora system. If you decide to perform an upgrade anyway, the following information may be helpful:</para>
+            <para>Before you upgrade, back up the system completely. In particular, preserve <programlisting format="linespecific">/etc</programlisting>, <programlisting format="linespecific">/home</programlisting>, and possibly <programlisting format="linespecific">/opt</programlisting> and <programlisting format="linespecific">/usr/local</programlisting> if customized packages are installed there. You may want to use a multi-boot approach with a "clone" of the old installation on alternate partition(s) as a fallback. In that case, create alternate boot media, such as a GRUB boot floppy.</para><para>
+              <para>
+                <para>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
+                    </imageobject><caption>
+                      <para />
+                    </caption>
+                  </inlinemediaobject>
+                </para><para>
+                  <emphasis> Backups of configurations in <programlisting format="linespecific">/etc</programlisting> are also useful in reconstructing system settings after a fresh installation.</emphasis><literallayout>
+</literallayout>
+                </para>
+              </para>
+            </para><para>After you complete the upgrade, run the following command:</para>
+            <para />
+            <programlisting>rpm -qa --last &gt; RPMS_by_Install_Time.txt
+</programlisting>
+            <para />
+            <para>Inspect the end of the output for packages that pre-date the upgrade. Remove or upgrade those packages from third-party repositories, or otherwise deal with them as necessary. Some previously installed packages may no longer be available in any configured repository. To list all these packages, use the following command: </para>
+            <programlisting>su -c 'yum list extras'
+</programlisting>
+            <para />
+          </section>
+        </section><section id="sn-">
+          <title>Kickstart HTTP Issue </title>
+          <para> When using a Kickstart configuration file via HTTP, kickstart file retrieval may fail with an error that indicates the file could not be retrieved. Click the <emphasis>OK</emphasis> button several times without making modifications to override this error successfully. As a workaround, use one of the other supported methods to retrieve Kickstart configurations.</para>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
diff --git a/en-US/International_Language_Support.xml b/en-US/International_Language_Support.xml
deleted file mode 100644
index 123bae6..0000000
--- a/en-US/International_Language_Support.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/I18n</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/I18n</title>
-      <section id="">
-        <title>International Language Support </title>
-        <para>This section includes information on language support under Fedora.</para>
-        <itemizedlist>
-          <listitem>
-            <para> Localization (translation) of Fedora is coordinated by the Fedora Localization Project -- <ulink url="http://fedoraproject.org/wiki/L10N">http://fedoraproject.org/wiki/L10N</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Internationalization of Fedora is maintained by the Fedora I18n Project -- <ulink url="http://fedoraproject.org/wiki/I18N">http://fedoraproject.org/wiki/I18N</ulink>
-            </para>
-          </listitem>
-        </itemizedlist><section id="">
-          <title>Language Coverage </title>
-          <para>Fedora features a variety of software that is translated in many languages. For a list of languages refer to the translation statistics for the <emphasis>Anaconda</emphasis> module, which is one of the core software applications in Fedora.</para><itemizedlist>
-            <listitem>
-              <para>
-                <ulink url="http://translate.fedoraproject.org/languages">http://translate.fedoraproject.org/languages</ulink>
-              </para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://translate.fedoraproject.org/module/anaconda">http://translate.fedoraproject.org/module/anaconda</ulink>
-              </para>
-            </listitem>
-          </itemizedlist><section id="">
-            <title>Language Support Installation </title>
-            <para> To install langpacks and additional language support from the <emphasis>Languages</emphasis> group, run this command:</para><para />
-            <programlisting>su -c 'yum groupinstall &lt;language&gt;-support'
-</programlisting>
-            <para />
-            <para>In the command above, <programlisting format="linespecific">&lt;language&gt;</programlisting> is one of <programlisting format="linespecific">assamese</programlisting>, <programlisting format="linespecific">bengali</programlisting>, <programlisting format="linespecific">chinese</programlisting>, <programlisting format="linespecific">gujarati</programlisting>, <programlisting format="linespecific">hindi</programlisting>, <programlisting format="linespecific">japanese</programlisting>, <programlisting format="linespecific">kannada</programlisting>, <programlisting format="linespecific">korean</programlisting>, <programlisting format="linespecific">malayalam</programlisting>, <programlisting format="linespecific">marathi</programlisting>, <programlisting format="linespecific">oriya</programlisting>, <programlisting format="linespecific">punjabi</programlisting>, <programlisting format="linespecific">sinhala</programlisting>, <programlisting format="linespecifi
 c">tamil</programlisting>, <programlisting format="linespecific">telegu</programlisting>, <programlisting format="linespecific">thai</programlisting>, and so on.</para><para>SCIM users upgrading from earlier releases of Fedora are strongly urged to install <programlisting format="linespecific">scim-bridge-gtk</programlisting>, which works well with third-party C++ applications linked against older versions of <programlisting format="linespecific">libstdc++</programlisting>.</para>
-          </section><section id="">
-            <title>Transifex </title>
-            <para> Transifex is Fedora's online tool to facilitate contributing translations to projects hosted on remote and disparate version control systems.  Many of the core packages use Transifex to receive translations from numerous contributors.</para>
-            <para>
-              <ulink url="https://fedorahosted.org/transifex/">https://fedorahosted.org/transifex/</ulink>
-            </para><para>Through a combination of <ulink url="http://translate.fedoraproject.org/"> new web tools</ulink>, community growth, and better processes, translators can contribute directly to any upstream project through one translator-oriented web interface. Developers of projects with no existing translation community can easily reach out to Fedora's established community for translations. In turn, translators can reach out to numerous projects related to Fedora to easily contribute translations.</para><para>
-              <ulink url="https://translate.fedoraproject.org/submit">https://translate.fedoraproject.org/submit</ulink>
-            </para>
-          </section>
-        </section><section id="">
-          <title>Fonts </title>
-          <para>Fonts for most languages are installed by default on the desktop to give good default language coverage.</para>
-          <section id="">
-            <title>Default language for Han Unification </title>
-            <para> When not using an Asian locale in GTK-based applications, Chinese characters (that is, Chinese Hanzi, Japanese Kanji, or Korean Hanja) may render with a mixture of Chinese, Japanese, and Korean fonts depending on the text.  This happens when Pango does not have sufficient context to know which language is being used.  The current default font configuration seems to prefer Chinese fonts.  If you normally want to use Japanese or Korean say, you can tell Pango to use it by default by setting the <programlisting format="linespecific">PANGO_LANGUAGE</programlisting> environment variable.  For example ...</para><para />
-            <programlisting>export PANGO_LANGUAGE=ja</programlisting>
-            <para />
-            <para>... tells Pango rendering to assume Japanese text when it has no other indications.</para>
-          </section><section id="">
-            <title>Japanese </title>
-            <para>The <programlisting format="linespecific">fonts-japanese</programlisting> package has been renamed to <programlisting format="linespecific">japanese-bitmap-fonts</programlisting>.</para>
-          </section><section id="">
-            <title>Khmer </title>
-            <para> Khmer OS Fonts <programlisting format="linespecific">khmeros-fonts</programlisting> have been added to Fedora for Khmer coverage in this release.</para>
-          </section><section id="">
-            <title>Korean </title>
-            <para> The <programlisting format="linespecific">un-core-fonts</programlisting> packages replaces <programlisting format="linespecific">baekmuk-ttf-fonts</programlisting> as the new Hangul default fonts.</para>
-          </section><section id="">
-            <title>Complete list of changes </title>
-            <para>All fonts changes are listed on their dedicated page:</para>
-            <para>
-              <ulink url="http://fedoraproject.org/wiki/Fonts_inclusion_history#F10">http://fedoraproject.org/wiki/Fonts_inclusion_history#F10</ulink>
-            </para><para>
-              <para>
-                <para>
-                  <inlinemediaobject>
-                    <imageobject>
-                      <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
-                    </imageobject><caption>
-                      <para />
-                    </caption>
-                  </inlinemediaobject>
-                </para><para>
-                  <emphasis>Fonts in Fedora Linux</emphasis>
-                  <literallayout>
-</literallayout>The <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_SIG">Fonts SIG</ulink> takes loving care of <ulink url="http://fedoraproject.org/w/index.php?title=Fonts">Fedora Linux fonts</ulink>. Please <ulink url="http://fedoraproject.org/w/index.php?title=Joining_the_Fonts_SIG">join</ulink> this special interest group if you are interested in <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_and_text-related_creative_tasks">creating</ulink>, <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_and_text_quality_assurance">improving</ulink>, <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_packaging">packaging</ulink>, or just <ulink url="http://fedoraproject.org/w/index.php?title=Font_wishlist">suggesting</ulink> a font. Any help will be appreciated.</para>
-              </para>
-            </para>
-          </section>
-        </section><section id="">
-          <title>Input Methods </title>
-          <para> There is a new <programlisting format="linespecific">yum</programlisting> group called <programlisting format="linespecific">input-methods</programlisting> and <emphasis>Input Methods</emphasis> for many languages are now installed by default.  This allows turning on the default input method system and immediately having the standard input methods for most languages available.  It also brings normal installs in line with Fedora Live.</para><section id="">
-            <title>im-chooser and imsettings </title>
-            <para> It is now possible to start and stop the use of Input Methods during runtime thanks to the <programlisting format="linespecific">imsettings</programlisting> framework.  The <programlisting format="linespecific">GTK_IM_MODULE</programlisting> environment variable is no longer needed by default but can still be used to override the <programlisting format="linespecific">imsettings</programlisting>.</para><para>Input Methods only start by default on desktops running in an Asian locale.  The current locale list is: <programlisting format="linespecific">as</programlisting>, <programlisting format="linespecific">bn</programlisting>, <programlisting format="linespecific">gu</programlisting>, <programlisting format="linespecific">hi</programlisting>, <programlisting format="linespecific">ja</programlisting>, <programlisting format="linespecific">kn</programlisting>, <programlisting format="linespecific">ko</programlisting>, <programlisting format="linespecific">ml<
 /programlisting>, <programlisting format="linespecific">mr</programlisting>, <programlisting format="linespecific">ne</programlisting>, <programlisting format="linespecific">or</programlisting>, <programlisting format="linespecific">pa</programlisting>, <programlisting format="linespecific">si</programlisting>, <programlisting format="linespecific">ta</programlisting>, <programlisting format="linespecific">te</programlisting>, <programlisting format="linespecific">th</programlisting>, <programlisting format="linespecific">ur</programlisting>, <programlisting format="linespecific">vi</programlisting>, <programlisting format="linespecific">zh</programlisting>.  Use <programlisting format="linespecific">im-chooser</programlisting> via <emphasis>System &gt; Preferences &gt; Personal &gt; Input Method</emphasis> to enable or disable Input Method usage on your desktop.</para>
-          </section><section id="">
-            <title>ibus </title>
-            <para> Fedora 10 includes <programlisting format="linespecific">ibus</programlisting>, a new input method system that has been developed to overcome some of the limitations of <programlisting format="linespecific">scim</programlisting>.  It may become the default input method system in Fedora 11.</para><para>
-              <ulink url="http://code.google.com/p/ibus">http://code.google.com/p/ibus</ulink>
-            </para><para>It already provides a number of input method engines and immodules:</para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-anthy</programlisting> (Japanese)</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-chewing</programlisting> (Traditional Chinese)</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-gtk</programlisting> (GTK immodule)</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-hangu</programlisting>l (Korean)</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-m17</programlisting>n (Indic and many other languages)</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-pinyi</programlisting>n (Simplified Chinese)</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-q</programlisting>t (Qt immodule)</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">ibus-tabl</programlisting>e (Chinese, etc)</para>
-              </listitem>
-            </itemizedlist><para>We encourage people to install <programlisting format="linespecific">ibus</programlisting>, test it for their language, and report any problems.</para>
-          </section><section id="">
-            <title>Indic Onscreen Keyboard </title>
-            <para> Fedora 10 includes <programlisting format="linespecific">iok</programlisting>, an onscreen virtual keyboard for Indian languages, which allows input using Inscript keymap layouts and other 1:1 key mappings.  For more information refer to the homepage:</para><para>
-              <ulink url="http://fedorahosted.org/iok.">http://fedorahosted.org/iok.</ulink>
-            </para>
-          </section>
-        </section>
-      </section><section id="">
-        <title>Indic collation support </title>
-        <para> Fedora 10 includes sorting support for Indic languages. This support fixes listing and order of menus in these languages, representing them in sorted order and making it easy to find desired elements.</para>
-        <para>These languages are covered by this support:</para>
-        <itemizedlist>
-          <listitem>
-            <para> Marathi</para>
-          </listitem><listitem>
-            <para> Hindi</para>
-          </listitem><listitem>
-            <para> Gujarati </para>
-          </listitem><listitem>
-            <para> Kashmiri</para>
-          </listitem><listitem>
-            <para> Sindhi</para>
-          </listitem><listitem>
-            <para> Maithili</para>
-          </listitem><listitem>
-            <para> Nepali</para>
-          </listitem><listitem>
-            <para> Konkani</para>
-          </listitem><listitem>
-            <para> Telugu</para>
-          </listitem><listitem>
-            <para> Kannada</para>
-          </listitem><listitem>
-            <para> Punjabi</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/International_language_support.xml b/en-US/International_language_support.xml
new file mode 100644
index 0000000..c556185
--- /dev/null
+++ b/en-US/International_language_support.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/I18n</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/I18n</title>
+      <section id="sn-">
+        <title>International Language Support </title>
+        <para>This section includes information on language support under Fedora.</para>
+        <itemizedlist>
+          <listitem>
+            <para> Localization (translation) of Fedora is coordinated by the Fedora Localization Project -- <ulink url="http://fedoraproject.org/wiki/L10N">http://fedoraproject.org/wiki/L10N</ulink>
+            </para>
+          </listitem><listitem>
+            <para> Internationalization of Fedora is maintained by the Fedora I18n Project -- <ulink url="http://fedoraproject.org/wiki/I18N">http://fedoraproject.org/wiki/I18N</ulink>
+            </para>
+          </listitem>
+        </itemizedlist><section id="sn-">
+          <title>Language Coverage </title>
+          <para>Fedora features a variety of software that is translated in many languages. For a list of languages refer to the translation statistics for the <emphasis>Anaconda</emphasis> module, which is one of the core software applications in Fedora.</para><itemizedlist>
+            <listitem>
+              <para>
+                <ulink url="http://translate.fedoraproject.org/languages">http://translate.fedoraproject.org/languages</ulink>
+              </para>
+            </listitem><listitem>
+              <para>
+                <ulink url="http://translate.fedoraproject.org/module/anaconda">http://translate.fedoraproject.org/module/anaconda</ulink>
+              </para>
+            </listitem>
+          </itemizedlist><section id="sn-">
+            <title>Language Support Installation </title>
+            <para> To install langpacks and additional language support from the <emphasis>Languages</emphasis> group, run this command:</para><para />
+            <programlisting>su -c 'yum groupinstall &lt;language&gt;-support'
+</programlisting>
+            <para />
+            <para>In the command above, <programlisting format="linespecific">&lt;language&gt;</programlisting> is one of <programlisting format="linespecific">assamese</programlisting>, <programlisting format="linespecific">bengali</programlisting>, <programlisting format="linespecific">chinese</programlisting>, <programlisting format="linespecific">gujarati</programlisting>, <programlisting format="linespecific">hindi</programlisting>, <programlisting format="linespecific">japanese</programlisting>, <programlisting format="linespecific">kannada</programlisting>, <programlisting format="linespecific">korean</programlisting>, <programlisting format="linespecific">malayalam</programlisting>, <programlisting format="linespecific">marathi</programlisting>, <programlisting format="linespecific">oriya</programlisting>, <programlisting format="linespecific">punjabi</programlisting>, <programlisting format="linespecific">sinhala</programlisting>, <programlisting format="linespecifi
 c">tamil</programlisting>, <programlisting format="linespecific">telegu</programlisting>, <programlisting format="linespecific">thai</programlisting>, and so on.</para><para>SCIM users upgrading from earlier releases of Fedora are strongly urged to install <programlisting format="linespecific">scim-bridge-gtk</programlisting>, which works well with third-party C++ applications linked against older versions of <programlisting format="linespecific">libstdc++</programlisting>.</para>
+          </section><section id="sn-">
+            <title>Transifex </title>
+            <para> Transifex is Fedora's online tool to facilitate contributing translations to projects hosted on remote and disparate version control systems.  Many of the core packages use Transifex to receive translations from numerous contributors.</para>
+            <para>
+              <ulink url="https://fedorahosted.org/transifex/">https://fedorahosted.org/transifex/</ulink>
+            </para><para>Through a combination of <ulink url="http://translate.fedoraproject.org/"> new web tools</ulink>, community growth, and better processes, translators can contribute directly to any upstream project through one translator-oriented web interface. Developers of projects with no existing translation community can easily reach out to Fedora's established community for translations. In turn, translators can reach out to numerous projects related to Fedora to easily contribute translations.</para><para>
+              <ulink url="https://translate.fedoraproject.org/submit">https://translate.fedoraproject.org/submit</ulink>
+            </para>
+          </section>
+        </section><section id="sn-">
+          <title>Fonts </title>
+          <para>Fonts for most languages are installed by default on the desktop to give good default language coverage.</para>
+          <section id="sn-">
+            <title>Default language for Han Unification </title>
+            <para> When not using an Asian locale in GTK-based applications, Chinese characters (that is, Chinese Hanzi, Japanese Kanji, or Korean Hanja) may render with a mixture of Chinese, Japanese, and Korean fonts depending on the text.  This happens when Pango does not have sufficient context to know which language is being used.  The current default font configuration seems to prefer Chinese fonts.  If you normally want to use Japanese or Korean say, you can tell Pango to use it by default by setting the <programlisting format="linespecific">PANGO_LANGUAGE</programlisting> environment variable.  For example ...</para><para />
+            <programlisting>export PANGO_LANGUAGE=ja</programlisting>
+            <para />
+            <para>... tells Pango rendering to assume Japanese text when it has no other indications.</para>
+          </section><section id="sn-">
+            <title>Japanese </title>
+            <para>The <programlisting format="linespecific">fonts-japanese</programlisting> package has been renamed to <programlisting format="linespecific">japanese-bitmap-fonts</programlisting>.</para>
+          </section><section id="sn-">
+            <title>Khmer </title>
+            <para> Khmer OS Fonts <programlisting format="linespecific">khmeros-fonts</programlisting> have been added to Fedora for Khmer coverage in this release.</para>
+          </section><section id="sn-">
+            <title>Korean </title>
+            <para> The <programlisting format="linespecific">un-core-fonts</programlisting> packages replaces <programlisting format="linespecific">baekmuk-ttf-fonts</programlisting> as the new Hangul default fonts.</para>
+          </section><section id="sn-">
+            <title>Complete list of changes </title>
+            <para>All fonts changes are listed on their dedicated page:</para>
+            <para>
+              <ulink url="http://fedoraproject.org/wiki/Fonts_inclusion_history#F10">http://fedoraproject.org/wiki/Fonts_inclusion_history#F10</ulink>
+            </para><para>
+              <para>
+                <para>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
+                    </imageobject><caption>
+                      <para />
+                    </caption>
+                  </inlinemediaobject>
+                </para><para>
+                  <emphasis>Fonts in Fedora Linux</emphasis>
+                  <literallayout>
+</literallayout>The <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_SIG">Fonts SIG</ulink> takes loving care of <ulink url="http://fedoraproject.org/w/index.php?title=Fonts">Fedora Linux fonts</ulink>. Please <ulink url="http://fedoraproject.org/w/index.php?title=Joining_the_Fonts_SIG">join</ulink> this special interest group if you are interested in <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_and_text-related_creative_tasks">creating</ulink>, <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_and_text_quality_assurance">improving</ulink>, <ulink url="http://fedoraproject.org/w/index.php?title=Fonts_packaging">packaging</ulink>, or just <ulink url="http://fedoraproject.org/w/index.php?title=Font_wishlist">suggesting</ulink> a font. Any help will be appreciated.</para>
+              </para>
+            </para>
+          </section>
+        </section><section id="sn-">
+          <title>Input Methods </title>
+          <para> There is a new <programlisting format="linespecific">yum</programlisting> group called <programlisting format="linespecific">input-methods</programlisting> and <emphasis>Input Methods</emphasis> for many languages are now installed by default.  This allows turning on the default input method system and immediately having the standard input methods for most languages available.  It also brings normal installs in line with Fedora Live.</para><section id="sn-">
+            <title>im-chooser and imsettings </title>
+            <para> It is now possible to start and stop the use of Input Methods during runtime thanks to the <programlisting format="linespecific">imsettings</programlisting> framework.  The <programlisting format="linespecific">GTK_IM_MODULE</programlisting> environment variable is no longer needed by default but can still be used to override the <programlisting format="linespecific">imsettings</programlisting>.</para><para>Input Methods only start by default on desktops running in an Asian locale.  The current locale list is: <programlisting format="linespecific">as</programlisting>, <programlisting format="linespecific">bn</programlisting>, <programlisting format="linespecific">gu</programlisting>, <programlisting format="linespecific">hi</programlisting>, <programlisting format="linespecific">ja</programlisting>, <programlisting format="linespecific">kn</programlisting>, <programlisting format="linespecific">ko</programlisting>, <programlisting format="linespecific">ml<
 /programlisting>, <programlisting format="linespecific">mr</programlisting>, <programlisting format="linespecific">ne</programlisting>, <programlisting format="linespecific">or</programlisting>, <programlisting format="linespecific">pa</programlisting>, <programlisting format="linespecific">si</programlisting>, <programlisting format="linespecific">ta</programlisting>, <programlisting format="linespecific">te</programlisting>, <programlisting format="linespecific">th</programlisting>, <programlisting format="linespecific">ur</programlisting>, <programlisting format="linespecific">vi</programlisting>, <programlisting format="linespecific">zh</programlisting>.  Use <programlisting format="linespecific">im-chooser</programlisting> via <emphasis>System &gt; Preferences &gt; Personal &gt; Input Method</emphasis> to enable or disable Input Method usage on your desktop.</para>
+          </section><section id="sn-">
+            <title>ibus </title>
+            <para> Fedora 10 includes <programlisting format="linespecific">ibus</programlisting>, a new input method system that has been developed to overcome some of the limitations of <programlisting format="linespecific">scim</programlisting>.  It may become the default input method system in Fedora 11.</para><para>
+              <ulink url="http://code.google.com/p/ibus">http://code.google.com/p/ibus</ulink>
+            </para><para>It already provides a number of input method engines and immodules:</para>
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-anthy</programlisting> (Japanese)</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-chewing</programlisting> (Traditional Chinese)</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-gtk</programlisting> (GTK immodule)</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-hangu</programlisting>l (Korean)</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-m17</programlisting>n (Indic and many other languages)</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-pinyi</programlisting>n (Simplified Chinese)</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-q</programlisting>t (Qt immodule)</para>
+              </listitem><listitem>
+                <para>
+                  <programlisting format="linespecific">ibus-tabl</programlisting>e (Chinese, etc)</para>
+              </listitem>
+            </itemizedlist><para>We encourage people to install <programlisting format="linespecific">ibus</programlisting>, test it for their language, and report any problems.</para>
+          </section><section id="sn-">
+            <title>Indic Onscreen Keyboard </title>
+            <para> Fedora 10 includes <programlisting format="linespecific">iok</programlisting>, an onscreen virtual keyboard for Indian languages, which allows input using Inscript keymap layouts and other 1:1 key mappings.  For more information refer to the homepage:</para><para>
+              <ulink url="http://fedorahosted.org/iok.">http://fedorahosted.org/iok.</ulink>
+            </para>
+          </section>
+        </section>
+      </section><section id="sn-">
+        <title>Indic collation support </title>
+        <para> Fedora 10 includes sorting support for Indic languages. This support fixes listing and order of menus in these languages, representing them in sorted order and making it easy to find desired elements.</para>
+        <para>These languages are covered by this support:</para>
+        <itemizedlist>
+          <listitem>
+            <para> Marathi</para>
+          </listitem><listitem>
+            <para> Hindi</para>
+          </listitem><listitem>
+            <para> Gujarati </para>
+          </listitem><listitem>
+            <para> Kashmiri</para>
+          </listitem><listitem>
+            <para> Sindhi</para>
+          </listitem><listitem>
+            <para> Maithili</para>
+          </listitem><listitem>
+            <para> Nepali</para>
+          </listitem><listitem>
+            <para> Konkani</para>
+          </listitem><listitem>
+            <para> Telugu</para>
+          </listitem><listitem>
+            <para> Kannada</para>
+          </listitem><listitem>
+            <para> Punjabi</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Introduction_to_Fedora_Project_and_Technical_Release_Notes.xml b/en-US/Introduction_to_Fedora_Project_and_Technical_Release_Notes.xml
deleted file mode 100644
index a647e34..0000000
--- a/en-US/Introduction_to_Fedora_Project_and_Technical_Release_Notes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Introduction</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Introduction</title>
-      <section id="">
-        <title>Introduction to Fedora Project and Technical Release Notes </title>
-        <para>The Fedora Project is an openly-developed project designed by Red Hat, open for general participation, led by a meritocracy, and following a set of project objectives. The results from this project include Fedora Core, which is a complete, general-purpose operating system built exclusively from open source software.</para>
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis> Fedora Core is a community supported project.</emphasis>
-              <literallayout>
-</literallayout>
-            </para>
-          </para>
-        </para><para>Fedora Core is not a commercially supported product of Red Hat, Inc..</para>
-        <para>For more information, refer to the <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/Overview"> Overview</ulink> .</para><para>Additional important information about this release may be made available at <ulink url="http://fedora.redhat.com/docs/release-notes/">http://fedora.redhat.com/docs/release-notes/</ulink> . Users are advised to check this link regularly for updates.</para><para>For reporting errors or other requests about these release notes, file a bug report using this pre-filled bugzilla template:  <ulink url="http://tinyurl.com/byvk2">http://tinyurl.com/byvk2</ulink>
-        </para>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Introduction_to_Fedora_Project_and_technical_release_notes.xml b/en-US/Introduction_to_Fedora_Project_and_technical_release_notes.xml
new file mode 100644
index 0000000..152f986
--- /dev/null
+++ b/en-US/Introduction_to_Fedora_Project_and_technical_release_notes.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Introduction</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Introduction</title>
+      <section id="sn-">
+        <title>Introduction to Fedora Project and Technical Release Notes </title>
+        <para>The Fedora Project is an openly-developed project designed by Red Hat, open for general participation, led by a meritocracy, and following a set of project objectives. The results from this project include Fedora Core, which is a complete, general-purpose operating system built exclusively from open source software.</para>
+        <para>
+          <para>
+            <para>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                </imageobject><caption>
+                  <para />
+                </caption>
+              </inlinemediaobject>
+            </para><para>
+              <emphasis> Fedora Core is a community supported project.</emphasis>
+              <literallayout>
+</literallayout>
+            </para>
+          </para>
+        </para><para>Fedora Core is not a commercially supported product of Red Hat, Inc..</para>
+        <para>For more information, refer to the <ulink url="http://fedoraproject.org/w/index.php?title=Docs/Beats/Overview"> Overview</ulink> .</para><para>Additional important information about this release may be made available at <ulink url="http://fedora.redhat.com/docs/release-notes/">http://fedora.redhat.com/docs/release-notes/</ulink> . Users are advised to check this link regularly for updates.</para><para>For reporting errors or other requests about these release notes, file a bug report using this pre-filled bugzilla template:  <ulink url="http://tinyurl.com/byvk2">http://tinyurl.com/byvk2</ulink>
+        </para>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Java.xml b/en-US/Java.xml
index 87f787e..2d05c54 100644
--- a/en-US/Java.xml
+++ b/en-US/Java.xml
@@ -6,44 +6,44 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Java</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/Java</title>
-      <section id="">
+      <section id="sn-">
         <title>Java</title>
-        <section id="">
+        <section id="sn-">
           <title>Best of breed free software Java implementation </title>
           <para>Fedora includes multiple best of breed free software Java(TM) implementations, obtained through active adoption of innovative technology integrations produced by Fedora and others within upstream projects. The implementations integrated into Fedora are based on OpenJDK (<ulink url="http://openjdk.java.net/)">http://openjdk.java.net/)</ulink> and the IcedTea GNU/Linux distribution integration project (<ulink url="http://icedtea.classpath.org/),">http://icedtea.classpath.org/),</ulink> or based on alternatives such as the GNU Compiler for Java (GCJ - <ulink url="http://gcc.gnu.org/java)">http://gcc.gnu.org/java)</ulink> and the GNU Classpath core class libraries (<ulink url="http://www.gnu.org/software/classpath/).">http://www.gnu.org/software/classpath/).</ulink> All Fedora innovations are pushed upstream to get the widest possible integration of the technologies in general Java implementations.</para><para>The implementation of OpenJDK 6 included in Fedora 10
  uses the HotSpot virtual machine runtime compiler on x86, x86_64, and SPARC. On PowerPC (PPC) it uses the zero interpreter, which is slower. On all architectures an alternative implementation based on GCJ and GNU Classpath is included that includes an ahead-of-time compiler to produce native binaries.</para>
           <para>Fedora binaries for selected architectures (currently only x86 and x86_64 based on OpenJDK) are tested against the Java Compatibility Kit (JCK) by Red Hat to guarantee 100% compatibility with the Java Specification (JDK 1.6 at this time).</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Handling Java Applets and Web Start Applications </title>
           <para>In Fedora 10 <programlisting format="linespecific">gcjwebplugin</programlisting> has been replaced by <programlisting format="linespecific">IcedTeaPlugin</programlisting> that runs untrusted applets safely in a Web browser and works on any architecture. You can see which Applet Plugin is installed by typing <programlisting format="linespecific">about:plugins</programlisting> in Firefox. The new plugin adds support for the JavaScript bridge (LiveConnect) that was missing from earlier versions.  For more details on "bytecode-to-JavaScript bridge (LiveConnect)", refer to the bug report:</para><para>
             <ulink url="https://bugzilla.redhat.com/show_bug.cgi?id=304021">https://bugzilla.redhat.com/show_bug.cgi?id=304021</ulink>
           </para><para>Feedback on the security policy is very appreciated. If you suspect the security policy may be too restrictive to enable restricted applets, run the <programlisting format="linespecific">firefox -g</programlisting> command in a terminal window to see what is being restricted, then grant the restricted permission in the <programlisting format="linespecific">/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/security/java.policy</programlisting> file.  If you then file a bug report, your exception could end up in the packaged security policy and you won't have to hack the policy file in the future.</para><para>Experimental Web Start (<programlisting format="linespecific">javaws</programlisting>) support via NetX has been added to the IcedTea repository. When a Java Network Launching Protocol (<programlisting format="linespecific">.jnlp</programlisting>) file is embedded on a web page you can open it with the IcedTea Web Start (<programlisting format="linesp
 ecific">/usr/bin/javaws</programlisting>).</para><para>
             <ulink url="http://jnlp.sourceforge.net/">http://jnlp.sourceforge.net/</ulink> -- NetX</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>New integration with other Fedora technologies </title>
           <para>Through the IcedTea project OpenJDK has been integrated with several new technologies that are also part of Fedora 10.</para>
-          <section id="">
+          <section id="sn-">
             <title>VisualVM integration through the NetBeans framework </title>
             <para>VisualVM (<programlisting format="linespecific">jvisualvm</programlisting>) provides a graphical overview of any local or remotely running Java application, letting you monitor all running threads, classes, and objects allocated by the application by taking thread dumps, heap dumps, and other lightweight profiling tools.</para>
-          </section><section id="">
+          </section><section id="sn-">
             <title>PulseAudio integration for javax.sound </title>
             <para>PulseAudio integrations provides all the benefits of PulseAudio to any java application using the <programlisting format="linespecific">javax.sound</programlisting> package.</para>
-          </section><section id="">
+          </section><section id="sn-">
             <title>Integration of Mozilla Rhino (JavaScript) </title>
             <para>Rhino is a pure-Java JavaScript implementation from Mozilla providing an easy mixing of Java and JavaScript for developers using the <programlisting format="linespecific">javax.script</programlisting> package.</para>
-          </section><section id="">
+          </section><section id="sn-">
             <title>Other improvements </title>
             <para>Also in Fedora 10 Java cryptography (<programlisting format="linespecific">javax.crypto</programlisting>) is fully supported without any (regional) restrictions.</para>
           </section>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Fedora and JPackage </title>
           <para>Fedora 10 includes many packages derived from the JPackage Project.</para>
           <para>
             <ulink url="http://jpackage.org">http://jpackage.org</ulink>
           </para><para>Some of these packages are modified in Fedora to remove proprietary software dependencies, and to make use of GCJ's ahead-of-time compilation feature.  Use the Fedora repositories to update these packages, or use the JPackage repository for packages not provided by Fedora.  Refer to the JPackage website for more information about the project and the software it provides.</para>
           <para>Admonition("warning", "Mixing Packages from Fedora and JPackage", "Research package compatibility before you install software from both the Fedora and JPackage repositories on the same system.  Incompatible packages may cause complex issues.")</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Note on upgrading from Fedora 8 - OpenJDK Replaces IcedTea </title>
           <para>Since Fedora 9 the packages called <programlisting format="linespecific">java-1.7.0-icedtea*</programlisting> in Fedora 8 have been renamed to <programlisting format="linespecific">java-1.6.0-openjdk*</programlisting>. The Fedora 8 IcedTea packages tracked the unstable OpenJDK 7 branch, whereas the <programlisting format="linespecific">java-1.6.0-openjdk*</programlisting> packages track the stable OpenJDK 6 branch. All the upstream IcedTea sources are included in the <programlisting format="linespecific">java-1.6.0-openjdk</programlisting> SRPM.</para><para>If you are upgrading from a system based on Fedora 8 that still has IcedTea installed, the package changeover does not happen automatically.  The packages related to IcedTea based on OpenJDK 7 must first be erased, then the new OpenJDK 6 packages installed.</para>
           <para />
diff --git a/en-US/KDE_3_Development_Platform_and_Libraries.xml b/en-US/KDE_3_Development_Platform_and_Libraries.xml
deleted file mode 100644
index fc97c64..0000000
--- a/en-US/KDE_3_Development_Platform_and_Libraries.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/BackwardsCompatibility/KDE3</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/BackwardsCompatibility/KDE3</title>
-      <section id="">
-        <title>KDE 3 Development Platform and Libraries </title>
-        <para>Fedora now features KDE 4, and no longer offers KDE 3 as a full desktop environment.  Fedora does provide the following KDE 3.5 library packages to run and build the many existing KDE 3 applications: </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <programlisting format="linespecific">qt3</programlisting>, <programlisting format="linespecific">qt3-devel</programlisting> (and other <programlisting format="linespecific">qt3-*</programlisting> packages): Qt 3.3.8b</para>
-          </listitem><listitem>
-            <para>
-              <programlisting format="linespecific">kdelibs3</programlisting>, <programlisting format="linespecific">kdelibs3-devel</programlisting>: KDE 3 libraries</para>
-          </listitem><listitem>
-            <para>
-              <programlisting format="linespecific">kdebase3</programlisting>, <programlisting format="linespecific">kdebase3-pim-ioslaves</programlisting>, <programlisting format="linespecific">kdebase3-devel</programlisting>: KDE 3 core files required by some applications</para>
-          </listitem>
-        </itemizedlist><para />
-        <para>Moreover, the KDE 4 <programlisting format="linespecific">kdebase-runtime</programlisting> package, which provides <programlisting format="linespecific">khelpcenter</programlisting>, also sets up <programlisting format="linespecific">khelpcenter</programlisting> as a service for KDE 3 applications, so help in KDE 3 applications works.  The KDE 3 version of <programlisting format="linespecific">khelpcenter</programlisting> is no longer provided, and the KDE 4 version is used instead.</para><para>These packages are designed to: </para>
-        <itemizedlist>
-          <listitem>
-            <para> comply with the Filesystem Hierarchy Standard (FHS), and</para>
-          </listitem><listitem>
-            <para> be completely safe to install in parallel with KDE 4, including the <programlisting format="linespecific">-devel</programlisting> packages.</para>
-          </listitem>
-        </itemizedlist><para />
-        <para>In order to achieve this goal, Fedora KDE SIG members have made two changes to the KDE 4 <programlisting format="linespecific">kdelibs-devel</programlisting> packages: </para><itemizedlist>
-          <listitem>
-            <para> The library symlinks are installed to <programlisting format="linespecific">/usr/lib/kde4/devel</programlisting> or <programlisting format="linespecific">/usr/lib64/kde4/devel</programlisting> depending on system architecture.</para>
-          </listitem><listitem>
-            <para> The <programlisting format="linespecific">kconfig_compiler</programlisting> and <programlisting format="linespecific">makekdewidgets</programlisting> tools have been renamed <programlisting format="linespecific">kconfig_compiler4</programlisting> and <programlisting format="linespecific">makekdewidgets4</programlisting>, respectively.</para>
-          </listitem>
-        </itemizedlist><para>These changes should be completely transparent to the vast majority of KDE 4 applications that use <programlisting format="linespecific">cmake</programlisting> to build, since <programlisting format="linespecific">FindKDE4Internal.cmake</programlisting> has been patched to match these changes. The KDE SIG made these changes to the KDE 4 <programlisting format="linespecific">kdelibs-devel</programlisting> rather than to <programlisting format="linespecific">kdelibs3-devel</programlisting> because KDE 4 stores these locations in a central place, whereas KDE 3 applications usually contain hardcoded copies of the library search paths and executable names.</para><para>Note that <programlisting format="linespecific">kdebase3</programlisting> does <emphasis>not</emphasis> include the following: </para><itemizedlist>
-          <listitem>
-            <para> A complete KDE 3 desktop (workspace) which could be used instead of KDE 4; in particular, KDE 3 versions of KWin, KDesktop, Kicker, KSplash and KControl are <emphasis>not</emphasis> included.</para>
-          </listitem><listitem>
-            <para> The KDE 3 versions of <programlisting format="linespecific">kdebase</programlisting> applications such as Konqueror and KWrite, which are redundant with the KDE 4 versions and would conflict with them.</para>
-          </listitem><listitem>
-            <para> The <programlisting format="linespecific">libkdecorations</programlisting> library required for KWin 3 window decorations, as those window decorations cannot be used in the KDE 4 version of KWin.</para>
-          </listitem><listitem>
-            <para> The <programlisting format="linespecific">libkickermain</programlisting> library required by some Kicker applets, as there is no Kicker in Fedora 10 and thus Kicker applets cannot be used.</para>
-          </listitem>
-        </itemizedlist><para />
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis>Developing new software against the legacy API is discouraged.</emphasis>
-              <literallayout>
-</literallayout>As with any backwards-compatibility library, you would be developing against a deprecated interface.</para>
-          </para>
-        </para>
-      </section>
-    </section>
-  </article>
-</book>
diff --git a/en-US/KDE_3_development_platform_and_libraries.xml b/en-US/KDE_3_development_platform_and_libraries.xml
new file mode 100644
index 0000000..e688b06
--- /dev/null
+++ b/en-US/KDE_3_development_platform_and_libraries.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/BackwardsCompatibility/KDE3</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/BackwardsCompatibility/KDE3</title>
+      <section id="sn-">
+        <title>KDE 3 Development Platform and Libraries </title>
+        <para>Fedora now features KDE 4, and no longer offers KDE 3 as a full desktop environment.  Fedora does provide the following KDE 3.5 library packages to run and build the many existing KDE 3 applications: </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <programlisting format="linespecific">qt3</programlisting>, <programlisting format="linespecific">qt3-devel</programlisting> (and other <programlisting format="linespecific">qt3-*</programlisting> packages): Qt 3.3.8b</para>
+          </listitem><listitem>
+            <para>
+              <programlisting format="linespecific">kdelibs3</programlisting>, <programlisting format="linespecific">kdelibs3-devel</programlisting>: KDE 3 libraries</para>
+          </listitem><listitem>
+            <para>
+              <programlisting format="linespecific">kdebase3</programlisting>, <programlisting format="linespecific">kdebase3-pim-ioslaves</programlisting>, <programlisting format="linespecific">kdebase3-devel</programlisting>: KDE 3 core files required by some applications</para>
+          </listitem>
+        </itemizedlist><para />
+        <para>Moreover, the KDE 4 <programlisting format="linespecific">kdebase-runtime</programlisting> package, which provides <programlisting format="linespecific">khelpcenter</programlisting>, also sets up <programlisting format="linespecific">khelpcenter</programlisting> as a service for KDE 3 applications, so help in KDE 3 applications works.  The KDE 3 version of <programlisting format="linespecific">khelpcenter</programlisting> is no longer provided, and the KDE 4 version is used instead.</para><para>These packages are designed to: </para>
+        <itemizedlist>
+          <listitem>
+            <para> comply with the Filesystem Hierarchy Standard (FHS), and</para>
+          </listitem><listitem>
+            <para> be completely safe to install in parallel with KDE 4, including the <programlisting format="linespecific">-devel</programlisting> packages.</para>
+          </listitem>
+        </itemizedlist><para />
+        <para>In order to achieve this goal, Fedora KDE SIG members have made two changes to the KDE 4 <programlisting format="linespecific">kdelibs-devel</programlisting> packages: </para><itemizedlist>
+          <listitem>
+            <para> The library symlinks are installed to <programlisting format="linespecific">/usr/lib/kde4/devel</programlisting> or <programlisting format="linespecific">/usr/lib64/kde4/devel</programlisting> depending on system architecture.</para>
+          </listitem><listitem>
+            <para> The <programlisting format="linespecific">kconfig_compiler</programlisting> and <programlisting format="linespecific">makekdewidgets</programlisting> tools have been renamed <programlisting format="linespecific">kconfig_compiler4</programlisting> and <programlisting format="linespecific">makekdewidgets4</programlisting>, respectively.</para>
+          </listitem>
+        </itemizedlist><para>These changes should be completely transparent to the vast majority of KDE 4 applications that use <programlisting format="linespecific">cmake</programlisting> to build, since <programlisting format="linespecific">FindKDE4Internal.cmake</programlisting> has been patched to match these changes. The KDE SIG made these changes to the KDE 4 <programlisting format="linespecific">kdelibs-devel</programlisting> rather than to <programlisting format="linespecific">kdelibs3-devel</programlisting> because KDE 4 stores these locations in a central place, whereas KDE 3 applications usually contain hardcoded copies of the library search paths and executable names.</para><para>Note that <programlisting format="linespecific">kdebase3</programlisting> does <emphasis>not</emphasis> include the following: </para><itemizedlist>
+          <listitem>
+            <para> A complete KDE 3 desktop (workspace) which could be used instead of KDE 4; in particular, KDE 3 versions of KWin, KDesktop, Kicker, KSplash and KControl are <emphasis>not</emphasis> included.</para>
+          </listitem><listitem>
+            <para> The KDE 3 versions of <programlisting format="linespecific">kdebase</programlisting> applications such as Konqueror and KWrite, which are redundant with the KDE 4 versions and would conflict with them.</para>
+          </listitem><listitem>
+            <para> The <programlisting format="linespecific">libkdecorations</programlisting> library required for KWin 3 window decorations, as those window decorations cannot be used in the KDE 4 version of KWin.</para>
+          </listitem><listitem>
+            <para> The <programlisting format="linespecific">libkickermain</programlisting> library required by some Kicker applets, as there is no Kicker in Fedora 10 and thus Kicker applets cannot be used.</para>
+          </listitem>
+        </itemizedlist><para />
+        <para>
+          <para>
+            <para>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                </imageobject><caption>
+                  <para />
+                </caption>
+              </inlinemediaobject>
+            </para><para>
+              <emphasis>Developing new software against the legacy API is discouraged.</emphasis>
+              <literallayout>
+</literallayout>As with any backwards-compatibility library, you would be developing against a deprecated interface.</para>
+          </para>
+        </para>
+      </section>
+    </section>
+  </article>
+</book>
diff --git a/en-US/KDE_4_Development_Platform.xml b/en-US/KDE_4_Development_Platform.xml
deleted file mode 100644
index b60f0e6..0000000
--- a/en-US/KDE_4_Development_Platform.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/KDE4DevelopmentPlatform</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/KDE4DevelopmentPlatform</title>
-      <section id="">
-        <title>KDE 4 Development Platform </title>
-        <para>Fedora 8 includes KDE 4.0 (beta) development libraries. The following new packages are provided: </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <programlisting format="linespecific">kdelibs4</programlisting>: KDE 4 libraries</para>
-          </listitem><listitem>
-            <para>
-              <programlisting format="linespecific">kdepimlibs</programlisting>: KDE 4 PIM libraries</para>
-          </listitem><listitem>
-            <para>
-              <programlisting format="linespecific">kdebase4</programlisting>: KDE 4 core runtime files</para>
-          </listitem>
-        </itemizedlist><para>Use these packages to develop, build and run KDE 4 applications within KDE 3 or any other desktop environment.</para>
-        <para>The <programlisting format="linespecific">kdebase4</programlisting> package also includes a beta version of the <emphasis>Dolphin</emphasis> file manager as a technology preview. As this is a beta version, some issues may still be present. If you need a stable version of <emphasis>Dolphin</emphasis>, please install the <programlisting format="linespecific">d3lphin</programlisting> package, which is based on KDE 3 and can be safely installed alongside <programlisting format="linespecific">kdebase4</programlisting>.</para><para>These packages are designed to: </para>
-        <itemizedlist>
-          <listitem>
-            <para> comply with the Filesystem Hierarchy Standard (FHS), and</para>
-          </listitem><listitem>
-            <para> be completely safe to install in parallel with KDE 3, including the <programlisting format="linespecific">-devel</programlisting> packages.</para>
-          </listitem>
-        </itemizedlist><para>In order to achieve this, Fedora KDE SIG members made 2 changes to the <programlisting format="linespecific">-devel</programlisting> packages: </para><itemizedlist>
-          <listitem>
-            <para> The library symlinks are installed to <programlisting format="linespecific">/usr/lib/kde4/devel</programlisting> or <programlisting format="linespecific">/usr/lib64/kde4/devel</programlisting> depending on system architecture.</para>
-          </listitem><listitem>
-            <para> The <programlisting format="linespecific">kconfig_compiler</programlisting> and <programlisting format="linespecific">makekdewidgets</programlisting> tools have been renamed <programlisting format="linespecific">kconfig_compiler4</programlisting> and <programlisting format="linespecific">makekdewidgets4</programlisting>, respectively.</para>
-          </listitem>
-        </itemizedlist><para>These changes should be completely transparent to the vast majority of KDE 4 applications that use <programlisting format="linespecific">cmake</programlisting> to build, since <programlisting format="linespecific">FindKDE4Internal.cmake</programlisting> has been patched to match these changes.</para><para>Note that <programlisting format="linespecific">kdebase4</programlisting> does <emphasis>not</emphasis> include the KDE 4 Desktop package <programlisting format="linespecific">kdebase-workspace</programlisting> and its components such as <emphasis>Plasma</emphasis> and <emphasis>KWin</emphasis> version 4.  The <programlisting format="linespecific">kdebase-workspace</programlisting> package is still too incomplete and unstable for daily use and would conflict with KDE 3.</para>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/KDE_4_development_platform.xml b/en-US/KDE_4_development_platform.xml
new file mode 100644
index 0000000..8226017
--- /dev/null
+++ b/en-US/KDE_4_development_platform.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Devel/KDE4DevelopmentPlatform</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Devel/KDE4DevelopmentPlatform</title>
+      <section id="sn-">
+        <title>KDE 4 Development Platform </title>
+        <para>Fedora 8 includes KDE 4.0 (beta) development libraries. The following new packages are provided: </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <programlisting format="linespecific">kdelibs4</programlisting>: KDE 4 libraries</para>
+          </listitem><listitem>
+            <para>
+              <programlisting format="linespecific">kdepimlibs</programlisting>: KDE 4 PIM libraries</para>
+          </listitem><listitem>
+            <para>
+              <programlisting format="linespecific">kdebase4</programlisting>: KDE 4 core runtime files</para>
+          </listitem>
+        </itemizedlist><para>Use these packages to develop, build and run KDE 4 applications within KDE 3 or any other desktop environment.</para>
+        <para>The <programlisting format="linespecific">kdebase4</programlisting> package also includes a beta version of the <emphasis>Dolphin</emphasis> file manager as a technology preview. As this is a beta version, some issues may still be present. If you need a stable version of <emphasis>Dolphin</emphasis>, please install the <programlisting format="linespecific">d3lphin</programlisting> package, which is based on KDE 3 and can be safely installed alongside <programlisting format="linespecific">kdebase4</programlisting>.</para><para>These packages are designed to: </para>
+        <itemizedlist>
+          <listitem>
+            <para> comply with the Filesystem Hierarchy Standard (FHS), and</para>
+          </listitem><listitem>
+            <para> be completely safe to install in parallel with KDE 3, including the <programlisting format="linespecific">-devel</programlisting> packages.</para>
+          </listitem>
+        </itemizedlist><para>In order to achieve this, Fedora KDE SIG members made 2 changes to the <programlisting format="linespecific">-devel</programlisting> packages: </para><itemizedlist>
+          <listitem>
+            <para> The library symlinks are installed to <programlisting format="linespecific">/usr/lib/kde4/devel</programlisting> or <programlisting format="linespecific">/usr/lib64/kde4/devel</programlisting> depending on system architecture.</para>
+          </listitem><listitem>
+            <para> The <programlisting format="linespecific">kconfig_compiler</programlisting> and <programlisting format="linespecific">makekdewidgets</programlisting> tools have been renamed <programlisting format="linespecific">kconfig_compiler4</programlisting> and <programlisting format="linespecific">makekdewidgets4</programlisting>, respectively.</para>
+          </listitem>
+        </itemizedlist><para>These changes should be completely transparent to the vast majority of KDE 4 applications that use <programlisting format="linespecific">cmake</programlisting> to build, since <programlisting format="linespecific">FindKDE4Internal.cmake</programlisting> has been patched to match these changes.</para><para>Note that <programlisting format="linespecific">kdebase4</programlisting> does <emphasis>not</emphasis> include the KDE 4 Desktop package <programlisting format="linespecific">kdebase-workspace</programlisting> and its components such as <emphasis>Plasma</emphasis> and <emphasis>KWin</emphasis> version 4.  The <programlisting format="linespecific">kdebase-workspace</programlisting> package is still too incomplete and unstable for daily use and would conflict with KDE 3.</para>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Legal.xml b/en-US/Legal.xml
index 86222cd..ce7d91f 100644
--- a/en-US/Legal.xml
+++ b/en-US/Legal.xml
@@ -6,12 +6,12 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Legal</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/Legal</title>
-      <section id="">
+      <section id="sn-">
         <title>Legal</title>
         <para>The Fedora Project is sponsored by Red Hat, Inc.</para>
-        <section id="">
+        <section id="sn-">
           <title>License </title>
           <para>The Fedora License Agreement is included with each release.  A reference version is available on the Fedora Project website:</para>
           <para>
@@ -20,19 +20,19 @@
           <para>
             <ulink url="http://fedoraproject.org/wiki/Legal/Licenses/OPL">http://fedoraproject.org/wiki/Legal/Licenses/OPL</ulink>
           </para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Trademarks </title>
           <para>'Fedora' and the Fedora logo are trademarks of Red Hat, Inc. and are subject to the terms of the Fedora Trademark Guidelines:</para>
           <para>
             <ulink url="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">http://fedoraproject.org/wiki/Legal/TrademarkGuidelines</ulink>
           </para><para>All other trademarks are the property of their respective owners.</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>External References </title>
           <para>This document may link to other resources that are not under the control of and are not maintained by the Fedora Project. Red Hat, Inc. is not responsible for the content of those resources. We provide these links only as a convenience, and the inclusion of any link to such a resource does not imply endorsement by the Fedora Project or Red Hat of that resource. We reserve the right to terminate any link or linking program at any time.</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Export </title>
           <para>Certain export restrictions may apply to Fedora Project releases.  Refer to <ulink url="http://fedoraproject.org/wiki/Legal/Export">http://fedoraproject.org/wiki/Legal/Export</ulink> for more details.</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>More Information </title>
           <para>Additional legal information surrounding this document and Fedora Project releases is available on the Fedora Project website:</para>
           <para>
diff --git a/en-US/Linux_Kernel.xml b/en-US/Linux_Kernel.xml
deleted file mode 100644
index be69e5d..0000000
--- a/en-US/Linux_Kernel.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Kernel</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Kernel</title>
-      <section id="">
-        <title>Linux Kernel </title>
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis>Deprecated or out of date content?</emphasis>
-              <literallayout>
-</literallayout>This content may be deprecated or out of date, it has not been updated since the Fedora 9 release notes.</para>
-          </para>
-        </para><para>This section covers changes and important information regarding the 2.6.27 based kernel in Fedora 10.  The 2.6.27 kernel includes:</para>
-        <itemizedlist>
-          <listitem>
-            <para> The Fedora kernel offers <programlisting format="linespecific">paravirt_ops</programlisting> support in <programlisting format="linespecific">domU</programlisting>, as part of the kernel team's efforts to reduce the work required to produce current Xen kernels.</para>
-          </listitem>
-        </itemizedlist><itemizedlist>
-          <listitem>
-            <para> Xen fully virtualized guests can directly boot a kernel and <programlisting format="linespecific">initrd</programlisting> image and pass kernel boot args.  For more details refer to <ulink url="http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot.">http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot.</ulink>
-            </para>
-          </listitem>
-        </itemizedlist><section id="">
-          <title>Version </title>
-          <para>Fedora may include additional patches to the kernel for improvements, bug fixes, or additional features. For this reason, the Fedora kernel may not be line-for-line equivalent to the so-called <emphasis>vanilla kernel</emphasis> from the kernel.org web site:</para><para>
-            <ulink url="http://www.kernel.org/">http://www.kernel.org/</ulink>
-          </para><para>To obtain a list of these patches, download the source RPM package and run the following command against it:</para>
-          <para />
-          <programlisting>rpm -qpl kernel-&lt;version&gt;.src.rpm</programlisting>
-          <para />
-        </section><section id="">
-          <title>Changelog </title>
-          <para>To retrieve a log of changes to the package, run the following command:</para>
-          <para />
-          <programlisting>rpm -q --changelog kernel-&lt;version&gt;</programlisting>
-          <para />
-          <para>If you need a user friendly version of the changelog, refer to <ulink url="http://wiki.kernelnewbies.org/LinuxChanges.">http://wiki.kernelnewbies.org/LinuxChanges.</ulink> A short and full diff of the kernel is available from <ulink url="http://kernel.org/git.">http://kernel.org/git.</ulink> The Fedora version kernel is based on the Linus tree.</para><para>Customizations made for the Fedora version are available from <ulink url="http://cvs.fedoraproject.org.">http://cvs.fedoraproject.org.</ulink>
-          </para>
-        </section><section id="">
-          <title>Kernel Flavors </title>
-          <para>Fedora 10 includes the following kernel builds: </para>
-          <itemizedlist>
-            <listitem>
-              <para> Native kernel, for use in most systems.  Configured sources are available in the <programlisting format="linespecific">kernel-devel</programlisting> package.</para>
-            </listitem>
-          </itemizedlist><itemizedlist>
-            <listitem>
-              <para> The kernel-PAE, for use in 32-bit x86 systems with more than 4GB of RAM, or with CPUs that have a NX (No eXecute) feature.  This kernel support both uniprocessor and multi-processor systems.  Configured sources are available in the <programlisting format="linespecific">kernel-PAE-devel</programlisting> package.</para>
-            </listitem>
-          </itemizedlist><itemizedlist>
-            <listitem>
-              <para> Virtualization kernel for use with the Xen emulator package. Configured sources are available in the <programlisting format="linespecific">kernel-xen-devel</programlisting> package.</para>
-            </listitem>
-          </itemizedlist><para>You may install kernel headers for all four kernel flavors at the same time. The files are installed in the <programlisting format="linespecific">/usr/src/kernels/&lt;version&gt;[-PAE|-xen|-kdump] -&lt;arch&gt;/</programlisting> tree. Use the following command:</para><para />
-          <programlisting>su -c 'yum install kernel{,-PAE,-xen,-kdump}-devel'</programlisting>
-          <para />
-          <para>Select one or more of these flavors, separated by commas and no spaces, as appropriate.  Enter the root password when prompted.</para>
-          <para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis>x86 Kernel Includes Kdump</emphasis>
-                <literallayout>
-</literallayout>Both the x86_64 and the i686 kernels are relocatable, so they no longer require a separate kernel for kdump capability. PPC64 still requires a separate kdump kernel.</para>
-            </para>
-          </para><para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis>Default Kernel Provides SMP</emphasis>
-                <literallayout>
-</literallayout>There is no separate SMP kernel available for Fedora on i386, x86_64, and ppc64.  Multiprocessor support is provided by the native kernel.</para>
-            </para>
-          </para><para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis>PowerPC Kernel Support</emphasis>
-                <literallayout>
-</literallayout>There is no support for Xen or kdump for the PowerPC architecture in Fedora. 32-bit PowerPC does still have a separate SMP kernel.</para>
-            </para>
-          </para>
-        </section><section id="">
-          <title>Preparing for Kernel Development </title>
-          <para>Fedora 10 does not include the kernel-source package provided by older versions since only the kernel-devel package is required now to build external modules. Configured sources are available, as described [#Kernel_Flavors above]. </para>
-          <para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/f/ff/Important.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis>Custom Kernel Building</emphasis>
-                <literallayout>
-</literallayout>For information on kernel development and working with custom kernels, refer to <ulink url="http://fedoraproject.org/wiki/Building_a_custom_kernel.">http://fedoraproject.org/wiki/Building_a_custom_kernel.</ulink>
-              </para>
-            </para>
-          </para>
-        </section><section id="">
-          <title>Reporting Bugs </title>
-          <para>Refer to <ulink url="http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html">http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html</ulink> for information on reporting bugs in the Linux kernel.  You may also use <ulink url="http://bugzilla.redhat.com">http://bugzilla.redhat.com</ulink> for reporting bugs that are specific to Fedora.</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Linux_kernel.xml b/en-US/Linux_kernel.xml
new file mode 100644
index 0000000..5501efe
--- /dev/null
+++ b/en-US/Linux_kernel.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/Kernel</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/Kernel</title>
+      <section id="sn-">
+        <title>Linux Kernel </title>
+        <para>
+          <para>
+            <para>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                </imageobject><caption>
+                  <para />
+                </caption>
+              </inlinemediaobject>
+            </para><para>
+              <emphasis>Deprecated or out of date content?</emphasis>
+              <literallayout>
+</literallayout>This content may be deprecated or out of date, it has not been updated since the Fedora 9 release notes.</para>
+          </para>
+        </para><para>This section covers changes and important information regarding the 2.6.27 based kernel in Fedora 10.  The 2.6.27 kernel includes:</para>
+        <itemizedlist>
+          <listitem>
+            <para> The Fedora kernel offers <programlisting format="linespecific">paravirt_ops</programlisting> support in <programlisting format="linespecific">domU</programlisting>, as part of the kernel team's efforts to reduce the work required to produce current Xen kernels.</para>
+          </listitem>
+        </itemizedlist><itemizedlist>
+          <listitem>
+            <para> Xen fully virtualized guests can directly boot a kernel and <programlisting format="linespecific">initrd</programlisting> image and pass kernel boot args.  For more details refer to <ulink url="http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot.">http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot.</ulink>
+            </para>
+          </listitem>
+        </itemizedlist><section id="sn-">
+          <title>Version </title>
+          <para>Fedora may include additional patches to the kernel for improvements, bug fixes, or additional features. For this reason, the Fedora kernel may not be line-for-line equivalent to the so-called <emphasis>vanilla kernel</emphasis> from the kernel.org web site:</para><para>
+            <ulink url="http://www.kernel.org/">http://www.kernel.org/</ulink>
+          </para><para>To obtain a list of these patches, download the source RPM package and run the following command against it:</para>
+          <para />
+          <programlisting>rpm -qpl kernel-&lt;version&gt;.src.rpm</programlisting>
+          <para />
+        </section><section id="sn-">
+          <title>Changelog </title>
+          <para>To retrieve a log of changes to the package, run the following command:</para>
+          <para />
+          <programlisting>rpm -q --changelog kernel-&lt;version&gt;</programlisting>
+          <para />
+          <para>If you need a user friendly version of the changelog, refer to <ulink url="http://wiki.kernelnewbies.org/LinuxChanges.">http://wiki.kernelnewbies.org/LinuxChanges.</ulink> A short and full diff of the kernel is available from <ulink url="http://kernel.org/git.">http://kernel.org/git.</ulink> The Fedora version kernel is based on the Linus tree.</para><para>Customizations made for the Fedora version are available from <ulink url="http://cvs.fedoraproject.org.">http://cvs.fedoraproject.org.</ulink>
+          </para>
+        </section><section id="sn-">
+          <title>Kernel Flavors </title>
+          <para>Fedora 10 includes the following kernel builds: </para>
+          <itemizedlist>
+            <listitem>
+              <para> Native kernel, for use in most systems.  Configured sources are available in the <programlisting format="linespecific">kernel-devel</programlisting> package.</para>
+            </listitem>
+          </itemizedlist><itemizedlist>
+            <listitem>
+              <para> The kernel-PAE, for use in 32-bit x86 systems with more than 4GB of RAM, or with CPUs that have a NX (No eXecute) feature.  This kernel support both uniprocessor and multi-processor systems.  Configured sources are available in the <programlisting format="linespecific">kernel-PAE-devel</programlisting> package.</para>
+            </listitem>
+          </itemizedlist><itemizedlist>
+            <listitem>
+              <para> Virtualization kernel for use with the Xen emulator package. Configured sources are available in the <programlisting format="linespecific">kernel-xen-devel</programlisting> package.</para>
+            </listitem>
+          </itemizedlist><para>You may install kernel headers for all four kernel flavors at the same time. The files are installed in the <programlisting format="linespecific">/usr/src/kernels/&lt;version&gt;[-PAE|-xen|-kdump] -&lt;arch&gt;/</programlisting> tree. Use the following command:</para><para />
+          <programlisting>su -c 'yum install kernel{,-PAE,-xen,-kdump}-devel'</programlisting>
+          <para />
+          <para>Select one or more of these flavors, separated by commas and no spaces, as appropriate.  Enter the root password when prompted.</para>
+          <para>
+            <para>
+              <para>
+                <inlinemediaobject>
+                  <imageobject>
+                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                  </imageobject><caption>
+                    <para />
+                  </caption>
+                </inlinemediaobject>
+              </para><para>
+                <emphasis>x86 Kernel Includes Kdump</emphasis>
+                <literallayout>
+</literallayout>Both the x86_64 and the i686 kernels are relocatable, so they no longer require a separate kernel for kdump capability. PPC64 still requires a separate kdump kernel.</para>
+            </para>
+          </para><para>
+            <para>
+              <para>
+                <inlinemediaobject>
+                  <imageobject>
+                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                  </imageobject><caption>
+                    <para />
+                  </caption>
+                </inlinemediaobject>
+              </para><para>
+                <emphasis>Default Kernel Provides SMP</emphasis>
+                <literallayout>
+</literallayout>There is no separate SMP kernel available for Fedora on i386, x86_64, and ppc64.  Multiprocessor support is provided by the native kernel.</para>
+            </para>
+          </para><para>
+            <para>
+              <para>
+                <inlinemediaobject>
+                  <imageobject>
+                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
+                  </imageobject><caption>
+                    <para />
+                  </caption>
+                </inlinemediaobject>
+              </para><para>
+                <emphasis>PowerPC Kernel Support</emphasis>
+                <literallayout>
+</literallayout>There is no support for Xen or kdump for the PowerPC architecture in Fedora. 32-bit PowerPC does still have a separate SMP kernel.</para>
+            </para>
+          </para>
+        </section><section id="sn-">
+          <title>Preparing for Kernel Development </title>
+          <para>Fedora 10 does not include the kernel-source package provided by older versions since only the kernel-devel package is required now to build external modules. Configured sources are available, as described [#Kernel_Flavors above]. </para>
+          <para>
+            <para>
+              <para>
+                <inlinemediaobject>
+                  <imageobject>
+                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/f/ff/Important.png" scalefit="1" width="35px" />
+                  </imageobject><caption>
+                    <para />
+                  </caption>
+                </inlinemediaobject>
+              </para><para>
+                <emphasis>Custom Kernel Building</emphasis>
+                <literallayout>
+</literallayout>For information on kernel development and working with custom kernels, refer to <ulink url="http://fedoraproject.org/wiki/Building_a_custom_kernel.">http://fedoraproject.org/wiki/Building_a_custom_kernel.</ulink>
+              </para>
+            </para>
+          </para>
+        </section><section id="sn-">
+          <title>Reporting Bugs </title>
+          <para>Refer to <ulink url="http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html">http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html</ulink> for information on reporting bugs in the Linux kernel.  You may also use <ulink url="http://bugzilla.redhat.com">http://bugzilla.redhat.com</ulink> for reporting bugs that are specific to Fedora.</para>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Mail_Servers.xml b/en-US/Mail_Servers.xml
deleted file mode 100644
index c56b36e..0000000
--- a/en-US/Mail_Servers.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/MailServers</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/MailServers</title>
-      <section id="">
-        <title>Mail Servers </title>
-        <para>This section concerns electronic mail servers or mail transfer agents (MTAs).</para>
-        <section id="">
-          <title>Sendmail </title>
-          <para>By default, the Sendmail mail transport agent (MTA) does not accept network connections from any host other than the local computer.  To configure Sendmail as a server for other clients:</para>
-          <orderedlist numeration="arabic">
-            <listitem>
-              <para> Edit <programlisting format="linespecific">/etc/mail/sendmail.mc</programlisting> and either change the <programlisting format="linespecific">DAEMON_OPTIONS</programlisting> line to also listen on network devices, or comment out this option entirely using the <programlisting format="linespecific">dnl</programlisting> comment delimiter.</para>
-            </listitem><listitem>
-              <para> Install the <programlisting format="linespecific">sendmail-cf</programlisting> package:  <programlisting>su -c 'yum install sendmail-cf'</programlisting>
-              </para>
-            </listitem><listitem>
-              <para> Regenerate <programlisting format="linespecific">/etc/mail/sendmail.cf</programlisting>:  <programlisting>su -c 'make -C /etc/mail'</programlisting>
-              </para>
-            </listitem>
-          </orderedlist>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Mail_servers.xml b/en-US/Mail_servers.xml
new file mode 100644
index 0000000..634d38e
--- /dev/null
+++ b/en-US/Mail_servers.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?
+
+ <book>
+  <article lang="en">
+    <articleinfo>
+      <title>Docs/Beats/MailServers</title>
+    </articleinfo><section id="sn-">
+      <title>Docs/Beats/MailServers</title>
+      <section id="sn-">
+        <title>Mail Servers </title>
+        <para>This section concerns electronic mail servers or mail transfer agents (MTAs).</para>
+        <section id="sn-">
+          <title>Sendmail </title>
+          <para>By default, the Sendmail mail transport agent (MTA) does not accept network connections from any host other than the local computer.  To configure Sendmail as a server for other clients:</para>
+          <orderedlist numeration="arabic">
+            <listitem>
+              <para> Edit <programlisting format="linespecific">/etc/mail/sendmail.mc</programlisting> and either change the <programlisting format="linespecific">DAEMON_OPTIONS</programlisting> line to also listen on network devices, or comment out this option entirely using the <programlisting format="linespecific">dnl</programlisting> comment delimiter.</para>
+            </listitem><listitem>
+              <para> Install the <programlisting format="linespecific">sendmail-cf</programlisting> package:  <programlisting>su -c 'yum install sendmail-cf'</programlisting>
+              </para>
+            </listitem><listitem>
+              <para> Regenerate <programlisting format="linespecific">/etc/mail/sendmail.cf</programlisting>:  <programlisting>su -c 'make -C /etc/mail'</programlisting>
+              </para>
+            </listitem>
+          </orderedlist>
+        </section>
+      </section>
+    </section>
+  </article>
+</book>
\ No newline at end of file
diff --git a/en-US/Multimedia.xml b/en-US/Multimedia.xml
index 458c075..7225cfc 100644
--- a/en-US/Multimedia.xml
+++ b/en-US/Multimedia.xml
@@ -6,12 +6,12 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Multimedia</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/Multimedia</title>
-      <section id="">
+      <section id="sn-">
         <title>Multimedia </title>
         <para>Fedora includes applications for assorted multimedia functions, including playback, recording, and editing.  Additional packages are available through the Fedora Package Collection software repository.  For additional information about multimedia in Fedora, refer to the Multimedia section of the Fedora Project website at <ulink url="http://fedoraproject.org/wiki/Multimedia.">http://fedoraproject.org/wiki/Multimedia.</ulink>
-        </para><section id="">
+        </para><section id="sn-">
           <title>Multimedia players </title>
           <para>The default installation of Fedora includes <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> for media playback.  Many other programs are available in the Fedora repositories, including the popular <emphasis>XMMS</emphasis> player and KDE's <emphasis>Amarok</emphasis>.  Both GNOME and KDE have a selection of players that can be used with a variety of formats.  Additional programs are available from third parties to handle other formats.</para><para>
             <emphasis>Totem</emphasis>, the default movie player for GNOME, now has the ability to switch playback back-ends without recompilation or switching packages. To install the xine back-end, use <emphasis>Add/Remove Software</emphasis> to install <programlisting format="linespecific">totem-xine</programlisting> or run the following command:</para><para />
@@ -36,7 +36,7 @@ su -c 'totem-backend -b xine'
 su -c 'totem-backend -b gstreamer'
 </programlisting>
           <para />
-        </section><section id="">
+        </section><section id="sn-">
           <title>Ogg and Xiph.Org foundation formats </title>
           <para>Fedora includes complete support for the Ogg media container format and the Vorbis audio, Theora video, Speex audio, and FLAC lossless audio formats.  These freely-distributable formats are not encumbered by patent or license restrictions.  They provide powerful and flexible alternatives to more popular, restricted formats.  The Fedora Project encourages the use of open source formats in place of restricted ones.  For more information on these formats and how to use them, refer to:</para>
           <itemizedlist>
@@ -49,7 +49,7 @@ su -c 'totem-backend -b gstreamer'
               </para>
             </listitem>
           </itemizedlist>
-        </section><section id="">
+        </section><section id="sn-">
           <title>MP3, DVD, and other excluded multimedia </title>
           <para>Fedora cannot include support for MP3 or DVD video playback or recording.  The MP3 formats are patented, and the patent holders have not provided the necessary licenses.  DVD video formats are patented and equipped with an encryption scheme.  The patent holders have not provided the necessary licenses, and the code needed to decrypt CSS-encrypted discs may violate the Digital Millennium Copyright Act, a copyright law of the United States. Fedora also excludes other multimedia software due to patent, copyright, or license restrictions, including Adobe's Flash Player and Real Media's Real Player.  For more on this subject, please refer to <ulink url="http://fedoraproject.org/wiki/ForbiddenItems.">http://fedoraproject.org/wiki/ForbiddenItems.</ulink>
           </para><para>While other MP3 options may be available for Fedora, Fluendo now offers an MP3 plugin for GStreamer that has the related patents licensed for end users.  This plugin enables MP3 support in applications that use the GStreamer framework as a backend.  We cannot distribute this plugin in Fedora for licensing reasons, but it offers a new solution for an old problem.  For more information refer to these pages:</para>
@@ -72,10 +72,10 @@ su -c 'totem-backend -b gstreamer'
               </para>
             </listitem>
           </itemizedlist>
-        </section><section id="">
+        </section><section id="sn-">
           <title>CD and DVD authoring and burning </title>
           <para>Default installations of Fedora and the Desktop Live spin include a built-in feature for CD and DVD burning. Fedora includes a variety of other tools for easily creating and burning CDs and DVDs. Fedora includes graphical programs such as <programlisting format="linespecific">brasero</programlisting>, <programlisting format="linespecific">gnomebaker</programlisting>, and <programlisting format="linespecific">k3b</programlisting>. Console programs including <programlisting format="linespecific">wodim</programlisting>, <programlisting format="linespecific">readom</programlisting>, and <programlisting format="linespecific">genisoimage</programlisting>.  Graphical programs are found under <emphasis>Applications &gt; Sound &amp; Video</emphasis>.</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Screencasts </title>
           <para>You can use Fedora to create and play back <emphasis>screencasts</emphasis>, which are recorded desktop sessions, using open technologies.  Fedora includes <programlisting format="linespecific">istanbul</programlisting>, which creates screencasts using the Theora video format, and 'byzanz', which creates screencasts as animated GIF files.  You can play back these videos using one of several players included in Fedora.  This is the preferred way to submit screencasts to the Fedora Project for either developers or end-users.  For more comprehensive instructions, refer to the screencasting page:</para><itemizedlist>
             <listitem>
@@ -84,10 +84,10 @@ su -c 'totem-backend -b gstreamer'
               </para>
             </listitem>
           </itemizedlist>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Extended support through plugins </title>
           <para>Most of the media players in Fedora support the use of plugins to add support for additional media formats and sound output systems.  Some use powerful backends such as the <programlisting format="linespecific">gstreamer</programlisting> package to handle media format support and sound output.  Fedora offers plugin packages for these backends and for individual applications, and third parties may offer additional plugins to add even greater capabilities.</para>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Infrared remote support </title>
           <para>A new graphical frontend to LIRC is provided by <programlisting format="linespecific">gnome-lirc-properties</programlisting>, making it easy to connect and configure infrared remote controls. LIRC is routinely used in multimedia applications to implement support for infrared remote controls, and using it in <emphasis>Rhythmbox</emphasis> and <emphasis>Totem</emphasis> should be as easy as plugging the remote receiver into your computer, then selecting <emphasis>[Auto-detect]</emphasis> in the <emphasis>Infrared Remote Control</emphasis> preferences.</para><para>If you had a previous setup with LIRC, it is recommended you regenerate the configuration files with <programlisting format="linespecific">gnome-lirc-properties</programlisting>. This is required so that a majority of applications work with your new setup.</para><para>Refer to the feature page for more information:</para>
           <itemizedlist>
@@ -97,7 +97,7 @@ su -c 'totem-backend -b gstreamer'
               </para>
             </listitem>
           </itemizedlist>
-        </section><section id="">
+        </section><section id="sn-">
           <title>Glitch-free PulseAudio </title>
           <para>The PulseAudio sound server has been rewritten to use timer-based audio scheduling instead of the traditional interrupt-driven approach. This is the approach that is taken by other systems such as Apple's CoreAudio and the Windows Vista audio subsystem.  The timer-based audio scheduling has a number of advantages, including reduced power consumption, minimization of drop-outs, and flexible adjustment of the latency for the needs of the application.</para>
         </section>
diff --git a/en-US/Networking.xml b/en-US/Networking.xml
index 58c8d42..38364fe 100644
--- a/en-US/Networking.xml
+++ b/en-US/Networking.xml
@@ -6,12 +6,12 @@
   <article lang="en">
     <articleinfo>
       <title>Docs/Beats/Networking</title>
-    </articleinfo><section id="">
+    </articleinfo><section id="sn-">
       <title>Docs/Beats/Networking</title>
-      <section id="">
+      <section id="sn-">
         <title>Networking </title>
         <para>This section contains information about networking changes in Fedora 10.</para>
-        <section id="">
+        <section id="sn-">
           <title>Wireless Connection Sharing </title>
           <para>Connection sharing makes it possible to easily set up an ad-hoc WiFi network on a machine with a network connection and a spare wireless card. If the machine has primary network connection (wired, 3G, second wireless card), routing is set up so that devices connected to the ad-hoc WiFi network can share the connection to the outside network.</para>
           <para>This ability is provided by the <emphasis>NetworkManager</emphasis>' applet <programlisting format="linespecific">nm-applet</programlisting>. Although <programlisting format="linespecific">nm-applet</programlisting> has had a <emphasis>Create New Wireless Network</emphasis> menu item for a long time, this feature makes it work better.</para><para>When you create a new WiFi network, you have to specify the name of the network and what kind of wireless security to use. NetworkManager then sets up the wireless card to work as an ad-hoc WiFi node that others can join. The routing will be set up between the new network and the primary network connection, and DHCP is used for assigning IP addresses on the new shared WiFi network. DNS queries are also forwarded to upstream nameservers transparently.</para>
diff --git a/en-US/PPC_Specifics_for_Fedora.xml b/en-US/PPC_Specifics_for_Fedora.xml
deleted file mode 100644
index 8ee88a6..0000000
--- a/en-US/PPC_Specifics_for_Fedora.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/ArchSpecific/PPC</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/ArchSpecific/PPC</title>
-      <section id="">
-        <title>PPC Specifics for Fedora </title>
-        <para>This section covers specific information about Fedora and the PPC hardware platform.</para>
-        <section id="">
-          <title>Hardware Requirements for PPC </title>
-          <section id="">
-            <title>Processor and memory </title>
-            <itemizedlist>
-              <listitem>
-                <para> Minimum CPU: PowerPC G3 / POWER3</para>
-              </listitem><listitem>
-                <para> Fedora 10 supports the <emphasis>New World</emphasis> generation of Apple Power Macintosh, shipped from circa 1999 onward. Although <emphasis>Old World</emphasis> machines should work, they require a special bootloader which is not included in the Fedora distribution. Fedora has also been installed and tested on POWER5 and POWER6 machines.</para>
-              </listitem><listitem>
-                <para> Fedora 10 supports pSeries, iSeries, and Cell Broadband Engine machines.</para>
-              </listitem><listitem>
-                <para> Fedora 10 also supports the Sony PlayStation 3 and Genesi Pegasos II and Efika.</para>
-              </listitem><listitem>
-                <para> Fedora 10 includes new hardware support for the P.A. Semiconductor 'Electra' machines.</para>
-              </listitem><listitem>
-                <para> Fedora 10 also includes support for Terrasoft Solutions powerstation workstations.</para>
-              </listitem><listitem>
-                <para> Recommended for text-mode: 233 MHz G3 or better, 128MiB RAM.</para>
-              </listitem><listitem>
-                <para> Recommended for graphical: 400 MHz G3 or better, 256MiB RAM.</para>
-              </listitem>
-            </itemizedlist>
-          </section><section id="">
-            <title>Hard disk space </title>
-            <para>The complete packages can occupy over 9 GB of disk space.  Final size is entirely determined by the installing spin and the packages selected during installation.  Additional disk space is required during installation to support the installation environment. This additional disk space corresponds to the size of <programlisting format="linespecific">/Fedora/base/stage2.img</programlisting> (on Installation Disc 1) plus the size of the files in <programlisting format="linespecific">/var/lib/rpm</programlisting> on the installed system.</para><para>In practical terms, additional space requirements may range from as little as 90 MiB for a minimal installation to as much as an additional 175 MiB for a larger installation.</para>
-            <para>Additional space is also required for any user data, and at least 5% free space should be maintained for proper system operation.</para>
-          </section>
-        </section><section id="">
-          <title>4 KiB Pages on 64-bit machines </title>
-          <para>After a brief experiment with 64KiB pages in Fedora Core 6, the PowerPC64 kernel has now been switched back to 4KiB pages. The installer should reformat any swap partitions automatically during an upgrade.</para>
-        </section><section id="">
-          <title>The Apple keyboard </title>
-          <para>The <emphasis>[Option]</emphasis> key on Apple systems is equivalent to the <emphasis>[Alt]</emphasis> key on the PC. Where documentation and the installer refer to the <emphasis>[Alt]</emphasis> key, use the <emphasis>[Option]</emphasis> key. For some key combinations you may need to use the <emphasis>[Option]</emphasis> key in conjunction with the <emphasis>[Fn]</emphasis> key, such as <emphasis>[Option]</emphasis>-<emphasis>[Fn]</emphasis>-<emphasis>[F3]</emphasis> to switch to virtual terminal tty3.</para>
-        </section><section id="">
-          <title>PPC installation notes </title>
-          <para>Fedora Installation Disc 1 is bootable on supported hardware. In addition, a bootable CD image appears in the <programlisting format="linespecific">images/</programlisting> directory of this disc. These images behave differently according to your system hardware:</para><itemizedlist>
-            <listitem>
-              <para> On most machines, the bootloader automatically boots the appropriate 32-bit or 64-bit installer from the install disc.</para>
-            </listitem>
-          </itemizedlist><itemizedlist>
-            <listitem>
-              <para> 64-bit IBM pSeries (POWER4/POWER5), current iSeries models</para>
-            </listitem>
-          </itemizedlist><para>After using OpenFirmware to boot the CD, the bootloader, <programlisting format="linespecific">yaboot</programlisting>, automatically boots the 64-bit installer.</para><itemizedlist>
-            <listitem>
-              <para> IBM "Legacy" iSeries (POWER4)</para>
-            </listitem>
-          </itemizedlist><para>So-called "Legacy" iSeries models, which do not use OpenFirmware, require use of the boot image located in the <programlisting format="linespecific">images/iSeries</programlisting> directory of the installation tree.</para><itemizedlist>
-            <listitem>
-              <para> 32-bit CHRP (IBM RS/6000 and others)</para>
-            </listitem>
-          </itemizedlist><para>After using OpenFirmware to boot the CD, select the <programlisting format="linespecific">linux32</programlisting> boot image at the <programlisting format="linespecific">boot:</programlisting> prompt to start the 32-bit installer. Otherwise, the 64-bit installer starts and fails.</para><itemizedlist>
-            <listitem>
-              <para> Genesi Pegasos II / Efika 5200B</para>
-            </listitem>
-          </itemizedlist><para>The Fedora kernel supports both Pegasos and Efika without the need to use the "Device Tree Supplement" from powerdeveloper.org. However, the lack of full support for ISO9660 in the firmware means that booting via yaboot from the CD is not possible. Boot the 'netboot' image instead, either from the CD or over the network. Because of the size of the image, you must set the firmware's<programlisting format="linespecific">load-base</programlisting> variable to load files at a high address such as 32MiB instead of the default 4MiB: </para><programlisting>setenv load-base 0x2000000
-</programlisting>
-          <para />
-          <para>At the OpenFirmware prompt, enter the following command to boot the Efika update, if necessary, or the netboot image from the CD: </para>
-          <programlisting>
-boot cd: /images/netboot/ppc32.img
-</programlisting>
-          <para> Or from the network: </para>
-          <programlisting>
-boot eth ppc32.img
-</programlisting>
-          <para />
-          <para>You must also manually configure OpenFirmware to make the installed Fedora system bootable. To do this, set the <programlisting format="linespecific">boot-device</programlisting> and <programlisting format="linespecific">boot-file</programlisting> environment variables appropriately, to load yaboot from the <programlisting format="linespecific">/boot</programlisting> partition. For example, a default installation might require the following: </para><programlisting>setenv boot-device hd:0
-setenv boot-file /yaboot/yaboot
-setenv auto-boot? true
-</programlisting>
-          <para />
-          <itemizedlist>
-            <listitem>
-              <para> PA Semi Electra</para>
-            </listitem>
-          </itemizedlist><para>The Electra firmware does not yet support yaboot; to install on Electra, you can boot the <programlisting format="linespecific">ppc64.img</programlisting> netboot image. After the installation, you will need to manually configure the firmware to load the installed kernel and initrd from the <programlisting format="linespecific">/boot</programlisting> partition.</para><para>Refer to the firmware documentation for further details.</para>
-          <itemizedlist>
-            <listitem>
-              <para> Sony PlayStation 3</para>
-            </listitem>
-          </itemizedlist><para>For installation on PlayStation 3, first update to firmware 1.60 or later. The "Other OS" boot loader must be installed into the flash, following the instructions at <ulink url="http://www.playstation.com/ps3-openplatform/manual.html.">http://www.playstation.com/ps3-openplatform/manual.html.</ulink> A suitable boot loader image can be found on Sony's "ADDON" CD, available from <ulink url="ftp://ftp.kernel.org/pub/linux/kernel/people/geoff/cell/.">ftp://ftp.kernel.org/pub/linux/kernel/people/geoff/cell/.</ulink>
-          </para><para>Once the boot loader is installed, the PlayStation 3 should be able to boot from the Fedora install media. Please note that network installation works best with NFS, since that takes less memory than FTP or HTTP methods. Using the <programlisting format="linespecific">text</programlisting> option also reduces the amount of memory taken by the installer.</para><para>For more info on Fedora and the PlayStation3 or Fedora on PowerPC in general, join the Fedora-PPC mailing list (<ulink url="http://lists.infradead.org/mailman/listinfo/fedora-ppc)">http://lists.infradead.org/mailman/listinfo/fedora-ppc)</ulink> or the <programlisting format="linespecific">#fedora-ppc</programlisting> channel on  FreeNode (<ulink url="http://freenode.net/).">http://freenode.net/).</ulink>
-          </para><itemizedlist>
-            <listitem>
-              <para> Network booting</para>
-            </listitem>
-          </itemizedlist><para>Combined images containing the installer kernel and ramdisk are located in the <programlisting format="linespecific">images/netboot/</programlisting> directory of the installation tree. They are intended for network booting with TFTP, but can be used in many ways.</para><para>The <programlisting format="linespecific">yaboot</programlisting> loader supports TFTP booting for IBM pSeries and Apple Macintosh.  The Fedora Project encourages the use of <programlisting format="linespecific">yaboot</programlisting> over the <programlisting format="linespecific">netboot</programlisting> images.</para><itemizedlist>
-            <listitem>
-              <para> RS/6000 kernel support is currently broken (as of August 28, 2008).</para>
-            </listitem>
-          </itemizedlist><section id="">
-            <title>PPC Specific packages </title>
-            <para />
-            <itemizedlist>
-              <listitem>
-                <para> The <programlisting format="linespecific">ppc64-utils</programlisting> package has been split out into individual packages reflecting upstream packaging (<programlisting format="linespecific">ps3pf-utils</programlisting>, <programlisting format="linespecific">powerpc-utils</programlisting>, <programlisting format="linespecific">powerpc-utils-papr</programlisting>). Although the <programlisting format="linespecific">mkzimage</programlisting> command is no longer supplied, you can use the <programlisting format="linespecific">wrapper</programlisting> script from the <programlisting format="linespecific">kernel-bootwrapper</programlisting> package:</para>
-              </listitem>
-            </itemizedlist><para />
-            <programlisting>wrapper -i initrd-${KERN_VERSION}.img -o zImage-${KERN_VERSION}.img vmlinuz-${KERN_VERSION}
-</programlisting>
-            <para />
-          </section>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/PPC_specifics_for_Fedora.xml b/en-US/PPC_specifics_for_Fedora.xml
new file mode 100644
index 0000000..1e640c1
--- /dev/null
+++ b/en-US/PPC_specifics_for_Fedora.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ 
+<section lang="en" id="sn-PPC_specifics_for_Fedora">
+  <title>PPC specifics for Fedora</title>
+  <para>This section covers specific information about Fedora and the
+    PPC (Power PC) hardware platform.</para>
+  <section id="sn-Hardware_requirements_for_PPC">
+    <title>Hardware requirements for PPC</title>
+    <section id="sn-Processor_and_memory">
+      <title>Processor and memory</title>
+      <itemizedlist>
+	<listitem>
+	  <para> Minimum CPU: PowerPC G3 / POWER3</para>
+	</listitem><listitem>
+	  <para> Fedora 10 supports the New World generation of Apple
+	    Power Macintosh, shipped from circa 1999 onward. Although
+	    Old World machines should work, they require a special
+	    bootloader which is not included in the Fedora distribution.
+	    Fedora has also been installed and tested on POWER5 and
+	    POWER6 machines.</para>
+	</listitem><listitem>
+	  <para> Fedora 10 supports pSeries, iSeries, and Cell Broadband
+	    Engine machines.</para>
+	</listitem><listitem>
+	  <para> Fedora 10 also supports the Sony PlayStation 3 and
+	    Genesi Pegasos II and Efika.</para>
+	</listitem><listitem>
+	  <para> Fedora 10 includes new hardware support for the P.A.
+	    Semiconductor 'Electra' machines.</para>
+	</listitem><listitem>
+	  <para> Fedora 10 also includes support for Terrasoft Solutions
+	    powerstation workstations.</para>
+	</listitem><listitem>
+	  <para> Recommended for text-mode: 233 MHz G3 or better, 128MiB
+	    RAM.</para>
+	</listitem><listitem>
+	  <para> Recommended for graphical: 400 MHz G3 or better, 256MiB
+	    RAM.</para>
+	</listitem>
+      </itemizedlist>
+    </section><section id="sn-Hard_disk_space">
+      <title>Hard disk space</title>
+      <para>The complete packages can occupy over 9 GiB of disk space.
+	Final size is entirely determined by the installing spin and the
+	packages selected during installation.  Additional disk space is
+	required during installation to support the installation
+	environment. This additional disk space corresponds to the size
+	of <filename>/Fedora/base/stage2.img</filename>
+	(on Installation Disc 1) plus the size of the files in
+	<filename>/var/lib/rpm</filename> on the
+	installed system.</para><para>In practical terms, additional
+	space requirements may range from as little as 90 MiB for a
+	minimal installation to as much as an additional 175 MiB for a
+	larger installation.</para>
+      <para>Additional space is also required for any user data, and at
+	least 5% free space should be maintained for proper system
+	operation.</para>
+    </section>
+  </section><section id="sn-4 KiB_pages_on_64-bit_machines">
+    <title>4 KiB pages on 64-bit machines</title>
+    <para>After a brief experiment with 64KiB pages in Fedora Core 6,
+      the PowerPC64 kernel has now been switched back to 4KiB pages. The
+      installer should reformat any swap partitions automatically during
+      an upgrade.</para>
+  </section><section id="sn-The_Apple_keyboard">
+    <title>The Apple keyboard</title>
+    <para>The <keycap>Option</keycap> key on Apple systems is
+      equivalent to the <keycap>Alt</keycap> key on the PC. Where
+      documentation and the installer refer to the
+      <keycap>Alt</keycap> key, use the
+      <keycap>Option</keycap> key. For some key combinations you
+      may need to use the <keycap>Option</keycap> key in
+      conjunction with the <keycap>Fn</keycap> key, such as
+      <keycombo>
+<keycap>Option</keycap><keycap>Fn</keycap><keycap>F3</keycap></keycombo>
+      
+      to switch to virtual terminal tty3.</para>
+  </section><section id="sn-PPC_installation_notes">
+    <title>PPC installation notes</title>
+    <para>Fedora Installation Disc 1 is bootable on supported hardware.
+      In addition, a bootable CD image appears in the
+      <filename>images/</filename> directory of this disc. These images
+      behave differently according to your system
+      hardware:</para>
+    <itemizedlist>
+      <listitem>
+	<para>On most machines, the bootloader automatically boots the
+	  appropriate 32-bit or 64-bit installer from the install
+	  disc.</para>
+      </listitem>
+      <listitem>
+	<para>64-bit IBM pSeries (POWER4/POWER5), current iSeries
+	  models -- After using OpenFirmware to boot the CD, the
+	  bootloader, <command>yaboot</command>, automatically boots the
+	  64-bit installer.</para>
+      </listitem>
+      <listitem>
+	<para>IBM "Legacy" iSeries (POWER4) -- So-called "Legacy"
+	      iSeries models, which do not use OpenFirmware, require use
+	      of the boot image located in the <filename>images/iSeries</filename>
+	      directory of the installation tree.</para>
+      </listitem>
+      <listitem>
+	<para>32-bit CHRP (IBM RS/6000 and others) -- After using
+	  OpenFirmware to boot the CD, select the <filename>linux32</filename> boot image at
+	  the <prompt>boot:</prompt> prompt to start
+	  the 32-bit installer. Otherwise, the 64-bit installer starts
+	  and fails.
+	</para>
+      </listitem>
+      <listitem>
+	<para>Genesi Pegasos II / Efika 5200B -- The Fedora kernel
+	  supports both Pegasos and Efika without the need to use the
+	  "Device Tree Supplement" from powerdeveloper.org. However, the
+	  lack of full support for ISO9660 in the firmware means that
+	  booting via yaboot from the CD is not possible. Boot the
+	  'netboot' image instead, either from the CD or over the
+	  network. Because of the size of the image, you must set the
+	  firmware's <envar>load-base</envar> variable to load files at
+	  a high address such as 32MiB instead of the default 4MiB:
+	</para>
+	<screen> 
+	  <userinput>setenv load-base 0x2000000</userinput>
+	</screen>
+	<para>At the OpenFirmware prompt, enter the following command to
+	  boot the Efika update, if necessary, or the netboot image from the
+	  CD:</para>
+	<screen>
+	  <userinput>boot cd: /images/netboot/ppc32.img</userinput>
+	</screen>
+	<para>Or from the network: </para>
+	<screen>
+	  <userinput>boot eth ppc32.img</userinput>
+	</screen>
+	<para>You must also manually configure OpenFirmware to make the
+	  installed Fedora system bootable. To do this, set the
+	  <envar>boot-device</envar> and
+	  <envar>boot-file</envar> environment
+	  variables appropriately, to load <command>yaboot</command> from the
+	  <filename class="partition">/boot</filename>
+	  partition. For example, a default installation might require
+	  the following:
+    </para>
+	<screen><userinput>setenv boot-device hd:0 setenv boot-file
+	    /yaboot/yaboot setenv auto-boot? true</userinput>
+	</screen>
+      </listitem>
+      <listitem>
+	<para>PA Semi Electra -- The Electra firmware does not yet
+	  support yaboot; to install on Electra, you can boot the
+	  <filename>ppc64.img</filename> netboot
+	  image. After the installation, you will need to manually
+	  configure the firmware to load the installed kernel and initrd
+	  from the <filename class="partition">/boot</filename>
+	  partition.</para>
+	<para>Refer to the firmware documentation for
+	  further details.</para>
+      </listitem>
+      <listitem>
+	<para> Sony PlayStation 3 -- For installation on PlayStation 3,
+	  first update to firmware 1.60 or later. The "Other OS" boot
+	  loader must be installed into the flash, following the
+	  instructions at <ulink
+	    url="http://www.playstation.com/ps3-openplatform/manual.html"/>.
+	  A suitable boot loader image can be found on Sony's "ADDON"
+	  CD, available from <ulink
+	    url="ftp://ftp.kernel.org/pub/linux/kernel/people/geoff/cell/"/>.
+	</para>
+	<para>Once the boot loader is installed, the PlayStation 3
+	  should be able to boot from the Fedora install media. Please
+	  note that network installation works best with NFS, since that
+	  takes less memory than FTP or HTTP methods. Using the
+	  <menuchoice>text</menuchoice>
+	  option also reduces the amount of memory taken by the
+	  installer.</para>
+	<para>For more info on Fedora and the PlayStation3 or Fedora on
+	  PowerPC in general, join the Fedora-PPC mailing list (<ulink
+	    url="http://lists.infradead.org/mailman/listinfo/fedora-ppc"/>) 
+	  or the #fedora-ppc channel on FreeNode (<ulink
+	    url="http://freenode.net/"/>.)
+	</para>
+      </listitem>
+      <listitem>
+	<para>Network booting  -- Combined images containing the
+	  installer kernel and ramdisk are located in the
+	  <filename>images/netboot/</filename>
+	  directory of the installation tree. They are intended for
+	  network booting with TFTP, but can be used in many
+	  ways.</para>
+	<para>The <command>yaboot</command> loader supports TFTP booting
+	  for IBM pSeries and Apple Macintosh. The Fedora Project
+	  encourages the use of <command>yaboot</command> over the
+	  <command>netboot</command> images.</para>
+      </listitem>
+      <listitem>
+	<para>RS/6000 kernel support is currently broken (as of August
+	  28, 2008).</para>
+      </listitem>
+    </itemizedlist>
+    <section id="sn-PPC_specific_packages">
+      <title>PPC specific packages</title>
+      <para />
+      <itemizedlist>
+	<listitem>
+	  <para> The <package>ppc64-utils</package> package has been
+	    split out into individual packages reflecting upstream
+	    packaging (<package>ps3pf-utils</package>,
+	    <package>powerpc-utils</package>,
+	    <package>powerpc-utils-papr</package>.) Although the
+	    <command>mkzimage</command> command is no longer supplied,
+	    you can use the <command>wrapper</command> script from the
+	    <package>kernel-bootwrapper</package> package:</para>
+	  <screen><userinput>wrapper -i initrd-${KERN_VERSION}.img -o
+	zImage-${KERN_VERSION}.img vmlinuz-${KERN_VERSION}</userinput>
+	  </screen>
+	</listitem>
+      </itemizedlist>
+    </section>
+  </section>
+</section>
diff --git a/en-US/Package_Changes.xml b/en-US/Package_Changes.xml
deleted file mode 100644
index 408c714..0000000
--- a/en-US/Package_Changes.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/PackageChanges</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/PackageChanges</title>
-      <section id="">
-        <title>Package Changes </title>
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis>This list is automatically generated</emphasis>
-              <literallayout>
-</literallayout>This list is automatically generated.  It is not a good choice for translation.</para>
-          </para>
-        </para><para>This list is generated for the release and posted on the wiki only.  It is made using the <programlisting format="linespecific">treediff</programlisting> utility, ran as <programlisting format="linespecific">treediff newtree oldtree</programlisting> against a rawhide or release tree.</para><para>For a list of which packages were updated since the previous release, refer to <ulink url="http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages.">http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages.</ulink>  You can also find a comparison of major packages between all Fedora versions at <ulink url="http://distrowatch.com/fedora.">http://distrowatch.com/fedora.</ulink>
-        </para><para />
-        <programlisting>
-Insert treediff list here.
-</programlisting>
-        <para />
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Package_Notes.xml b/en-US/Package_Notes.xml
deleted file mode 100644
index 9622ea6..0000000
--- a/en-US/Package_Notes.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/PackageNotes</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/PackageNotes</title>
-      <section id="">
-        <title>Package Notes</title>
-        <para>The following sections contain information regarding software packages that have undergone significant changes for Fedora 10. For easier access, they are generally organized using the same groups that are shown in the installation system. </para>
-	<section id="">
-          <title>GIMP </title>
-          <para> Fedora 10 includes version 2.6 of the GNU Image Manipulation Program.</para>
-          <para>This new version is designed to be backwards compatible, so existing third party plug-ins and scripts should continue to work -- with a minor caveat: The included Script-Fu Scheme interpreter doesn't accept variable definitions without an initial value anymore (which isn't compliant to the language standard). Scripts included in Fedora packages should not have this problem, but if you use scripts from other sources, please refer to the <ulink url="http://www.gimp.org/release-notes/gimp-2.6.html"> GIMP Release notes</ulink> for more details and how you can fix scripts that have this problem.</para><para>Additionally, the <programlisting format="linespecific">gimptool</programlisting> script which is used to build and install third party plug-ins and scripts has been moved from the <programlisting format="linespecific">gimp</programlisting> to the <programlisting format="linespecific">gimp-devel</programlisting> package. Install this package if you want to use 
 <programlisting format="linespecific">gimptool</programlisting>.</para>
-        </section><section id="">
-          <title>Legal Information </title>
-          <para>The following legal information concerns some software
-	    in Fedora.</para>
-          <para>
-	    Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c)
-	    2002-2004 James W. Newkirk, Michael C. Two, Alexei A.
-	    Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
-	  </para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
diff --git a/en-US/Package_changes.xml b/en-US/Package_changes.xml
new file mode 100644
index 0000000..325e5fd
--- /dev/null
+++ b/en-US/Package_changes.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section lang="en" id="sn-Package_changes">
+  <title>Package changes</title>
+  <note>
+    <title>This list is automatically generated</title>
+    <para>
+      This list is automatically generated.  It is not a good choice for
+      translation.
+    </para>
+  </note>
+  <para>This list is generated for the release and posted on the wiki
+    only.  It is made using the <command>treediff</command> utility, ran
+    as <command>treediff newtree oldtree</command> against a rawhide or
+    release tree.</para>
+  <para>For a list of which packages were updated since the previous
+    release, refer to <ulink
+      url="http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages"/>. 
+    You can also find a comparison of major packages between all Fedora
+    versions at <ulink url="http://distrowatch.com/fedora"/>.
+  </para>
+</section>
+
diff --git a/en-US/Package_notes.xml b/en-US/Package_notes.xml
new file mode 100644
index 0000000..2feda10
--- /dev/null
+++ b/en-US/Package_notes.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section lang="en" id="sn-Package_notes">
+  <title>Package notes</title>
+  <para>The following sections contain information regarding software
+    packages that have undergone significant changes for Fedora 10. For
+    easier access, they are generally organized using the same groups
+    that are shown in the installation system. </para>
+  <section id="sn-GIMP">
+    <title>GIMP</title>
+    <para>Fedora 10 includes version 2.6 of the GNU Image Manipulation
+      Program.</para>
+    <para>This new version is designed to be backwards compatible, so
+      existing third party plug-ins and scripts should continue to work
+      -- with a minor caveat: The included Script-Fu Scheme interpreter
+      doesn't accept variable definitions without an initial value
+      anymore (which isn't compliant to the language standard). Scripts
+      included in Fedora packages should not have this problem, but if
+      you use scripts from other sources, please refer to the GIMP
+      release notes for more details and how you can fix scripts that
+      have this problem:</para>
+    <para><ulink
+	url="http://www.gimp.org/release-notes/gimp-2.6.html"/></para>
+    <para>Additionally, the <command>gimptool</command> script that is
+      used to build and install third party plug-ins and scripts has
+      been moved from the <package>gimp</package> to the
+      <package>gimp-devel</package> package. Install this package if you
+      want to use <command>gimptool</command>.</para>
+  </section>
+  <section id="sn-Legal_information">
+    <title>Legal information</title>
+    <para>The following legal information concerns some software in
+      Fedora.</para>
+    <para>
+      Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c)
+      2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or
+      Copyright (c) 2000-2002 Philip A. Craig
+    </para>
+  </section>
+</section>
+
+
diff --git a/en-US/Printing.xml b/en-US/Printing.xml
index b0658fc..2e93b7a 100644
--- a/en-US/Printing.xml
+++ b/en-US/Printing.xml
@@ -1,34 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Printing</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Printing</title>
-      <section id="">
-        <title>Printing </title>
-        <para>The print manager (<programlisting format="linespecific">system-config-printer</programlisting>) user interface has been overhauled to look friendlier and be more in line with modern desktop applications. The <programlisting format="linespecific">system-config-printer</programlisting> application no longer needs to be run as the root user.</para><para>Other changes include:</para>
-        <itemizedlist>
-          <listitem>
-            <para> The configuration tool window has been made easier to use.  Double-clicking on a printer icon opens a properties dialog window.  This replaces the old behavior of a list of printer names on the left and properties for the selected printer on the right.</para>
-          </listitem><listitem>
-            <para> The CUPS authentication dialog selects the appropriate user-name and allows it to be altered mid-operation.</para>
-          </listitem><listitem>
-            <para> When the configuration tool is running, the list of printers is updated dynamically.</para>
-          </listitem><listitem>
-            <para> All jobs queued for a specific printer can be seen by right-clicking on a printer icon and selecting <emphasis>View Print Queue</emphasis>. To see jobs queued on several printers, select the desired printers first before right-clicking. To see all jobs, right-click with no printers selected.</para>
-          </listitem><listitem>
-            <para> The job monitoring tool displays a message when a job has failed. If the printer has been stopped as a result, this is shown in the message. A <emphasis>Diagnose</emphasis> button starts the trouble-shooter.</para>
-          </listitem><listitem>
-            <para> The job monitoring tool now performs proxy authentication.  A submitted job that requires authentication on the CUPS back-end now displays an authentication dialog so the job can proceed.</para>
-          </listitem><listitem>
-            <para> The print status dialog (for GTK+) gives more feedback about the status of printers, for example printers that are out of paper show a small warning emblem on their icon. Paused printers also show an emblem, and printers that are rejecting jobs are shown as grayed-out to signify they are not available.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
+ 
+<section lang="en" id="sn-Printing">
+  <title>Printing </title>
+  <para>The print manager (<command>system-config-printer</command> or
+    <guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Printing</guimenuitem>) 
+    user interface has been overhauled to look friendlier and be more in
+    line with modern desktop applications. The
+    <command>system-config-printer</command> application no longer needs
+    to be run as the root user.</para><para>Other changes
+    include:</para>
+  <itemizedlist>
+    <listitem>
+      <para>The configuration tool window has been made easier to use.
+	Double-clicking on a printer icon opens a properties dialog
+	window.  This replaces the old behavior of a list of printer
+	names on the left and properties for the selected printer on the
+	right.</para>
+    </listitem><listitem>
+      <para>The CUPS authentication dialog selects the appropriate
+	user-name and allows it to be altered mid-operation.</para>
+    </listitem><listitem>
+      <para>When the configuration tool is running, the list of
+	printers is updated dynamically.</para>
+    </listitem><listitem>
+      <para>All jobs queued for a specific printer can be seen by
+	right-clicking on a printer icon and selecting <guimenuitem>View
+	  Print Queue</guimenuitem>. To see jobs queued on several
+	printers, select the desired printers first before
+	right-clicking. To see all jobs, right-click with no printers
+	selected.</para>
+    </listitem><listitem>
+      <para> The job monitoring tool displays a message when a job has
+	failed. If the printer has been stopped as a result, this is
+	shown in the message. A <guibutton>Diagnose</guibutton> button
+	starts the trouble-shooter.</para>
+    </listitem><listitem>
+      <para> The job monitoring tool now performs proxy authentication.
+	A submitted job that requires authentication on the CUPS
+	back-end now displays an authentication dialog so the job can
+	proceed.</para>
+    </listitem><listitem>
+      <para> The print status dialog (for GTK+) gives more feedback
+	about the status of printers, for example printers that are out
+	of paper show a small warning emblem on their icon. Paused
+	printers also show an emblem, and printers that are rejecting
+	jobs are shown as grayed-out to signify they are not
+	available.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/en-US/Release_Notes.xml b/en-US/Release_Notes.xml
index 69cd2ef..bae94b9 100644
--- a/en-US/Release_Notes.xml
+++ b/en-US/Release_Notes.xml
@@ -28,161 +28,45 @@
 
 <!-- END OF COMMUNITY HELP NOTICE. -->
 
-<!-- Welcome -->
+<!-- Welcome to Fedora -->
 
-  <xi:include href="Welcome.xml" xpointer="element(sn-Welcome)"
+  <xi:include href="Welcome_to_Fedora_10.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- OverView -->
+<!-- What is New for Installation and Live Images -->
 
-  <xi:include href="./OverView.xml" xpointer="element(sn-OverView)"
+  <xi:include href="./What_is_New_for_Installation_and_Live_Images.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- Feedback -->
+<!-- Upfront About Multimedia -->
 
-  <xi:include href="./Feedback.xml" xpointer="element(sn-Feedback)"
+  <xi:include href="./Upfront_About_Multimedia.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- Installer -->
+<!-- What is the Latest on the Desktop -->
 
-  <xi:include href="./Installer.xml" xpointer="element(sn-Installer)"
+  <xi:include href="./What_is_the_Latest_on_the_desktop.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- Arch Specific -->
+<!-- How_are_Things_for_Developers.xml -->
 
-  <xi:include href="./ArchSpecific.xml" xpointer="element(sn-ArchSpecific)"
+  <xi:include href="./How_are_Things_for_Developers.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- Live -->
+<!-- What_Do_System_Administrators_Care_About.xml -->
 
-  <xi:include href="./Live.xml" xpointer="element(sn-Live)"
+  <xi:include href="./What_Do_System_Administrators_Care_About.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- Package Notes -->
+<!-- Are_There_Hideous_Bugs_and_Terrible_Tigers.xml -->
 
-  <xi:include href="./PackageNotes.xml" xpointer="element(sn-PackageNotes)"
+  <xi:include href="./Are_There_Hideous_Bugs_and_Terrible_Tigers.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- Kernel -->
+<!-- Legal Stuff and Administrivia -->
 
-  <xi:include href="Kernel.xml" xpointer="element(sn-Kernel)"
+  <xi:include href="./Legal_Stuff_and_Administrivia.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-<!-- Desktop -->
-
-  <xi:include href="Desktop.xml" xpointer="element(sn-Desktop)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Printing -->
-
-<!-- <xi:include href="Printing.xml" xpointer="element(sn-Printing)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-
-<!-- Server Tools -->
-
-<!--  <xi:include href="ServerTools.xml" xpointer="element(sn-ServerTools)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-
-<!-- File Systems -->
-
-  <xi:include href="FileSystems.xml" xpointer="element(sn-FileSystems)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- File Servers -->
-
-<!--  <xi:include href="FileServers.xml" xpointer="element(sn-FileServers)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-
-<!-- Web Servers -->
-
-  <xi:include href="WebServers.xml" xpointer="element(sn-WebServers)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Mail Servers -->
-
-  <xi:include href="MailServers.xml" xpointer="element(sn-MailServers)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Development -->
-
-  <xi:include href="Devel.xml" xpointer="element(sn-Devel)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Security -->
-
-  <xi:include href="Security.xml" xpointer="element(sn-Security)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Java -->
-
-  <xi:include href="Java.xml" xpointer="element(sn-Java)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Samba -->
-
-<!--  <xi:include href="Samba.xml" xpointer="element(sn-Samba)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-
-<!-- System Daemons -->
-
-  <xi:include href="./SystemDaemons.xml" xpointer="element(sn-System-Services)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Multimedia -->
-
-  <xi:include href="Multimedia.xml" xpointer="element(sn-Multimedia)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Entertainment -->
-
-  <xi:include href="Entertainment.xml" xpointer="element(sn-Entertainment)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Virtualization -->
-
-  <xi:include href="./Virtualization.xml" xpointer="element(sn-Virtualization)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Xorg -->
-
-  <xi:include href="./Xorg.xml" xpointer="element(sn-Xorg)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Database Servers -->
-
-  <xi:include href="./DatabaseServers.xml"
-    xpointer="element(sn-DatabaseServers)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- I18n -->
-
-  <xi:include href="./I18n.xml" xpointer="element(sn-I18n)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Backwards Compatibility -->
-
-  <xi:include href="./BackwardsCompatibility.xml"
-    xpointer="element(sn-BackwardsCompatibility)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Package Changes -->
-
-  <xi:include href="./PackageChanges.xml"
-    xpointer="element(sn-PackageChanges)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Project Overview -->
-
-  <xi:include href="./ProjectOverview.xml"
-    xpointer="element(sn-ProjectOverview)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-<!-- Colophon -->
-
-  <xi:include href="./Colophon.xml" xpointer="element(sn-Colophon)"
-    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="Appendix.xml" 
-	      xmlns:xi="http://www.w3.org/2001/XInclude" />
 </article>
 
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 6468262..06ec04e 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -4,6 +4,20 @@
 
 <revhistory>
   <revision>
+    <revnumber>9.92.1</revnumber>
+    <date>2008-10-15</date>
+    <author>
+      <firstname>Karsten</firstname>
+      <surname>Wade</surname>
+    </author>
+    <revdescription>
+      <simplelist>
+	<member>Content pulled from wiki; changes to match Publican;
+	cruft removed</member>
+      </simplelist>
+    </revdescription>
+  </revision>
+  <revision>
     <revnumber>9.92</revnumber>
     <date>2008-09-27</date>
     <author>
diff --git a/en-US/Samba_-_Windows_Compatibility.xml b/en-US/Samba_-_Windows_Compatibility.xml
deleted file mode 100644
index d64ba2c..0000000
--- a/en-US/Samba_-_Windows_Compatibility.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Samba</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Samba</title>
-      <section id="">
-        <title>Samba - Windows Compatibility</title>
-        <para>This section contains information related to Samba, the suite of software Fedora uses to interact with Microsoft Windows systems.</para>
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis>Maybe you know what should be on this page?</emphasis>
-              <literallayout>
-</literallayout>The Fedora release notes are a collective effort of dozens of people.  You can contribute by editing the wiki page that corresponds to this part of the release notes.</para>
-          </para>
-        </para><para>This section has not been updated for Fedora 10 by the beat writer (<ulink url="http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).">http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).</ulink>  If you have some ideas or knowledge of what should be in this part of the release notes, you are encouraged to edit the wiki directly.  Read <ulink url="https://fedoraproject.org/wiki/Docs/Beats/HowTo">https://fedoraproject.org/wiki/Docs/Beats/HowTo</ulink> for more information, then get an account and start writing.</para>
-      </section>
-    </section>
-  </article>
-</book>
diff --git a/en-US/Samba_-_Windows_compatibility.xml b/en-US/Samba_-_Windows_compatibility.xml
new file mode 100644
index 0000000..99e750d
--- /dev/null
+++ b/en-US/Samba_-_Windows_compatibility.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section lang="en" id="sn-Samba_-_Windows-compatibility">
+  <title>Samba - Windows compatibility</title>
+  <para>This section contains information related to Samba, the suite of
+    software Fedora uses to interact with Microsoft Windows
+    systems.</para>
+  <tip>
+    <title>Maybe you know what should be on this page?</title>
+    <para>The Fedora release notes are a collective effort of dozens of
+      people.  You can contribute by editing the wiki page that
+      corresponds to this part of the release notes.</para>
+  </tip>
+  <para>This section has not been updated for Fedora 10 by the beat
+    writer (<ulink
+      url="http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments"/>.)
+    If you have some ideas or knowledge of what should be in this part
+    of the release notes, you are encouraged to edit the wiki directly.
+    Read <ulink
+      url="https://fedoraproject.org/wiki/Docs/Beats/HowTo/">
+      for more information, then get an account and start writing.</para>
+</section>
+
diff --git a/en-US/Security.xml b/en-US/Security.xml
index b1b820f..21f989b 100644
--- a/en-US/Security.xml
+++ b/en-US/Security.xml
@@ -1,76 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Security</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Security</title>
-      <section id="">
-        <title>Security </title>
-        <para>This section highlights various security items from Fedora.</para>
-        <section id="">
-          <title>Security Enhancements </title>
-          <para>Fedora continues to improve its many proactive security features.</para>
-          <para>
-            <ulink url="http://fedoraproject.org/wiki/Security/Features">http://fedoraproject.org/wiki/Security/Features</ulink>
-          </para>
-        </section><section id="">
-          <title>SELinux </title>
-          <para>The SELinux project pages have troubleshooting tips, explanations, and pointers to documentation and references.  Some useful links include the following:</para>
-          <itemizedlist>
-            <listitem>
-              <para> New SELinux project pages: <ulink url="http://fedoraproject.org/wiki/SELinux">http://fedoraproject.org/wiki/SELinux</ulink>
-              </para>
-            </listitem><listitem>
-              <para> Troubleshooting tips: <ulink url="http://fedoraproject.org/wiki/SELinux/Troubleshooting">http://fedoraproject.org/wiki/SELinux/Troubleshooting</ulink>
-              </para>
-            </listitem><listitem>
-              <para> Frequently Asked Questions: <ulink url="http://docs.fedoraproject.org/selinux-faq/">http://docs.fedoraproject.org/selinux-faq/</ulink>
-              </para>
-            </listitem><listitem>
-              <para> Listing of SELinux commands: <ulink url="http://fedoraproject.org/wiki/SELinux/Commands">http://fedoraproject.org/wiki/SELinux/Commands</ulink>
-              </para>
-            </listitem><listitem>
-              <para> Details of confined domains: <ulink url="http://fedoraproject.org/wiki/SELinux/Domains">http://fedoraproject.org/wiki/SELinux/Domains</ulink>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>SELinux Enhancements </title>
-          <para>Different roles are now available, to allow finer-grained access control:</para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <programlisting format="linespecific">guest_t</programlisting> does not allow running <programlisting format="linespecific">setuid</programlisting> binaries, making network connections, or using a GUI.</para>
-            </listitem><listitem>
-              <para>
-                <programlisting format="linespecific">xguest_t</programlisting> disallows network access except for HTTP via a Web browser, and no <programlisting format="linespecific">setuid</programlisting> binaries.</para>
-            </listitem><listitem>
-              <para>
-                <programlisting format="linespecific">user_t</programlisting> is ideal for office users: prevents becoming root via <programlisting format="linespecific">setuid</programlisting> applications.</para>
-            </listitem><listitem>
-              <para>
-                <programlisting format="linespecific">staff_t</programlisting> is same as <programlisting format="linespecific">user_t</programlisting>, except that root-level access via <programlisting format="linespecific">sudo</programlisting> is allowed.</para>
-            </listitem><listitem>
-              <para>
-                <programlisting format="linespecific">unconfined_t</programlisting> provides full access, the same as when not using SELinux.</para>
-            </listitem>
-          </itemizedlist><para>Browser plug-ins wrapped with <programlisting format="linespecific">nspluginwrapper</programlisting>, which is the default, are confined by SELinux policy.</para>
-        </section><section id="">
-          <title>Security Audit Package </title>
-          <para>
-            <emphasis>Sectool</emphasis> provides users with a tool that can check their systems for security issues. There are libraries included that allow for the customization of system tests. More information can be found at the project home:</para><para>
-            <ulink url="https://fedorahosted.org/sectool">https://fedorahosted.org/sectool</ulink>
-          </para>
-        </section><section id="">
-          <title>General Information </title>
-          <para>A general introduction to the many proactive security features in Fedora, current status, and policies is available at <ulink url="http://fedoraproject.org/wiki/Security.">http://fedoraproject.org/wiki/Security.</ulink>
-          </para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ 
+<section lang="en" id="sn-Security">
+  <title>Security</title>
+  <para>This section highlights various security items from
+    Fedora.</para>
+  <section id="sn-Security_enhancements">
+    <title>Security enhancements</title>
+    <para>Fedora continues to improve its many proactive security
+      features.</para>
+    <para>
+      <ulink
+	url="http://fedoraproject.org/wiki/Security/Features"/>
+    </para>
+  </section><section id="sn-SELinux">
+    <title>SELinux</title>
+    <para>The SELinux project pages have troubleshooting tips,
+      explanations, and pointers to documentation and references.  Some
+      useful links include the following:</para>
+    <itemizedlist>
+      <listitem>
+	<para>New SELinux project pages:<ulink
+	    url="http://fedoraproject.org/wiki/SELinux"/>
+	</para>
+      </listitem><listitem>
+	<para>Troubleshooting tips:<ulink
+	    url="http://fedoraproject.org/wiki/SELinux/Troubleshooting"/>
+	</para>
+      </listitem><listitem>
+	<para>Frequently Asked Questions:<ulink
+	    url="http://docs.fedoraproject.org/selinux-faq/"/>
+	</para>
+      </listitem><listitem>
+	<para>Listing of SELinux commands:<ulink
+	    url="http://fedoraproject.org/wiki/SELinux/Commands"/>
+	</para>
+      </listitem><listitem>
+	<para>Details of confined domains:<ulink
+	    url="http://fedoraproject.org/wiki/SELinux/Domains"/>
+	</para>
+      </listitem>
+    </itemizedlist>
+  </section><section id="sn-SELinux_enhancements">
+    <title>SELinux enhancements</title>
+    <para>Different roles are now available, to allow finer-grained
+      access control:</para>
+    <itemizedlist>
+      <listitem>
+	<para>
+	  <filename>guest_t</filename>
+	  does not allow running <command>setuid</command> binaries,
+	  making network connections, or using a GUI.</para>
+      </listitem><listitem>
+	<para>
+	  <filename>xguest_t</filename> disallows
+	  network access except for HTTP via a Web browser, and no
+	  <command>setuid</command>
+	  binaries.</para>
+      </listitem><listitem>
+	<para>
+	  <filename>user_t</filename> is ideal for office users:
+	  prevents becoming root via <command>setuid</command>
+	  applications.</para>
+      </listitem><listitem>
+	<para>
+	  <filename>staff_t</filename> is same as
+	  <filename>user_t</filename>, except that root-level access via
+	  <command>sudo</command> is allowed.</para>
+      </listitem><listitem>
+	<para>
+	  <filename>unconfined_t</filename> provides
+	  full access, the same as when not using SELinux.</para>
+      </listitem>
+    </itemizedlist><para>Browser plug-ins wrapped with
+      <command>nspluginwrapper</command>, which is the default, are
+      confined by SELinux policy.</para>
+  </section><section id="sn-Security_audit_package">
+    <title>Security audit package</title>
+    <para>
+      <application>Sectool</application> provides users with a tool that can
+      check their systems for security issues. There are libraries
+      included that allow for the customization of system tests. More
+      information can be found at the project home:</para>
+    <para>
+      <ulink url="https://fedorahosted.org/sectool"/>
+    </para>
+  </section><section id="sn-General_information">
+    <title>General information</title>
+    <para>A general introduction to the many proactive security features
+      in Fedora, current status, and policies is available at <ulink
+	url="http://fedoraproject.org/wiki/Security"/>.
+    </para>
+  </section>
+</section>
diff --git a/en-US/Server_Tools.xml b/en-US/Server_Tools.xml
deleted file mode 100644
index 0e0d126..0000000
--- a/en-US/Server_Tools.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/ServerTools</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/ServerTools</title>
-      <section id="">
-        <title>Server Tools </title>
-        <para>This section highlights changes and additions to the various GUI server and system configuration tools in Fedora 10. </para>
-        <section id="">
-          <title>First Aid Kit </title>
-          <para>Firstaidkit is a fully automated recovery application that makes subsystem recovery easier for technical and non-technical users. Firstaidkit is designed to automatically fix problems while focusing on maintaining user data integrity. It is available in rescue mode, on the Fedora Live CD, and on running systems.</para>
-          <section id="">
-            <title>Resources </title>
-            <itemizedlist>
-              <listitem>
-                <para> Project site -- <ulink url="https://fedorahosted.org/firstaidkit/">https://fedorahosted.org/firstaidkit/</ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </section>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Server_tools.xml b/en-US/Server_tools.xml
new file mode 100644
index 0000000..1e7d9ef
--- /dev/null
+++ b/en-US/Server_tools.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section lang="en" id="sn-">
+  <title>Server tools</title>
+  <para>This section highlights changes and additions to the various GUI
+    server and system configuration tools in Fedora 10. </para>
+  <section id="sn-First_Aid_Kit">
+    <title>First Aid Kit </title>
+    <para><application>Firstaidkit</application> is a fully automated
+      recovery application that makes subsystem recovery easier for
+      technical and non-technical users.
+      <application>Firstaidkit</application> is designed to
+      automatically fix problems while focusing on maintaining user data
+      integrity. It is available in rescue mode, on the Fedora Live CD,
+      and on running systems.</para>
+    <section id="sn-Resources">
+      <title>Resources</title>
+      <itemizedlist>
+	<listitem>
+	  <para> Project site -- <ulink
+	      url="https://fedorahosted.org/firstaidkit/"/>
+	  </para>
+	</listitem>
+      </itemizedlist>
+    </section>
+  </section>
+</section>
+
diff --git a/en-US/System_Services.xml b/en-US/System_Services.xml
deleted file mode 100644
index d2894f7..0000000
--- a/en-US/System_Services.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/SystemDaemons</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/SystemDaemons</title>
-      <section id="">
-        <title>System Services </title>
-        <section id="">
-          <title>Upstart </title>
-          <para>Fedora 10 features the Upstart initialization system.  All System V init scripts should run fine in compatibility mode. However, users who have made customizations to their <programlisting format="linespecific">/etc/inittab</programlisting> file will need to port those modifications to upstart. For information on how upstart works, see the <programlisting format="linespecific">init(8)</programlisting> and <programlisting format="linespecific">initctl(8)</programlisting> man pages. For information on writing upstart scripts, see the <programlisting format="linespecific">events(5)</programlisting> man page, and also the Upstart Getting Started Guide: </para><para>
-            <ulink url="http://upstart.ubuntu.com/getting-started.html">http://upstart.ubuntu.com/getting-started.html</ulink>
-          </para><para>Due to the change of init systems, it is recommended that users who do an upgrade on a live file system to Fedora 9, reboot soon afterwards.</para>
-        </section><section id="">
-          <title>NetworkManager </title>
-          <para>Fedora 10 features NetworkManager. NetworkManager 0.7 provides improved mobile broadband support, including GSM and CDMA devices, and now supports multiple devices, ad-hoc networking for sharing connections, and the use of system-wide network configuration. It is now enabled by default on all installations. When using NetworkManager, be aware of the following: </para>
-          <itemizedlist>
-            <listitem>
-              <para> NetworkManager does not currently support all virtual device types.  Users who use bridging, bonding, or VLANs may need to switch to the old <programlisting format="linespecific">network</programlisting> service after configuration of those interfaces.</para>
-            </listitem>
-          </itemizedlist><itemizedlist>
-            <listitem>
-              <para> NetworkManager starts the network asynchronously.  Users who have applications that require the network to be fully initialized during boot should set the <programlisting format="linespecific">NETWORKWAIT</programlisting> variable in <programlisting format="linespecific">/etc/sysconfig/network</programlisting>. Please <ulink url="https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora"> file bugs</ulink>  about cases where this is necessary, so we can fix the applications in question.</para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Autofs </title>
-          <para>Autofs is no longer installed by default. Users who wish to use Autofs can choose it from the <emphasis>System Tools</emphasis> group in the installer, or with the package installation tools.</para>
-        </section><section id="">
-          <title>Varnish </title>
-          <para>Varnish is updated to version 2.0. The VCL syntax has changed from version 1.x. Users who upgrade from 1.x must change their <programlisting format="linespecific">vcl</programlisting> files according to <programlisting format="linespecific">README.redhat</programlisting>. The most important changes are:</para><para />
-          <itemizedlist>
-            <listitem>
-              <para> In <programlisting format="linespecific">vcl</programlisting>, the word <programlisting format="linespecific">insert</programlisting> must be replaced by <programlisting format="linespecific">deliver</programlisting>
-              </para>
-            </listitem><listitem>
-              <para> In the <programlisting format="linespecific">vcl</programlisting> declaration of backends, <programlisting format="linespecific">set backend</programlisting> has been simplified to <programlisting format="linespecific">backend</programlisting>, and backend parts are now just prefixed with a dot, so the default localhost configuration looks like this:</para>
-            </listitem>
-          </itemizedlist><para />
-          <programlisting>
-backend default {
-  .host = "127.0.0.1";
-  .port = "80";
- }
-&lt;pre&gt;</programlisting>
-          <para />
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/System_services.xml b/en-US/System_services.xml
new file mode 100644
index 0000000..df7b661
--- /dev/null
+++ b/en-US/System_services.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ 
+<section id="sn-System_Services" lang="en">
+  <title>System Services</title>
+  <section id="sn-Upstart">
+    <title>Upstart</title>
+    <para>Fedora 10 features the Upstart initialization system.  All
+      System V <command>init</command> scripts should run fine in
+      compatibility mode. However, users who have made customizations to
+      their <filename>/etc/inittab</filename> file need to port those
+      modifications to <command>upstart</command>. For information on
+      how <command>upstart</command> works, refer to the
+      <command>init(8)</command> and <command>initctl(8)</command> man
+      pages. For information on writing upstart scripts, refer to the
+      <command>events(5)</command> man page, and also the "Upstart
+      Getting Started Guide":
+    </para>
+    <para>
+      <ulink
+	url="http://upstart.ubuntu.com/getting-started.html"/>
+    </para>
+    <para>Due to the change of <command>init</command> systems, it is recommended
+      that users who do an upgrade on a live file system to Fedora 9,
+      reboot soon afterwards.</para>
+  </section>
+  <section id="sn-NetworkManager">
+    <title>NetworkManager</title>
+    <para>Fedora 10 features NetworkManager. NetworkManager 0.7 provides
+      improved mobile broadband support, including GSM and CDMA devices,
+      and now supports multiple devices, ad-hoc networking for sharing
+      connections, and the use of system-wide network configuration. It
+      is now enabled by default on all installations. When using
+      NetworkManager, be aware of the following: </para>
+    <itemizedlist>
+      <listitem>
+	<para> NetworkManager does not currently support all virtual
+	  device types.  Users who use bridging, bonding, or VLANs may
+	  need to switch to the old <command>network</command> service
+	  after configuration of those interfaces.</para>
+      </listitem>
+      <listitem>
+	<para>NetworkManager starts the network asynchronously.  Users
+	  who have applications that require the network to be fully
+	  initialized during boot should set the <envar>NETWORKWAIT</envar> variable
+	  in <filename>/etc/sysconfig/network</filename>. 
+	  Please 
+	    file bugs about cases where this is necessary, so
+	  we can fix the applications in question.</para>
+	<para><ulink
+	    url="https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora"/></para>
+      </listitem>
+    </itemizedlist>
+  </section><section id="sn-Autofs">
+    <title>Autofs</title>
+    <para>Autofs is no longer installed by default. Users who wish to
+      use Autofs can choose it from the <menuchoice>System
+	Tools</menuchoice> group in the installer, or with the package
+      installation tools.</para>
+  </section><section id="sn-Varnih">
+    <title>Varnish</title>
+    <para>Varnish is updated to version 2.0. The VCL syntax has changed
+      from version 1.x. Users who upgrade from 1.x must change their
+      <filename>vcl</filename> files
+      according to <filename>README.redhat</filename>. The most
+      important changes are:</para>
+    <itemizedlist>
+      <listitem>
+	<para> In <filename>vcl</filename>, the word
+	  <computeroutput>insert</computeroutput> must be replaced by
+	  <computeroutput>deliver</computeroutput>
+	</para>
+      </listitem><listitem>
+	<para> In the <filename>vcl</filename> declaration of
+	  backends, <computeroutput>set
+	    backend</computeroutput> has been simplified to
+	  <computeroutput>backend</computeroutput>, and backend
+	  parts are now just prefixed with a dot, so the default
+	  localhost configuration looks like this:</para>
+	<programlisting>
+	  backend default { .host = "127.0.0.1"; .port = "80"; }
+	</programlisting>
+      </listitem>
+    </itemizedlist>
+  </section>
+</section>
+
diff --git a/en-US/Updated_Packages_in_Fedora_10.xml b/en-US/Updated_Packages_in_Fedora_10.xml
deleted file mode 100644
index df6ea2d..0000000
--- a/en-US/Updated_Packages_in_Fedora_10.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/PackageChanges/UpdatedPackages</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/PackageChanges/UpdatedPackages</title>
-      <section id="">
-        <title>Updated Packages in Fedora 10 </title>
-        <para> This list is automatically generated by checking the difference between the (F10)-1 GOLD tree and the F10 tree on a specific date.  The content is posted only on the wiki:</para>
-        <para>
-          <ulink url="http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages">http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages</ulink>
-        </para><para />
-        <programlisting>
-Updated Packages not generated yet
-</programlisting>
-        <para />
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Updated_packages_in_Fedora_10.xml b/en-US/Updated_packages_in_Fedora_10.xml
new file mode 100644
index 0000000..d4b55d9
--- /dev/null
+++ b/en-US/Updated_packages_in_Fedora_10.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section lang="en" id="sn-Updated_packages_in_Fedora_10">
+  <title>Updated packages in Fedora 10</title>
+  <para> This list is automatically generated by checking the difference
+    between the (F10)-1 GOLD tree and the F10 tree on a specific date.
+    The content is posted only on the wiki:</para>
+  <para>
+    <ulink
+      url="http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages"/> 
+    
+  </para>
+  </section>
+</section>
diff --git a/en-US/Virtualization.xml b/en-US/Virtualization.xml
index 3c8725d..cbb7e7f 100644
--- a/en-US/Virtualization.xml
+++ b/en-US/Virtualization.xml
@@ -1,327 +1,446 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Virtualization</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Virtualization</title>
-      <section id="">
-        <title>Virtualization </title>
-        <para>Virtualization in Fedora 10 includes major changes, and new features, that continue to support KVM, Xen, and many other virtual machine platforms. </para>
-        <section id="">
-          <title>Unified Kernel Image </title>
-          <para>The <programlisting format="linespecific">kernel-xen</programlisting> package has been obsoleted by the integration of paravirtualization operations in the upstream kernel. The <programlisting format="linespecific">kernel</programlisting> package in Fedora 10 supports booting as a guest domU, but will not function as a dom0 until such support is provided upstream. The most recent Fedora release with dom0 support is Fedora 8. </para><para>Booting a Xen domU guest within a Fedora 10 host requires the KVM based <programlisting format="linespecific">xenner</programlisting>. Xenner runs the guest kernel and a small Xen emulator together as a KVM guest. </para><para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/f/ff/Important.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis> KVM requires hardware virtualization features in the host system.</emphasis>
-                <literallayout>
-</literallayout>Systems lacking hardware virtualization do not support Xen guests at this time.</para>
-            </para>
-          </para><para>For more information refer to: </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <ulink url="http://sourceforge.net/projects/kvm">http://sourceforge.net/projects/kvm</ulink>
-              </para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://kraxel.fedorapeople.org/xenner/">http://kraxel.fedorapeople.org/xenner/</ulink>
-              </para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://fedoraproject.org/wiki/Features/XenPvops">http://fedoraproject.org/wiki/Features/XenPvops</ulink>
-              </para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://fedoraproject.org/wiki/Features/XenPvopsDom0">http://fedoraproject.org/wiki/Features/XenPvopsDom0</ulink>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Virtualization Storage Management </title>
-          <para>Advances in <programlisting format="linespecific">libvirt</programlisting> now provide the ability to list, create, and delete storage volumes on remote hosts. This includes the ability to create raw sparse and non-sparse files in a directory, allocate LVM logical volumes, partition physical disks, and attach to iSCSI targets.</para><para>This enables the <programlisting format="linespecific">virt-manager</programlisting> tool to remotely provision new guest domains, and manage the storage associated with them. It provides improved SELinux integration, since the APIs ensure that all storage volumes have the correct SELinux security context when being assigned to a guest.</para><para>
-            <emphasis>Features</emphasis>
-          </para><itemizedlist>
-            <listitem>
-              <para> List storage volumes in a directory, and allocate new volumes, raw files both sparse and non-sparse, and formats supported by <programlisting format="linespecific">qemu-img</programlisting> (cow, qcow, qcow2, vmdk, etc)</para>
-            </listitem><listitem>
-              <para> List partitions in a disk, and allocate new partitions from free space</para>
-            </listitem><listitem>
-              <para> Connect to an iSCSI server and list volumes associated with an exported target</para>
-            </listitem><listitem>
-              <para> List logical volumes in an LVM volume group, and allocate new LVM logical volumes</para>
-            </listitem><listitem>
-              <para> Automatically assign correct SELinux security context label (<programlisting format="linespecific">
-                  <para>virt_image_t<programlisting format="linespecific">
-                      <para>) to all volumes when associating with a guest.</para>
-                      <para>For further details refer to:</para>
-                      <itemizedlist>
-                        <listitem>
-                          <para>
-                            <ulink url="http://fedoraproject.org/wiki/Features/VirtStorage">http://fedoraproject.org/wiki/Features/VirtStorage</ulink>
-                          </para>
-                        </listitem><listitem>
-                          <para>
-                            <ulink url="http://libvirt.org/storage.html">http://libvirt.org/storage.html</ulink> -- libvirt Storage Management</para>
-                        </listitem><listitem>
-                          <para>
-                            <ulink url="http://virt-manager.et.redhat.com/page/StorageManagement">http://virt-manager.et.redhat.com/page/StorageManagement</ulink> -- virt-manager Storage Management</para>
-                        </listitem><listitem>
-                          <para>
-                            <ulink url="http://kvm.qumranet.com/kvmwiki/Virtio">http://kvm.qumranet.com/kvmwiki/Virtio</ulink>
-                          </para>
-                        </listitem>
-                      </itemizedlist>
-                    </programlisting>
-                  </para>
-                </programlisting>
-              </para>
-            </listitem>
-          </itemizedlist><para />
-        </section><section id="">
-          <title>Remote Installation of Virtual Machines </title>
-          <para>Improvements in Virtualization Storage Management have enabled the creation of guests on remote host systems. By leveraging Avahi, systems supporting <programlisting format="linespecific">libvirt</programlisting> can be automatically detected by <programlisting format="linespecific">virt-manager</programlisting>. Upon detection guests can be provisioned on the remote system.</para><para>Installations can be automated with the help of <programlisting format="linespecific">cobbler</programlisting> and <programlisting format="linespecific">koan</programlisting>. Cobbler is a Linux installation server that allows for rapid setup of network installation environments. Network installs can be configured for PXE boot, reinstallations, media-based net-installs, and virtualized guest installs. Cobbler uses a helper program, <programlisting format="linespecific">koan</programlisting>, for reinstallation and virtualization support. </para><para>For further details refer 
 to:</para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <ulink url="http://fedoraproject.org/wiki/Features/VirtRemoteInstall">http://fedoraproject.org/wiki/Features/VirtRemoteInstall</ulink>
-              </para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://virt-manager.et.redhat.com/page/LibvirtDiscovery">http://virt-manager.et.redhat.com/page/LibvirtDiscovery</ulink> -- virt-manager Discovery</para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://avahi.org/">http://avahi.org/</ulink>
-              </para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://fedorahosted.org/cobbler">http://fedorahosted.org/cobbler</ulink>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </section><section id="">
-          <title>Other Improvements </title>
-          <para>Fedora also includes the following virtualization improvements:</para>
-          <para />
-          <itemizedlist>
-            <listitem>
-              <para> Utilities in the new <programlisting format="linespecific">virt-mem</programlisting> package provide access to process tables, interface information, dmesg, and uname of QEmu and KVM guests from the host system.  <ulink url="http://et.redhat.com/~rjones/virt-mem/">http://et.redhat.com/~rjones/virt-mem/</ulink>
-              </para>
-            </listitem>
-          </itemizedlist><para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis>
-                  <programlisting format="linespecific">virt-mem</programlisting> is experimental. </emphasis><literallayout>
-</literallayout>Only 32 bit guests are supported at this time.</para>
-            </para>
-          </para><itemizedlist>
-            <listitem>
-              <para> The new <programlisting format="linespecific">virt-df</programlisting> tool provides information on the disk usage of guests from the host system. <ulink url="http://et.redhat.com/~rjones/virt-df">http://et.redhat.com/~rjones/virt-df</ulink>
-              </para>
-            </listitem>
-          </itemizedlist><para />
-          <section id="">
-            <title>libvirt Updated to 0.4.6 </title>
-            <para>The <programlisting format="linespecific">libvirt</programlisting> package provides an API and tools to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The <programlisting format="linespecific">libvirt</programlisting> software is designed to be a common denominator among all virtualization technologies with support for the following:</para><itemizedlist>
-              <listitem>
-                <para> The Xen hypervisor on Linux and Solaris hosts.</para>
-              </listitem><listitem>
-                <para> The QEMU emulator</para>
-              </listitem><listitem>
-                <para> The KVM Linux hypervisor</para>
-              </listitem><listitem>
-                <para> The LXC Linux container system</para>
-              </listitem><listitem>
-                <para> The OpenVZ Linux container system</para>
-              </listitem><listitem>
-                <para> Storage on IDE/SCSI/USB disks, FibreChannel, LVM, iSCSI, and NFS</para>
-              </listitem>
-            </itemizedlist><para>
-              <emphasis>New features and improvements since 0.4.2:</emphasis>
-            </para><itemizedlist>
-              <listitem>
-                <para> Enhanced OpenVZ support</para>
-              </listitem><listitem>
-                <para> Enhanced Linux containers (LXC) support</para>
-              </listitem><listitem>
-                <para> Storage pools API</para>
-              </listitem><listitem>
-                <para> Improved iSCSI support</para>
-              </listitem><listitem>
-                <para> USB device passthrough for QEMU and KVM</para>
-              </listitem><listitem>
-                <para> Sound, serial, and parallel device support for QEMU and Xen</para>
-              </listitem><listitem>
-                <para> Support for NUMA and vCPU pinning in QEMU</para>
-              </listitem><listitem>
-                <para> Unified XML domain and network parsing for all virtualization drivers</para>
-              </listitem>
-            </itemizedlist><para />
-            <para>For further details refer to:</para>
-            <para>
-              <ulink url="http://www.libvirt.org/news.html">http://www.libvirt.org/news.html</ulink>
-            </para>
-          </section><section id="">
-            <title>virt-manager Updated to 0.6.0 </title>
-            <para> The <programlisting format="linespecific">virt-manager</programlisting> package provides a GUI implementation of <programlisting format="linespecific">virtinst</programlisting> and <programlisting format="linespecific">libvirt</programlisting> functionality.</para><para>
-              <emphasis>New features and improvements since 0.5.4:</emphasis>
-            </para><itemizedlist>
-              <listitem>
-                <para> Remote storage management and provisioning: view, add, remove, and provision <programlisting format="linespecific">libvirt</programlisting> managed storage. Attach managed storage to a remote VM.</para>
-              </listitem><listitem>
-                <para> Remote VM installation support: Install from managed media (CDROM) or PXE. Simple install time storage provisioning.</para>
-              </listitem><listitem>
-                <para> VM details and console windows merged: each VM is now represented by a single tabbed window.</para>
-              </listitem><listitem>
-                <para> Use Avahi to list <programlisting format="linespecific">libvirtd</programlisting> instances on network.</para>
-              </listitem><listitem>
-                <para> Hypervisor Autoconnect: Option to connect to hypervisor at <programlisting format="linespecific">virt-manager</programlisting> start up.</para>
-              </listitem><listitem>
-                <para> Option to add sound device emulation when creating new guests.</para>
-              </listitem><listitem>
-                <para> Virtio and USB options when adding a disk device.</para>
-              </listitem><listitem>
-                <para> Allow viewing and removing VM sound, serial, parallel, and console devices.</para>
-              </listitem><listitem>
-                <para> Allow specifying a keymap when adding display device.</para>
-              </listitem><listitem>
-                <para> Keep app running if manager window is closed but VM window is still open.</para>
-              </listitem><listitem>
-                <para> Allow limiting the amount of stored stats history.</para>
-              </listitem>
-            </itemizedlist><para />
-            <para>For further details refer to:</para>
-            <para>
-              <ulink url="http://virt-manager.et.redhat.com/">http://virt-manager.et.redhat.com/</ulink>
-            </para>
-          </section><section id="">
-            <title>virtinst Updated to 0.400.0 </title>
-            <para> The <programlisting format="linespecific">python-virtinst</programlisting> package contains tools for installing and manipulating multiple VM guest image formats.</para><para>
-              <emphasis>New features and improvements since 0.300.3:</emphasis>
-            </para><itemizedlist>
-              <listitem>
-                <para> New tool <programlisting format="linespecific">virt-convert</programlisting>: Allows converting between different types of virt configuration files. Currently only supports <emphasis>vmx</emphasis> to <emphasis>virt-image</emphasis>.</para>
-              </listitem><listitem>
-                <para> New tool <programlisting format="linespecific">virt-pack</programlisting>: Converts <emphasis>virt-image</emphasis> xml format to <emphasis>vmx</emphasis> and packs in a tar.gz. (Note this will likely be merged with <programlisting format="linespecific">virt-convert</programlisting> in the future).</para>
-              </listitem><listitem>
-                <para>
-                  <programlisting format="linespecific">virt-install</programlisting> improvements: <itemizedlist>
-                    <listitem>
-                      <para> Support for remote VM installation. Can use install media and disk images on remote host if shared via libvirt. Allows provisioning storage on remote pools.</para>
-                    </listitem><listitem>
-                      <para> Support setting CPU pinning information for QEmu/KVM VMs</para>
-                    </listitem><listitem>
-                      <para> NUMA support via <programlisting format="linespecific">--cpuset=auto</programlisting> option</para>
-                    </listitem><listitem>
-                      <para> New options:</para>
-                    </listitem>
-                  </itemizedlist>
-                </para>
-              </listitem>
-            </itemizedlist><para>
-              <blockquote>
-                <para>
-                  <programlisting format="linespecific">--wait</programlisting> allows putting a hard time limit on installs</para>
-              </blockquote> <blockquote>
-                <para>
-                  <programlisting format="linespecific">--sound</programlisting> create VM with soundcard emulation</para>
-              </blockquote> <blockquote>
-                <para>
-                  <programlisting format="linespecific">--disk</programlisting>  allows specifying media as a path, storage volume, or a pool to provision storage on, device type, and several other options.  Deprecates <programlisting format="linespecific">--file</programlisting>, <programlisting format="linespecific">--size</programlisting>, <programlisting format="linespecific">--nonsparse</programlisting>.</para>
-              </blockquote> <blockquote>
-                <para>
-                  <programlisting format="linespecific">--prompt</programlisting>  Input prompting is no longer the default, this option turns it back on.</para>
-              </blockquote>
-            </para><itemizedlist>
-              <listitem>
-                <para>
-                  <programlisting format="linespecific">virt-image</programlisting> improvements:<itemizedlist>
-                    <listitem>
-                      <para>
-                        <programlisting format="linespecific">--replace</programlisting> option to overwrite existing VM image file</para>
-                    </listitem><listitem>
-                      <para> Support multiple network interfaces in <programlisting format="linespecific">virt-image</programlisting> format</para>
-                    </listitem>
-                  </itemizedlist>
-                </para>
-              </listitem><listitem>
-                <para> Use virtio disk/net drivers if chosen guest OS entry supports it (Fedora 9 and 10)</para>
-              </listitem>
-            </itemizedlist><para />
-            <para>For further details refer to:</para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ulink url="http://virt-manager.et.redhat.com/">http://virt-manager.et.redhat.com/</ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </section><section id="">
-            <title>Xen Updated to 3.3.0 </title>
-            <para> Fedora 10 supports booting as a guest domU, but will not function as a dom0 until such support is provided in the upstream kernel. Support for a <programlisting format="linespecific">pv_ops</programlisting> dom0 is targeted for Xen 3.4.</para><para>
-              <emphasis>Changes since 3.2.0:</emphasis>
-            </para><itemizedlist>
-              <listitem>
-                <para> Power management (P &amp; C states) in the hypervisor</para>
-              </listitem><listitem>
-                <para> HVM emulation domains (<emphasis>qemu-on-minios</emphasis>) for better scalability, performance, and security</para>
-              </listitem><listitem>
-                <para> PVGrub: boot PV kernels using real GRUB inside the PV domain</para>
-              </listitem><listitem>
-                <para> Better PV performance: domain lock removed from pagetable-update paths</para>
-              </listitem><listitem>
-                <para> Shadow3: optimisations to make this the best shadow pagetable algorithm yet, making HVM performance better than ever</para>
-              </listitem><listitem>
-                <para> Hardware Assisted Paging enhancements: 2MB page support for better TLB locality</para>
-              </listitem><listitem>
-                <para> CPUID feature levelling: allows safe domain migration across systems with different CPU models</para>
-              </listitem><listitem>
-                <para> PVSCSI drivers for SCSI access direct into PV guests</para>
-              </listitem><listitem>
-                <para> HVM framebuffer optimisations: scan for framebuffer updates more efficiently</para>
-              </listitem><listitem>
-                <para> Device passthrough enhancements</para>
-              </listitem><listitem>
-                <para> Full x86 real-mode emulation for HVM guests on Intel VT: supports a much wider range of legacy guest OSes</para>
-              </listitem><listitem>
-                <para> New qemu merge with upstream development</para>
-              </listitem><listitem>
-                <para> Many other changes in both x86 and IA64 ports</para>
-              </listitem>
-            </itemizedlist><para />
-            <para>For further details refer to:</para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ulink url="http://www.xen.org/download/roadmap.html">http://www.xen.org/download/roadmap.html</ulink> -- Xen roadmap</para>
-              </listitem><listitem>
-                <para>
-                  <ulink url="http://xenbits.xen.org/paravirt_ops/patches.hg/">http://xenbits.xen.org/paravirt_ops/patches.hg/</ulink> -- paravirt_ops patch queue</para>
-              </listitem>
-            </itemizedlist>
-          </section>
-        </section>
-      </section>
+<section lang="en" id="sn-Virtualization">
+  <title>Virtualization</title>
+  <para>Virtualization in Fedora 10 includes major changes, and new
+    features, that continue to support KVM, Xen, and many other virtual
+    machine platforms. </para>
+  <section id="sn-Unified_kernel_image">
+    <title>Unified kernel image</title>
+    <para>The <package>kernel-xen</package> package has been obsoleted
+      by the integration of paravirtualization operations in the
+      upstream kernel. The <package>kernel</package> package in Fedora
+      10 supports booting as a guest domU, but will not function as a
+      dom0 until such support is provided upstream. The most recent
+      Fedora release with dom0 support is Fedora 8. </para>
+    <para>Booting a Xen domU guest within a Fedora 10 host requires the
+      KVM based <command>xenner</command>. Xenner runs the guest kernel
+      and a small Xen emulator together as a KVM guest. </para>
+
+    <important>
+      <title>KVM requires hardware virtualization features in the host
+	system.</title>
+      <para>Systems
+      lacking hardware virtualization do not support Xen guests at this
+      time.</para>
+    </important>
+    <para>For more information refer to: </para>
+    <itemizedlist>
+      <listitem>
+	<para>
+	  <ulink
+	    url="http://sourceforge.net/projects/kvm"/>
+	</para>
+      </listitem><listitem>
+	<para>
+	  <ulink
+	    url="http://kraxel.fedorapeople.org/xenner/"/>
+	</para>
+      </listitem><listitem>
+	<para>
+	  <ulink
+	    url="http://fedoraproject.org/wiki/Features/XenPvops"/>
+	</para>
+      </listitem><listitem>
+	<para>
+	  <ulink
+	    url="http://fedoraproject.org/wiki/Features/XenPvopsDom0"/>
+	</para>
+      </listitem>
+    </itemizedlist>
+  </section><section id="sn-Virtualization_storage_management">
+    <title>Virtualization storage management</title>
+    <para>Advances in <systemitem class="library">libvirt</systemitem> now provide the
+      ability to list, create, and delete storage volumes on remote
+      hosts. This includes the ability to create raw sparse and
+      non-sparse files in a directory, allocate LVM logical volumes,
+      partition physical disks, and attach to iSCSI
+      targets.</para>
+    <para>This enables the <command>virt-manager</command> tool to
+      remotely provision new guest domains, and manage the storage
+      associated with them. It provides improved SELinux integration,
+      since the APIs ensure that all storage volumes have the correct
+      SELinux security context when being assigned to a
+      guest.</para><para>
+      <emphasis>Features</emphasis>
+    </para><itemizedlist>
+      <listitem>
+	<para> List storage volumes in a directory, and allocate new
+	  volumes, raw files both sparse and non-sparse, and formats
+	  supported by <package>qemu-img</package> (cow, qcow,
+	  qcow2, vmdk, etc)</para>
+      </listitem><listitem>
+	<para> List partitions in a disk, and allocate new partitions
+	  from free space</para>
+      </listitem><listitem>
+	<para> Connect to an iSCSI server and list volumes associated
+	  with an exported target</para>
+      </listitem><listitem>
+	<para> List logical volumes in an LVM volume group, and allocate
+	  new LVM logical volumes</para>
+      </listitem><listitem>
+	<para> Automatically assign correct SELinux security context
+	  label (<option>virt_image_t</option>) to all volumes when
+	  associating with a guest.</para>
+	<para>For further details refer to:</para>
+	<itemizedlist>
+	  <listitem>
+	    <para>
+	      <ulink
+		url="http://fedoraproject.org/wiki/Features/VirtStorage"/>
+	    </para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink
+		url="http://libvirt.org/storage.html"/>
+	      -- libvirt Storage Management</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink
+		url="http://virt-manager.et.redhat.com/page/StorageManagement"/>
+	      -- virt-manager Storage Management</para>
+	  </listitem><listitem>
+	    <para>
+	      <ulink
+		url="http://kvm.qumranet.com/kvmwiki/Virtio"/>
+	    </para>
+	  </listitem>
+	</itemizedlist>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="sn-Remote_installation_of_virtual_machines">
+    <title>Remote installation of virtual machines</title>
+    <para>Improvements in Virtualization storage management have enabled
+      the creation of guests on remote host systems. By leveraging
+      Avahi, systems supporting <systemitem
+	class="library">libvirt</systemitem> can be automatically
+      detected by <command>virt-manager</command>. Upon detection guests
+      can be provisioned on the remote system.</para>
+    <para>Installations can be automated with the help of
+      <command>cobbler</command> and <command>koan</command>. Cobbler is
+      a Linux installation server that allows for rapid setup of network
+      installation environments. Network installs can be configured for
+      PXE boot, reinstallations, media-based net-installs, and
+      virtualized guest installs. Cobbler uses a helper program,
+      <command>koan</command>, for reinstallation and virtualization
+      support. </para>
+    <para>For further details refer to:</para>
+    <itemizedlist>
+      <listitem>
+	<para>
+	  <ulink
+	    url="http://fedoraproject.org/wiki/Features/VirtRemoteInstall"/>
+	</para>
+      </listitem><listitem>
+	<para>
+	  <ulink
+	    url="http://virt-manager.et.redhat.com/page/LibvirtDiscovery"/>
+	  -- virt-manager Discovery</para>
+      </listitem><listitem>
+	<para>
+	  <ulink url="http://avahi.org/"/>
+	</para>
+      </listitem><listitem>
+	<para>
+	  <ulink
+	    url="http://fedorahosted.org/cobbler"/>
+	</para>
+      </listitem>
+    </itemizedlist>
+  </section><section id="sn-Other_improvements">
+    <title>Other improvements</title>
+    <para>Fedora also includes the following virtualization
+      improvements:</para>
+    <itemizedlist>
+      <listitem>
+	<para> Utilities in the new <package>virt-mem</package> package
+	  provide access to process tables, interface information,
+	  dmesg, and uname of QEmu and KVM guests from the host system.
+	  <ulink
+	    url="http://et.redhat.com/~rjones/virt-mem/"/>
+	</para>
+      </listitem>
+    </itemizedlist>
+    <note>
+      <title><command>virt-mem</command> is experimental.</title>
+      <para>Only 32 bit guests are supported at this time.</para>
+    </note>
+    <itemizedlist>
+      <listitem>
+	<para> The new <command>virt-df</command> tool provides
+	  information on the disk usage of guests from the host system.
+	  <ulink
+	    url="http://et.redhat.com/~rjones/virt-df"/>
+	</para>
+      </listitem>
+    </itemizedlist><para />
+    <section id="sn-libvirt_updated_to_0.4.6">
+      <title><package>libvirt</package> updated to 0.4.6</title>
+      <para>The <package>libvirt</package> package provides an API and
+	tools to interact with the virtualization capabilities of recent
+	versions of Linux (and other OSes). The <systemitem
+	  class="library">libvirt</systemitem> software is designed to
+	be a common denominator among all virtualization technologies
+	with support for the following:</para>
+      <itemizedlist>
+	<listitem>
+	  <para> The Xen hypervisor on Linux and Solaris hosts.</para>
+	</listitem><listitem>
+	  <para> The QEMU emulator</para>
+	</listitem><listitem>
+	  <para> The KVM Linux hypervisor</para>
+	</listitem><listitem>
+	  <para> The LXC Linux container system</para>
+	</listitem><listitem>
+	  <para> The OpenVZ Linux container system</para>
+	</listitem><listitem>
+	  <para> Storage on IDE/SCSI/USB disks, FibreChannel, LVM,
+	    iSCSI, and NFS</para>
+	</listitem>
+      </itemizedlist><para>
+	<emphasis>New features and improvements since 0.4.2:</emphasis>
+      </para><itemizedlist>
+	<listitem>
+	  <para> Enhanced OpenVZ support</para>
+	</listitem><listitem>
+	  <para> Enhanced Linux containers (LXC) support</para>
+	</listitem><listitem>
+	  <para> Storage pools API</para>
+	</listitem><listitem>
+	  <para> Improved iSCSI support</para>
+	</listitem><listitem>
+	  <para> USB device passthrough for QEMU and KVM</para>
+	</listitem><listitem>
+	  <para> Sound, serial, and parallel device support for QEMU and
+	    Xen</para>
+	</listitem><listitem>
+	  <para> Support for NUMA and vCPU pinning in QEMU</para>
+	</listitem><listitem>
+	  <para> Unified XML domain and network parsing for all
+	    virtualization drivers</para>
+	</listitem>
+      </itemizedlist>
+      <para>For further details refer to:</para>
+      <para>
+	<ulink
+	  url="http://www.libvirt.org/news.html"/>
+      </para>
+    </section><section id="sn-virt-manager_updated_to_0.6.0">
+      <title><package>virt-manager</package> Updated to 0.6.0</title>
+      <para> The <package>virt-manager</package> package provides a GUI
+	implementation of <command>virtinst</command> and <systemitem
+	  class="library">libvirt</systemitem>
+	functionality.</para><para>
+	<emphasis>New features and improvements since 0.5.4:</emphasis>
+      </para>
+      <itemizedlist>
+	<listitem>
+	  <para> Remote storage management and provisioning: view, add,
+	    remove, and provision <systemitem
+	      class="library">libvirt</systemitem> managed storage.
+	    Attach managed storage to a remote VM.</para>
+	</listitem><listitem>
+	  <para> Remote VM installation support: Install from managed
+	    media (CDROM) or PXE. Simple install time storage
+	    provisioning.</para>
+	</listitem><listitem>
+	  <para> VM details and console windows merged: each VM is now
+	    represented by a single tabbed window.</para>
+	</listitem><listitem>
+	  <para> Use Avahi to list <command>libvirtd</command> instances
+	    on network.</para>
+	</listitem><listitem>
+	  <para> Hypervisor Autoconnect: Option to connect to hypervisor
+	    at <command>virt-manager</command> start
+	    up.</para>
+	</listitem><listitem>
+	  <para> Option to add sound device emulation when creating new
+	    guests.</para>
+	</listitem><listitem>
+	  <para> Virtio and USB options when adding a disk
+	    device.</para>
+	</listitem><listitem>
+	  <para> Allow viewing and removing VM sound, serial, parallel,
+	    and console devices.</para>
+	</listitem><listitem>
+	  <para> Allow specifying a keymap when adding display
+	    device.</para>
+	</listitem><listitem>
+	  <para> Keep app running if manager window is closed but VM
+	    window is still open.</para>
+	</listitem><listitem>
+	  <para> Allow limiting the amount of stored stats
+	    history.</para>
+	</listitem>
+      </itemizedlist><para />
+      <para>For further details refer to:</para>
+      <para>
+	<ulink
+	  url="http://virt-manager.et.redhat.com/"/>
+      </para>
+    </section><section id="sn-virtinst_updated_to_0.400.0">
+      <title><package>virtinst</package> updated to 0.400.0</title>
+      <para> The <package>python-virtinst</package> package
+	contains tools for installing and manipulating multiple VM guest
+	image formats.</para><para>
+	<emphasis>New features and improvements since
+	  0.300.3:</emphasis>
+      </para><itemizedlist>
+	<listitem>
+	  <para> New tool <command>virt-convert</command>:
+	    Allows converting between different types of virt
+	    configuration files. Currently only supports
+	    <filename>vmx</filename> to
+	    <filename>virt-image</filename>.</para>
+	</listitem><listitem>
+	  <para> New tool <command>virt-pack</command>: Converts
+	    <filename>virt-image</filename> xml format to
+	    <filename>vmx</filename> and packs in a tar.gz. (Note this
+	    will likely be merged with <command>virt-convert</command> in the
+	    future).</para>
+	</listitem>
+	<listitem>
+	  <para>
+	    <command>virt-install</command> improvements: <itemizedlist>
+	      <listitem>
+		<para> Support for remote VM installation. Can use
+		  install media and disk images on remote host if shared
+		  via <systemitem class="library">libvirt</systemitem>.
+		  Allows provisioning storage on remote pools.</para>
+	      </listitem><listitem>
+		<para> Support setting CPU pinning information for
+		  QEmu/KVM VMs</para>
+	      </listitem><listitem>
+		<para> NUMA support via <option>--cpuset=auto</option>
+		  option</para>
+	      </listitem><listitem>
+		<para> New options:</para>
+		<para>
+		  <itemizedlist>
+		    <listitem>
+		      <para>
+			<option>--wait</option> allows putting a hard
+			time limit on installs</para>
+		    </listitem>
+		    <listitem>
+		      <para><option>--sound</option> create VM
+			with soundcard emulation</para>
+		    </listitem>
+		<listitem>
+		      <para><option>--disk</option>  allows specifying
+			media as a path, storage volume, or a pool to
+			provision storage on, device type, and several
+			other options.  Deprecates
+			<option>--file</option>,
+			<option>--size</option>,
+			<option>--nonsparse</option>.</para>
+		    </listitem>
+		    <listitem>
+		      <para>
+			<option>--prompt</option>  Input
+			prompting is no longer the default, this option turns it
+			back on.</para>
+		    </listitem>
+		  </itemizedlist>
+	      </listitem>
+	    </itemizedlist>
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    <command>virt-image</command>
+	    improvements:</para>
+	  <itemizedlist>
+	    <listitem>
+	      <para>
+		<option>--replace</option>
+		option to overwrite existing VM image file</para>
+	    </listitem><listitem>
+	      <para> Support multiple network interfaces in
+		<filename>virt-image</filename>
+		format</para>
+	    </listitem>
+	  </itemizedlist>
+	</listitem>
+	<listitem>
+	  <para>Use virtio disk/net drivers if chosen guest OS entry
+	    supports it (Fedora 9 and 10)</para>
+	</listitem>
+      </itemizedlist>
+      <para>For further details refer to:</para>
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    <ulink
+	      url="http://virt-manager.et.redhat.com/"/>
+	  </para>
+	</listitem>
+      </itemizedlist>
+    </section>
+    <section id="sn-Xen_updated_to_3.3.0">
+      <title>Xen updated to 3.3.0</title>
+      <para> Fedora 10 supports booting as a guest domU, but will not
+	function as a dom0 until such support is provided in the
+	upstream kernel. Support for a <option>pv_ops</option> dom0 is targeted
+	for Xen 3.4.</para><para>
+	<emphasis>Changes since 3.2.0:</emphasis>
+      </para><itemizedlist>
+	<listitem>
+	  <para> Power management (P &amp; C states) in the
+	    hypervisor</para>
+	</listitem><listitem>
+	  <para> HVM emulation domains
+	    (<command>qemu-on-minios</command>) for better
+	    scalability, performance, and security</para>
+	</listitem><listitem>
+	  <para> PVGrub: boot PV kernels using real GRUB inside the PV
+	    domain</para>
+	</listitem><listitem>
+	  <para> Better PV performance: domain lock removed from
+	    pagetable-update paths</para>
+	</listitem><listitem>
+	  <para> Shadow3: optimisations to make this the best shadow
+	    pagetable algorithm yet, making HVM performance better than
+	    ever</para>
+	</listitem><listitem>
+	  <para> Hardware Assisted Paging enhancements: 2MB page support
+	    for better TLB locality</para>
+	</listitem><listitem>
+	  <para> CPUID feature levelling: allows safe domain migration
+	    across systems with different CPU models</para>
+	</listitem><listitem>
+	  <para> PVSCSI drivers for SCSI access direct into PV
+	    guests</para>
+	</listitem><listitem>
+	  <para> HVM framebuffer optimisations: scan for framebuffer
+	    updates more efficiently</para>
+	</listitem><listitem>
+	  <para> Device passthrough enhancements</para>
+	</listitem><listitem>
+	  <para> Full x86 real-mode emulation for HVM guests on Intel
+	    VT: supports a much wider range of legacy guest OSes</para>
+	</listitem><listitem>
+	  <para> New qemu merge with upstream development</para>
+	</listitem><listitem>
+	  <para> Many other changes in both x86 and IA64 ports</para>
+	</listitem>
+      </itemizedlist><para />
+      <para>For further details refer to:</para>
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    <ulink
+	      url="http://www.xen.org/download/roadmap.html"/>
+	    -- Xen roadmap</para>
+	</listitem><listitem>
+	  <para>
+	    <ulink
+	      url="http://xenbits.xen.org/paravirt_ops/patches.hg/"/>
+	    -- paravirt_ops patch queue</para>
+	</listitem>
+      </itemizedlist>
     </section>
-  </article>
-</book>
\ No newline at end of file
+  </section>
+</section>
diff --git a/en-US/Web_Servers.xml b/en-US/Web_Servers.xml
deleted file mode 100644
index 018a670..0000000
--- a/en-US/Web_Servers.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/WebServers</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/WebServers</title>
-      <section id="">
-        <title>Web Servers </title>
-        <section id="">
-          <title>PostgreSQL DBD Driver </title>
-          <para>
-            <para>
-              <para>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/c/cc/Note.png" scalefit="1" width="35px" />
-                  </imageobject><caption>
-                    <para />
-                  </caption>
-                </inlinemediaobject>
-              </para><para>
-                <emphasis>Deprecated or out of date content?</emphasis>
-                <literallayout>
-</literallayout>This content may be deprecated or out of date, it has not been updated since the Fedora 9 release notes.</para>
-            </para>
-          </para><para>Users of the <programlisting format="linespecific">mod_dbd</programlisting> module should note that the <programlisting format="linespecific">apr-util</programlisting> DBD driver for PostgreSQL is now distributed as a separate dynamically-loaded module.  The driver module is now included in the <programlisting format="linespecific">apr-util-pgsql</programlisting> package.  A MySQL driver is now also available, in the <programlisting format="linespecific">apr-util-mysql</programlisting> package.</para>
-        </section><section id="">
-          <title>Drupal </title>
-          <para>Drupal has been updated to 6.4.  For details, refer to:</para>
-          <para>
-            <ulink url="http://drupal.org/drupal-6.4">http://drupal.org/drupal-6.4</ulink>
-          </para><para>If your installation is updated to the 6.4 version in Fedora 9, skip the following step.</para>
-          <para>When upgrading from earlier versions, remember to log in to your site as the admin user, and disable any third-party modules before upgrading this package. After upgrading the package:</para>
-          <orderedlist numeration="arabic">
-            <listitem>
-              <para> Copy <programlisting format="linespecific">/etc/drupal/default/settings.php.rpmsave</programlisting> to <programlisting format="linespecific">/etc/drupal/default/settings.php</programlisting>, and repeat for any additional sites' <programlisting format="linespecific">settings.php</programlisting> files.</para>
-            </listitem><listitem>
-              <para> Browse to <ulink url="http://host/drupal/update.php">http://host/drupal/update.php</ulink> to run the upgrade script.</para>
-            </listitem>
-          </orderedlist><para>Also, several modules are now available.  drupal-date, -cck, -views, and -service_links.</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Web_servers.xml b/en-US/Web_servers.xml
new file mode 100644
index 0000000..e465ebf
--- /dev/null
+++ b/en-US/Web_servers.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ 
+<section lang="en" id="sn-Web_servers">
+  <title>Web servers</title>
+  <para />
+  <section id="sn-PostgreSQL_DBD_Driver">
+    <title>PostgreSQL DBD Driver</title>
+    <tip>
+      <title>Deprecated or out of date content?</title>
+      <para>
+	This content may be deprecated or out of date, it has not been
+	updated since the Fedora 9 release notes.</para>
+    </tip>
+    <para>Users of the <filename>mod_dbd</filename> module should note
+      that the <filename>apr-util</filename> DBD driver for PostgreSQL
+      is now distributed as a separate dynamically-loaded module.  The
+      driver module is now included in the
+      <package>apr-util-pgsql</package> package. A MySQL driver is now
+      also available, in the <package>apr-util-mysql</package>
+      package.</para>
+  </section>
+  <section id="sn-Drupal">
+    <title>Drupal </title>
+    <para>Drupal has been updated to 6.4.  For details, refer to:</para>
+    <para>
+      <ulink
+	url="http://drupal.org/drupal-6.4"/>
+    </para><para>If your installation is updated to the 6.4 version in
+      Fedora 9, skip the following step.</para>
+    <para>When upgrading from earlier versions, remember to log in to
+      your site as the admin user, and disable any third-party modules
+      before upgrading this package. After upgrading the package:</para>
+    <orderedlist numeration="arabic">
+      <listitem>
+	<para> Copy <programlisting
+	    format="linespecific">/etc/drupal/default/settings.php.rpmsave</programlisting> 
+	  to <programlisting
+	    format="linespecific">/etc/drupal/default/settings.php</programlisting>, 
+	  and repeat for any additional sites'
+	  <filename>settings.php</filename> files.</para>
+      </listitem><listitem>
+	<para> Browse to <ulink
+	    url="http://host/drupal/update.php"/>
+	  to run the upgrade script.</para>
+      </listitem>
+    </orderedlist><para>Also, several modules are now available:
+      <filename>drupal-date</filename>, <filename>-cck</filename>,
+      <filename>-views</filename>, and
+      <filename>-service_links</filename>.</para>
+  </section>
+</section>
diff --git a/en-US/Welcome_to_Fedora.xml b/en-US/Welcome_to_Fedora.xml
index eeaed9d..17161ca 100644
--- a/en-US/Welcome_to_Fedora.xml
+++ b/en-US/Welcome_to_Fedora.xml
@@ -1,48 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ 
+<section lang="en" id="sn-Welcome_to_Fedora">
+  <title>Welcome to Fedora</title>
+  <para>Fedora is a Linux-based operating system that showcases the
+    latest in free and open source software. Fedora is always free for
+    anyone to use, modify, and distribute. It is built by people across
+    the globe who work together as a community: the Fedora Project. The
+    Fedora Project is open and anyone is welcome to join. The Fedora
+    Project is out front for you, leading the advancement of free, open
+    software and content. </para>
+  <tip>
+    <title>Visit <ulink
+	url="http://docs.fedoraproject.org/release-notes/"/>
+      to view the latest release notes for Fedora, especially if you are
+      upgrading.</title>
+    <para>If you are migrating from a release of Fedora older than the
+      immediately previous one, you should refer to older Release Notes
+      for additional information. You can find older Release Notes at
+      <ulink
+	url="http://docs.fedoraproject.org/release-notes/"/>
+  </tip>
+  <para>You can help the Fedora Project community continue
+    to improve Fedora if you file bug reports and enhancement requests.
+    Refer to <ulink
+      url="http://fedoraproject.org/wiki/BugsAndFeatureRequests"/>
+    for more information about bug and feature reporting. Thank you for
+    your participation.</para><para>To find out more general information
+    about Fedora, refer to the following Web pages:</para>
+  <itemizedlist>
+    <listitem>
+      <para>Fedora Overview - <ulink
+	  url="http://fedoraproject.org/wiki/Overview"/>
+      </para>
+    </listitem><listitem>
+      <para>Fedora FAQ - <ulink
+	  url="http://fedoraproject.org/wiki/FAQ"/>
+      </para>
+    </listitem><listitem>
+      <para>Help and Discussions - <ulink
+	  url="http://fedoraproject.org/wiki/Communicate"/>
+      </para>
+    </listitem><listitem>
+      <para>Participate in the Fedora Project - <ulink
+	  url="http://fedoraproject.org/wiki/Join"/>
+      </para>
+    </listitem>
+  </itemizedlist>
+</section>
+
 
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Welcome</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Welcome</title>
-      <section id="">
-        <title>Welcome to Fedora </title>
-        <para>Fedora is a Linux-based operating system that showcases the latest in free and open source software. Fedora is always free for anyone to use, modify, and distribute. It is built by people across the globe who work together as a community: the Fedora Project. The Fedora Project is open and anyone is welcome to join. The Fedora Project is out front for you, leading the advancement of free, open software and content. </para>
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis> Visit <ulink url="http://docs.fedoraproject.org/release-notes/">http://docs.fedoraproject.org/release-notes/</ulink> to view the latest release notes for Fedora, especially if you are upgrading.</emphasis><literallayout>
-</literallayout>If you are migrating from a release of Fedora older than the immediately previous one, you should refer to older Release Notes for additional information. You can find older Release Notes at <ulink url="http://docs.fedoraproject.org/release-notes/.">http://docs.fedoraproject.org/release-notes/.</ulink>
-            </para>
-          </para>
-        </para><para>You can help the Fedora Project community continue to improve Fedora if you file bug reports and enhancement requests. Refer to <ulink url="http://fedoraproject.org/wiki/BugsAndFeatureRequests">http://fedoraproject.org/wiki/BugsAndFeatureRequests</ulink> for more information about bug and feature reporting. Thank you for your participation.</para><para>To find out more general information about Fedora, refer to the following Web pages:</para>
-        <itemizedlist>
-          <listitem>
-            <para> Fedora Overview (<ulink url="http://fedoraproject.org/wiki/Overview)">http://fedoraproject.org/wiki/Overview)</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Fedora FAQ (<ulink url="http://fedoraproject.org/wiki/FAQ)">http://fedoraproject.org/wiki/FAQ)</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Help and Discussions (<ulink url="http://fedoraproject.org/wiki/Communicate)">http://fedoraproject.org/wiki/Communicate)</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Participate in the Fedora Project (<ulink url="http://fedoraproject.org/wiki/Join)">http://fedoraproject.org/wiki/Join)</ulink>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/X_Window_System_-_Graphics.xml b/en-US/X_Window_System_-_Graphics.xml
deleted file mode 100644
index cd4fe9e..0000000
--- a/en-US/X_Window_System_-_Graphics.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter lang="en" id="X_Window_System_-_Graphics">
-  <title>X Window System - Graphics</title>
-  <para>This section contains information related to the X Window System
-    implementation, X.Org, provided with Fedora.</para>
-  <section id="X_Configuration_Changes">
-    <title>X Configuration Changes</title>
-    <para>Fedora 10 uses the <programlisting
-	format="linespecific">evdev</programlisting> input driver as
-      standard mouse and keyboard driver for the X server. This driver
-      works with HAL to provide a persistent per-device configuration
-      that allows devices to be added or removed at runtime.</para>
-  </section>
-  <section id="Third-party_Video_Drivers">
-    <title>Third-party Video Drivers</title>
-    <para>Refer to the Xorg third-party drivers page for detailed
-      guidelines on using third-party video drivers.</para>
-    <para>
-      <ulink
-	url="http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>
-    </para>
-  </section>
-  <section id="Resources">
-    <title>Resources</title>
-    <para>
-      <ulink
-	url="http://who-t.blogspot.com/2008/07/input-configuration-in-nutshell.html">http://who-t.blogspot.com/2008/07/input-configuration-in-nutshell.html</ulink> -- Evdev configuration.</para>
-  </section>
-</chapter>
-
diff --git a/en-US/X_Window_system_-_graphics.xml b/en-US/X_Window_system_-_graphics.xml
new file mode 100644
index 0000000..520e047
--- /dev/null
+++ b/en-US/X_Window_system_-_graphics.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<section id="X_Window_system_-_graphics" lang="en">
+  <title>X Window system - graphics</title>
+  <para>This section contains information related to the X Window System
+    implementation, X.Org, provided with Fedora.</para>
+  <section id="sn-X_Configuration_Changes">
+    <title>X Configuration Changes</title>
+    <para>Fedora 10 uses the <programlisting
+	format="linespecific">evdev</programlisting> input driver as
+      standard mouse and keyboard driver for the X server. This driver
+      works with HAL to provide a persistent per-device configuration
+      that allows devices to be added or removed at runtime.</para>
+  </section>
+  <section id="sn-Third-party_Video_Drivers">
+    <title>Third-party Video Drivers</title>
+    <para>Refer to the Xorg third-party drivers page for detailed
+      guidelines on using third-party video drivers.</para>
+    <para>
+      <ulink
+	url="http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>
+    </para>
+  </section>
+  <section id="sn-Resources">
+    <title>Resources</title>
+    <para>
+      <ulink
+	url="http://who-t.blogspot.com/2008/07/input-configuration-in-nutshell.html">http://who-t.blogspot.com/2008/07/input-configuration-in-nutshell.html</ulink> -- Evdev configuration.</para>
+  </section>
+</section>
+
diff --git a/en-US/x86_64_Specifics_for_Fedora.xml b/en-US/x86_64_Specifics_for_Fedora.xml
deleted file mode 100644
index a95cd46..0000000
--- a/en-US/x86_64_Specifics_for_Fedora.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/ArchSpecific/x86_64</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/ArchSpecific/x86_64</title>
-      <section id="">
-        <title>x86_64 Specifics for Fedora </title>
-        <para>This section covers specific information about Fedora and the x86_64 hardware platform.</para>
-        <section id="">
-          <title>Hardware requirements for x86_64 </title>
-          <para>In order to use specific features of Fedora 10 during or after installation, you may need to know details of other hardware components such as video and network cards. </para>
-          <section id="">
-            <title>Memory requirements for x86_64 </title>
-            <itemizedlist>
-              <listitem>
-                <para> Minimum RAM for text-mode: 256MiB</para>
-              </listitem><listitem>
-                <para> Minimum RAM for graphical: 384MiB</para>
-              </listitem><listitem>
-                <para> Recommended RAM for graphical: 512MiB</para>
-              </listitem>
-            </itemizedlist>
-          </section><section id="">
-            <title>Hard disk space requirements for x86_64 </title>
-            <para>All of the packages from a DVD install can occupy over 9 GB of disk space. The final install size is determined by the installing spin and the packages selected during installation. Additional disk space is required during installation to support the installation environment. The additional disk space corresponds to the size of /Fedora/base/stage2.img plus the size of the files in /var/lib/rpm on the installed system.</para>
-            <para>In practical terms the additional space requirements may range from as little as 90 MiB for a minimal installation to as much as an additional 175 MiB for a larger installation.</para>
-            <para>Additional space is also required for any user data and at least 5% free space should be maintained for proper system operation.</para>
-          </section>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/x86_64_specifics_for_Fedora.xml b/en-US/x86_64_specifics_for_Fedora.xml
new file mode 100644
index 0000000..036ae7a
--- /dev/null
+++ b/en-US/x86_64_specifics_for_Fedora.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section id="x86_64_specifics_for_Fedora" lang="en">
+  <title>x86_64 specifics for Fedora</title>
+  <para>This section covers specific information about Fedora and the
+    x86_64 hardware platform.</para>
+  <section id="sn-Hardware_requirements_for_x86_64">
+    <title>Hardware requirements for x86_64</title>
+    <para>In order to use specific features of Fedora 10 during or after
+      installation, you may need to know details of other hardware
+      components such as video and network cards. </para>
+    <section id="Memory_requirements_for_x86_64">
+      <title>Memory requirements for x86_64</title>
+      <itemizedlist>
+	<listitem>
+	  <para> Minimum RAM for text-mode: 256MiB</para>
+	</listitem><listitem>
+	  <para> Minimum RAM for graphical: 384MiB</para>
+	</listitem><listitem>
+	  <para> Recommended RAM for graphical: 512MiB</para>
+	</listitem>
+      </itemizedlist>
+    </section>
+    <section id="Hard_disk_space_requirements_for_x86_64">
+      <title>Hard disk space requirements for x86_64</title>
+      <para>All of the packages from a DVD install can occupy over 9 GB
+	of disk space. The final install size is determined by the
+	installing spin and the packages selected during installation.
+	Additional disk space is required during installation to support
+	the installation environment. The additional disk space
+	corresponds to the size of /Fedora/base/stage2.img plus the size
+	of the files in /var/lib/rpm on the installed system.</para>
+      <para>In practical terms the additional space requirements may
+	range from as little as 90 MiB for a minimal installation to as
+	much as an additional 175 MiB for a larger installation.</para>
+      <para>Additional space is also required for any user data and at
+	least 5% free space should be maintained for proper system
+	operation.</para>
+    </section>
+  </section>
+</section>
diff --git a/en-US/x86_Specifics_for_Fedora.xml b/en-US/x86_Specifics_for_Fedora.xml
deleted file mode 100644
index 6a9431f..0000000
--- a/en-US/x86_Specifics_for_Fedora.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/ArchSpecific/x86</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/ArchSpecific/x86</title>
-      <section id="">
-        <title>x86 Specifics for Fedora </title>
-        <para>This section covers specific information about Fedora and the x86 hardware platform.</para>
-        <section id="">
-          <title>Hardware requirements for x86 </title>
-          <para>In order to use specific features of Fedora 10 during or after installation, you may need to know details of other hardware components such as video and network cards. </para>
-          <section id="">
-            <title>Processor and memory </title>
-            <para>The following CPU specifications are stated in terms of Intel processors. Other processors, such as those from AMD, Cyrix, and VIA that are compatible with and equivalent to the following Intel processors, may also be used with Fedora.</para>
-            <para>Fedora 10 requires an Intel Pentium or better processor, and is optimized for Pentium 4 and later processors. </para>
-            <itemizedlist>
-              <listitem>
-                <para> Recommended for text-mode: 200 MHz Pentium-class or better</para>
-              </listitem><listitem>
-                <para> Recommended for graphical: 400 MHz Pentium II or better</para>
-              </listitem><listitem>
-                <para> Minimum RAM for text-mode: 128MiB</para>
-              </listitem><listitem>
-                <para> Minimum RAM for graphical: 192MiB</para>
-              </listitem><listitem>
-                <para> Recommended RAM for graphical: 256MiB</para>
-              </listitem>
-            </itemizedlist><para />
-          </section><section id="">
-            <title>Hard disk space </title>
-            <para>All of the packages from a DVD install can occupy over 9 GB of disk space.  The final install size is determined by the installing spin and the packages selected during installation.  Additional disk space is required during installation to support the installation environment. The additional disk space corresponds to the size of <programlisting format="linespecific">/Fedora/base/stage2.img</programlisting> plus the size of the files in <programlisting format="linespecific">/var/lib/rpm</programlisting> on the installed system.</para><para>In practical terms the additional space requirements may range from as little as 90 MiB for a minimal installation to as much as an additional 175 MiB for a larger installation.</para>
-            <para>Additional space is also required for any user data and at least 5% free space should be maintained for proper system operation.</para>
-          </section>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/x86_specifics_for_Fedora.xml b/en-US/x86_specifics_for_Fedora.xml
new file mode 100644
index 0000000..309669b
--- /dev/null
+++ b/en-US/x86_specifics_for_Fedora.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+ 
+<section id="x86_specifics_for_Fedora" lang="en">
+  <title>x86 specifics for Fedora </title>
+  <para>This section covers specific information about Fedora and the
+    x86 hardware platform.</para>
+  <section id="Hardware_requirements_for_x86">
+    <title>Hardware requirements for x86</title>
+    <para>In order to use specific features of Fedora 10 during or after
+      installation, you may need to know details of other hardware
+      components such as video and network cards. </para>
+    <section id="Processor_and_memory">
+      <title>Processor and memory</title>
+      <para>The following CPU specifications are stated in terms of
+	Intel processors. Other processors, such as those from AMD,
+	Cyrix, and VIA that are compatible with and equivalent to the
+	following Intel processors, may also be used with Fedora.</para>
+      <para>Fedora 10 requires an Intel Pentium or better processor, and
+	is optimized for Pentium 4 and later processors. </para>
+      <itemizedlist>
+	<listitem>
+	  <para>Recommended for text-mode: 200 MHz Pentium-class or
+	    better</para>
+	</listitem><listitem>
+	  <para>Recommended for graphical: 400 MHz Pentium II or
+	    better</para>
+	</listitem><listitem>
+	  <para>Minimum RAM for text-mode: 128MiB</para>
+	</listitem><listitem>
+	  <para>Minimum RAM for graphical: 192MiB</para>
+	</listitem><listitem>
+	  <para>Recommended RAM for graphical: 256MiB</para>
+	</listitem>
+      </itemizedlist>
+    </section>
+    <section id="Hard_disk_space">
+      <title>Hard disk space </title>
+      <para>All of the packages from a DVD install can occupy over 9 GB
+	of disk space.  The final install size is determined by the
+	installing spin and the packages selected during installation.
+	Additional disk space is required during installation to support
+	the installation environment. The additional disk space
+	corresponds to the size of <filename>/Fedora/base/stage2.img</filename>
+	plus the size of the files in <filename>/var/lib/rpm</filename> on the
+	installed system.</para>
+      <para>In practical terms the additional space requirements may
+	range from as little as 90 MiB for a minimal installation to as
+	much as an additional 175 MiB for a larger installation.</para>
+      <para>Additional space is also required for any user data and at
+	least 5% free space should be maintained for proper system
+	operation.</para>
+    </section>
+  </section>
+</section>


commit 9df253ef1cb962b39a72c0df0458405af5359a64
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Wed Oct 15 09:33:15 2008 -0700

    Removing crufty content and filenames from F9 days.
    
    * These files were removed for having old content and old names.
    * Names changed to match Publican requirements.
    * Some files with single-word names retained their name but have new content; these are not represented here.

diff --git a/en-US/Appendix.xml b/en-US/Appendix.xml
deleted file mode 100644
index b2d3418..0000000
--- a/en-US/Appendix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-
-<appendix id="Release_Notes-Revision_History">
-  <appendixinfo>
-    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  </appendixinfo>
-  <title>Revision History</title>
-  <para>This paragraph is intentionally blank.</para>
-</appendix>
diff --git a/en-US/ArchSpecific.xml b/en-US/ArchSpecific.xml
deleted file mode 100644
index df9158f..0000000
--- a/en-US/ArchSpecific.xml
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-ArchSpecific">
-  <title>Architecture Specific Notes</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-
-  <para>
-    This section provides notes that are specific to the supported
-    hardware architectures of Fedora.
-  </para>
-
-  <section id="sn-rpm-multiarch">
-    <title>RPM multiarch support on 64-bit platforms (x86_64, ppc64)</title>
-
-    <para>
-      <application>RPM</application> supports parallel installation of
-      multiple architectures of the same package. A default package
-      listing such as <command>rpm -qa</command> might appear to include
-      duplicate packages, since the architecture is not displayed.
-      Instead, use the <command>repoquery</command> command, part of the
-      <package>yum-utils</package> package, which displays architecture
-      by default. To install <package>yum-utils</package> , run the
-      following command:
-    </para>
-<screen><![CDATA[su -c "yum install yum-utils"]]></screen>
-    <para>
-      To list all packages with their architecture using
-      <command>rpm</command>, run the following command:
-    </para>
-<screen><![CDATA[rpm -qa --queryformat "%{name}-%{version}-%{release}.%{arch}\n"]]></screen>
-    <para>
-      You can add this to <filename>/etc/rpm/macros</filename> (for a
-      system wide setting) or <filename>~/.rpmmacros</filename> (for a
-      per-user setting). It changes the default query to list the
-      architecture:
-    </para>
-
-
-<screen><![CDATA[%_query_all_fmt      %%{name}-%%{version}-%%{release}.%%{arch}]]></screen>
-  </section>
-
-  <section id="sn-ArchSpecific-PPC">
-    <title>PPC Specifics for Fedora</title>
-
-    <para>
-      This section covers specific information about Fedora and the PPC
-      hardware platform.
-    </para>
-
-    <section id="sn-ArchSpecific-ppc-hw">
-      <title>Hardware Requirements for PPC</title>
-
-
-
-      <section id="sn-ArchSpecific-ppc-hw-cpu">
-        <title>Processor and memory</title>
-
-
-
-        <itemizedlist>
-          <listitem>
-            <para>
-              Minimum CPU: PowerPC G3 / POWER3.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Fedora 9 supports only the "New World" generation of Apple
-	      Power Macintosh, shipped from circa 1999 onward. Although "Old World" machines should work, they require a special bootloader which is not included in the Fedora distribution. 
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-	      Fedora 9 supports IBM RS/6000, pSeries, iSeries, and Cell Broadband Engine machines.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-	      Fedora 9 also supports the Sony PlayStation 3 and Genesi Pegasos II and Efika.
-            </para>
-          </listitem>
-	  <listitem>
-		  <para>
-		    Fedora 9 includes new hardware support for the P.A. Semiconductor 'Electra' machines.
-		  </para>
-	  </listitem>
-          <listitem>
-            <para>
-              Recommended for text-mode: 233 MHz G3 or better, 128MiB
-              RAM.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Recommended for graphical: 400 MHz G3 or better, 256MiB
-              RAM.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section id="sn-ArchSpecific-ppc-hw-hdd">
-        <title>Hard disk space</title>
-	<para>
-	  The complete packages can occupy over 9 GB of disk space.
-	  Final size is entirely determined by the installing spin and
-	  the packages selected during installation. Additional disk
-	  space is required during installation to support the
-	  installation environment. This additional disk space
-	  corresponds to the size of
-	  <filename>/Fedora/base/stage2.img</filename> (on Installation
-	  Disc 1) plus the size of the files in <filename
-	    class="directory">/var/lib/rpm</filename> on the installed
-	  system.
-	</para>
-	<para>
-	  In practical terms, additional space requirements may range
-	  from as little as 90 MiB for a minimal installation to as much
-	  as an additional 175 MiB for a larger installation.
-	</para>
-	<para>
-	  Additional space is also required for any user data, and at
-	  least 5% free space should be maintained for proper system
-	  operation.
-	</para>
-      </section>
-    </section>
-
-    <section id="sn-ArchSpecific-ppc-pages">
-      <title>4 KiB Pages on 64-bit machines</title>
-
-      <para>
-        After a brief experiment with 64KiB pages in Fedora Core 6, the
-        PowerPC64 kernel has now been switched back to 4KiB pages. The
-        installer should reformat any swap partitions automatically
-        during an upgrade.
-      </para>
-    </section>
-
-    <section id="sn-ArchSpecific-ppc-keyb">
-      <title>The Apple keyboard</title>
-
-      <para>
-        The <keycap>Option</keycap> key on Apple systems is equivalent
-        to the <keycap>Alt</keycap> key on the PC. Where documentation
-        and the installer refer to the <keycap>Alt</keycap> key, use the
-        <keycap>Option</keycap> key. For some key combinations you may
-        need to use the <keycap>Option</keycap> key in conjunction with
-        the <keycap>Fn</keycap> key, such as
-        <keycombo><keycap>Option</keycap><keycap>Fn</keycap><keycap>F3</keycap>
-        </keycombo>
-        to switch to virtual terminal tty3.
-      </para>
-    </section>
-
-    <section id="sn-ArchSpecific-ppc-install">
-      <title>PPC installation notes</title>
-
-      <para>
-        Fedora Installation Disc 1 is bootable on supported hardware. In
-        addition, a bootable CD image appears in the
-        <filename
-	  class="directory">images/</filename> directory of
-        this disc. These images behave differently according to your
-        system hardware:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            On most machines, the bootloader automatically boots the
-            appropriate 32-bit or 64-bit installer from the install
-            disc.
-          </para>
-        </listitem>
-        <listitem>
-          <formalpara>
-            <title>64-bit IBM pSeries (POWER4/POWER5), current iSeries models</title>
-            <para>
-              After using OpenFirmware to boot the CD, the bootloader,
-              <command>yaboot</command>, automatically boots the 64-bit
-              installer.
-            </para>
-          </formalpara>
-        </listitem>
-        <listitem>
-          <formalpara>
-            <title>IBM "Legacy" iSeries (POWER4)</title>
-            <para>
-              So-called "Legacy" iSeries models, which do not use
-              OpenFirmware, require use of the boot image located in the
-              <filename class="directory">images/iSeries</filename>
-              directory of the installation tree.
-            </para>
-          </formalpara>
-        </listitem>
-        <listitem>
-          <formalpara>
-            <title>32-bit CHRP (IBM RS/6000 and others)</title>
-            <para>
-              After using OpenFirmware to boot the CD, select the
-              <filename>linux32</filename> boot image at the
-              <prompt>boot:</prompt>
-              prompt to start the 32-bit installer. Otherwise, the
-              64-bit installer starts and fails.
-            </para>
-          </formalpara>
-        </listitem>
-        <listitem>
-          <formalpara>
-	<title>Genesi Pegasos II / Efika 5200B</title>
-            <para>
-	      The Fedora kernel supports both Pegasos and Efika without
-	      the need to use the "Device Tree Supplement" from
-	      powerdeveloper.org. However, the lack of full support for
-	      ISO9660 in the firmware means that booting via yaboot from
-	      the CD is not possible. Boot the 'netboot' image instead,
-	      either from the CD or over the network. Because of the
-	      size of the image, you must set the
-	      firmware's <option>load-base</option> variable to load
-	      files at a high address such as 32MiB instead of the
-	      default 4MiB:
-            </para>
-          </formalpara>
-	  <screen><![CDATA[setenv load-base 0x2000000]]></screen>
-	  <para>
-		  At the OpenFirmware prompt, enter the following command to boot the Efika update, if necessary, or the netboot image from the CD:
-	  </para>
-	  <screen><![CDATA[boot cd: /images/netboot/ppc32.img]]></screen>
-	  <para>
-	    Or from the network:
-	  </para>
-	  <screen><![CDATA[boot eth ppc32.img]]></screen>
-	  <para>
-	    You must also manually configure OpenFirmware to make the
-	    installed Fedora system bootable. To do this, set
-	    the <option>boot-device</option>
-	    and <option>boot-file</option> environment variables
-	    appropriately, to load yaboot from
-	    the <filename>/boot</filename> partition. For example, a
-	    default installation might require the following:
-	  </para>
-<screen><![CDATA[
-setenv boot-device hd:0 
-setenv boot-file /yaboot/yaboot
-setenv auto-boot? true]]>
-</screen>
-        </listitem>
-	<listitem>
-	  <formalpara>
-	    <title>PA Semi Electra</title>
-	    <para>
-	      The Electra firmware does not yet support yaboot; to
-	      install on Electra, you can boot
-	      the <filename>ppc64.img</filename> netboot image. After
-	      the installation, you will need to manually configure the
-	      firmware to load the installed kernel and initrd from
-	      the <filename>/boot</filename> partition. Refer to the
-	      firmware documentation for further details.
-	    </para>
-	  </formalpara>
-	</listitem>
-        <listitem>
-          <formalpara>
-            <title>Sony PlayStation 3</title>
-            <para>
-              For installation on PlayStation 3, first update to
-              firmware 1.60 or later. The "Other OS" boot loader must be
-              installed into the flash, following the instructions at
-              <ulink
-		url='http://www.playstation.com/ps3-openplatform/manual.html' 
-		/>.
-              A suitable boot loader image can be found on Sony's
-              "ADDON" CD, available from
-              <ulink
-		url='ftp://ftp.kernel.org/pub/linux/kernel/people/geoff/cell/' 
-		/>.
-            </para>
-          </formalpara>
-          <para>
-            Once the boot loader is installed, the PlayStation 3 should
-            be able to boot from the Fedora install media. Please note
-            that network installation works best with NFS, since that
-            takes less memory than FTP or HTTP methods. Using
-            the <command>text</command> option also reduces the amount
-            of memory taken by the installer.
-          </para>
-          <para>
-            For more information on Fedora and the PlayStation3 or
-            Fedora on PowerPC in general, join the
-            <ulink
-	      url="http://lists.infradead.org/mailman/listinfo/fedora-ppc">Fedora-PPC
-            mailing list</ulink> or the
-            <systemitem
-	      class="resource">#fedora-ppc</systemitem>
-            channel on
-            <ulink url="http://freenode.net/">FreeNode</ulink>.
-          </para>
-        </listitem>
-        <listitem>
-          <formalpara>
-            <title>Network booting</title>
-            <para>
-              Combined images containing the installer kernel and
-              ramdisk are located in the
-              <filename
-		class="directory">images/netboot/</filename>
-              directory of the installation tree. They are intended for
-              network booting with TFTP, but can be used in many ways.
-            </para>
-          </formalpara>
-          <para>
-            The <command>yaboot</command> loader supports TFTP booting
-            for IBM pSeries and Apple Macintosh. The Fedora Project
-            encourages the use of <command>yaboot</command> over the
-            <command>netboot</command> images.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="sn-PPCSpecificPackages">
-      <title>PPC Specific Packages</title>
-
-      <para>
-        The <package>ppc64-utils</package> package has been split out
-        into individual packages reflecting upstream packaging
-        (<package>ps3pf-utils</package>,
-        <package>powerpc-utils</package>,
-        <package>powerpc-utils-papr</package>). Although the
-        <command>mkzimage</command> command is no longer supplied, you
-        can use the <command>wrapper</command> script from the
-        <package>kernel-bootwrapper</package> package:
-      </para>
-<screen><![CDATA[wrapper -i initrd-${KERN_VERSION}.img -o zImage-${KERN_VERSION}.img vmlinuz-${KERN_VERSION} ]]></screen>
-    </section>
-  </section>
-
-  <section id="sn-ArchSpecific-x86">
-    <title>x86 Specifics for Fedora</title>
-
-    <para>
-      This section covers specific information about Fedora and the x86
-      hardware platform.
-    </para>
-
-    <section id="sn-ArchSpecific-x86-hw">
-      <title>Hardware requirements for x86</title>
-
-      <para>
-        In order to use specific features of Fedora 9 during or after
-        installation, you may need to know details of other hardware
-        components such as video and network cards.
-      </para>
-
-      <section id="sn-ArchSpecific-x86-hw-cpu">
-        <title>Processor and memory</title>
-
-        <para>
-          The following CPU specifications are stated in terms of Intel
-          processors. Other processors, such as those from AMD, Cyrix,
-          and VIA that are compatible with and equivalent to the
-          following Intel processors, may also be used with Fedora.
-        </para>
-
-        <para>
-          Fedora 9 requires an Intel Pentium or better processor, and is
-          optimized for Pentium 4 and later processors.
-        </para>
-
-        <itemizedlist>
-          <listitem>
-            <para>
-              Recommended for text-mode: 200 MHz Pentium-class or better.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Recommended for graphical: 400 MHz Pentium II or better.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Minimum RAM for text-mode: 128MiB.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Minimum RAM for graphical: 192MiB.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Recommended RAM for graphical: 256MiB.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section id="sn-ArchSpecific-x86-hw-hdd">
-        <title>Hard disk space</title>
-	<para>
-	  The complete packages can occupy over 9 GB of disk space.
-	  Final size is entirely determined by the installing spin and
-	  the packages selected during installation. Additional disk
-	  space is required during installation to support the
-	  installation environment. This additional disk space
-	  corresponds to the size of
-	  <filename>/Fedora/base/stage2.img</filename> (on Installation
-	  Disc 1) plus the size of the files in <filename
-	    class="directory">/var/lib/rpm</filename> on the installed
-	  system.
-	</para>
-	<para>
-	  In practical terms, additional space requirements may range
-	  from as little as 90 MiB for a minimal installation to as much
-	  as an additional 175 MiB for a larger installation.
-	</para>
-	<para>
-	  Additional space is also required for any user data, and at
-	  least 5% free space should be maintained for proper system
-	  operation.
-	</para>
-      </section>
-    </section>
-  </section>
-
-  <section id="sn-ArchSpecific-x64">
-    <title>x86_64 Specifics for Fedora</title>
-
-    <para>
-      This section covers specific information about Fedora and the
-      x86_64 hardware platform.
-    </para>
-
-    <section id="sn-ArchSpecific-x64-hw">
-      <title>Hardware requirements for x86_64</title>
-
-      <para>
-        In order to use specific features of Fedora 9 during or after
-        installation, you may need to know details of other hardware
-        components such as video and network cards.
-      </para>
-
-      <section id="sn-ArchSpecific-x64-hw-mem">
-        <title>Memory requirements for x86_64</title>
-
-
-
-        <itemizedlist>
-          <listitem>
-            <para>
-              Minimum RAM for text-mode: 256MiB.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Minimum RAM for graphical: 384MiB.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Recommended RAM for graphical: 512MiB.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section id="sn-ArchSpecific-x64-hw-hdd">
-        <title>Hard disk space requirements for x86_64</title>
-	<para>
-	  The complete packages can occupy over 9 GB of disk space.
-	  Final size is entirely determined by the installing spin and
-	  the packages selected during installation. Additional disk
-	  space is required during installation to support the
-	  installation environment. This additional disk space
-	  corresponds to the size of
-	  <filename>/Fedora/base/stage2.img</filename> (on Installation
-	  Disc 1) plus the size of the files in <filename
-	    class="directory">/var/lib/rpm</filename> on the installed
-	  system.
-	</para>
-	<para>
-	  In practical terms, additional space requirements may range
-	  from as little as 90 MiB for a minimal installation to as much
-	  as an additional 175 MiB for a larger installation.
-	</para>
-	<para>
-	  Additional space is also required for any user data, and at
-	  least 5% free space should be maintained for proper system
-	  operation.
-	</para>
-      </section>
-    </section>
-  </section>
-</section>
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/BackwardsCompatibility.xml b/en-US/BackwardsCompatibility.xml
deleted file mode 100644
index a2103cb..0000000
--- a/en-US/BackwardsCompatibility.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-BackwardsCompatibility">
-  <title>Backwards Compatibility</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    Fedora provides legacy system libraries for compatibility with older
-    software. This software is part of the <guilabel>Legacy Software
-    Development</guilabel> group, which is not installed by default.
-    Users who require this functionality may select this group either
-    during installation or after the installation process is complete.
-    To install the package group on a Fedora system, use <menuchoice>
-    <guimenu>Applications</guimenu> <guimenuitem>Add/Remove
-    Software</guimenuitem></menuchoice> or enter the following command
-    in a terminal window:
-  </para>
-<screen><![CDATA[su -c "yum groupinstall 'Legacy Software Development'"]]></screen>
-  <para>
-    Enter the password for the
-    <systemitem
-      class="username">root</systemitem> account when
-    prompted.
-  </para>
-
-  <section id="sn-compiler-compatibility">
-    <title>Compiler Compatibility</title>
-
-    <para>
-      The <package>compat-gcc-34</package> package has been included for
-      compatibility reasons:
-    </para>
-
-    <para>
-      <ulink
-	url='https://www.redhat.com/archives/fedora-devel-list/2006-August/msg00409.html'/>
-    </para>
-  </section>
-
-  <section id="sn-KDE3-Development-Platform-Librates">
-    <title>KDE 3 Development Platform / Libraries</title>
-
-    <para>
-      Fedora now features KDE 4.0, and no longer offers KDE 3 as a full
-      desktop environment. Fedora does provide the following KDE 3.5
-      library packages to run and build the many existing KDE 3
-      applications:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <package>qt3</package> , <package>qt3-devel</package> (and
-          other <package>qt3-*</package> packages): Qt 3.3.8b
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <package>kdelibs3</package> ,
-          <package>kdelibs3-devel</package> : KDE 3 libraries
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <package>kdebase3</package> ,
-          <package>kdebase3-devel</package> : KDE 3 core files required
-          by some applications
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      In addition, Fedora offers a <package>kdegames3</package> package
-      that includes games not ported to KDE 4 yet, and a KDE 3 version
-      of <package>libkdegames</package> required by some third-party KDE
-      3 games.
-    </para>
-
-    <para>
-      Moreover, the KDE 4 <package>kdebase-runtime</package> package,
-      which provides <package>khelpcenter</package> , also sets up
-      <package>khelpcenter</package> as a service for KDE 3
-      applications, so help in KDE 3 applications works. The KDE 3
-      version of <package>khelpcenter</package> is no longer provided,
-      and the KDE 4 version is used instead.
-    </para>
-
-    <para>
-      These packages are designed to:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          comply with the Filesystem Hierarchy Standard (FHS), and
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          be completely safe to install in parallel with KDE 4,
-          including the <package>-devel</package> packages.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      In order to achieve this goal, Fedora KDE SIG members have made
-      two changes to the KDE 4 <package>kdelibs-devel</package>
-      packages:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          The library symlinks are installed to
-          <filename>/usr/lib/kde4/devel</filename> or
-          <filename>/usr/lib64/kde4/devel</filename> depending on system
-          architecture.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <command>kconfig_compiler</command> and
-          <command>makekdewidgets</command> tools have been renamed
-          <command>kconfig_compiler4</command> and
-          <command>makekdewidgets4</command> , respectively.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      These changes should be completely transparent to the vast
-      majority of KDE 4 applications that use <command>cmake</command>
-      to build, since <filename>FindKDE4Internal.cmake</filename> has
-      been patched to match these changes. The KDE SIG made these
-      changes to the KDE 4 <package>kdelibs-devel</package> rather than
-      to <package>kdelibs3-devel</package> because KDE 4 stores these
-      locations in a central place, whereas KDE 3 applications usually
-      contain hardcoded copies of the library search paths and
-      executable names.
-    </para>
-
-    <para>
-      Note that <package>kdebase3</package> does
-      <emphasis role="strong">not</emphasis> include the following:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          A complete KDE 3 desktop (workspace) which could be used
-          instead of KDE 4; in particular, KDE 3 versions of KWin,
-          KDesktop, Kicker, KSplash and KControl are
-          <emphasis role="strong">not</emphasis> included.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The KDE 3 versions of <package>kdebase</package> applications
-          such as Konqueror and KWrite, which are redundant with the KDE
-          4 versions and would conflict with them.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <package>libkdecorations</package> library required for
-          KWin 3 window decorations, as those window decorations cannot
-          be used in the KDE 4 version of KWin.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <package>libkickermain</package> library required by some
-          Kicker applets, as there is no Kicker in Fedora 9 and thus
-          Kicker applets cannot be used.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <important>
-      <title>Developing against the legacy API is discouraged</title>
-
-      <para>
-        As with any backwards-compatibility library, developing new
-        software against the legacy API is discouraged.
-      </para>
-    </important>
-  </section>
-</section>
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/DatabaseServers.xml b/en-US/DatabaseServers.xml
deleted file mode 100644
index 519d8aa..0000000
--- a/en-US/DatabaseServers.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-DatabaseServers">
-  <title>Database Servers</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <section id="sn-MySQL">
-    <title>MySQL</title>
-
-    <para>
-      Fedora now provides MySQL 5.0.51.a. For a list of the enhancements
-      provided by this version, refer to
-      <ulink url='http://dev.mysql.com/doc/refman/5.0/en/mysql-nutshell.html'/>.
-    </para>
-
-    <para>
-      For more information on upgrading databases from previous releases
-      of MySQL, refer to the MySQL website at
-      <ulink
-	url='http://dev.mysql.com/doc/refman/5.0/en/upgrade.html'/>.
-    </para>
-
-    <section id="sn-MySQL-DBD">
-      <title>DBD Driver</title>
-
-      <para>
-        The MySQL DBD driver has been dual-licensed and the related
-        licensing issues have been resolved
-        (<ulink
-	  url='https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=222237'/>).
-        The resulting <package>apr-util-mysql</package> package is now
-        included in the Fedora software repositories.
-      </para>
-    </section>
-  </section>
-
-  <section id="sn-PostgreSQL">
-    <title>PostgreSQL</title>
-
-    <para>
-      This release of Fedora includes PostgreSQL 8.3.0. For more
-      information on this new version, refer to
-      <ulink url='http://www.postgresql.org/docs/8.3/static/release-8-3.html'/>.
-    </para>
-
-    <important>
-      <title>Upgrading Databases</title>
-
-      <para>
-        Before upgrading an existing Fedora system with a PostgreSQL
-        database, check and then follow, if necessary, the procedure
-        described at
-        <ulink url='http://www.postgresql.org/docs/8.3/interactive/install-upgrading.html'/>.
-        Otherwise the data may be not accessible by the new version of
-        PostgreSQL.
-      </para>
-    </important>
-  </section>
-</section>
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/Database_Servers.xml b/en-US/Database_Servers.xml
deleted file mode 100644
index 9e07bc4..0000000
--- a/en-US/Database_Servers.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/DatabaseServers</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/DatabaseServers</title>
-      <section id="">
-        <title>Database Servers </title>
-        <para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/f/fd/Warning_%28medium_size%29.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis>You must do your own research on upgrading database packages.</emphasis>
-              <literallayout>
-</literallayout>Consult the release notes for the version of database you are upgrading to.  There may be actions you need to do for the upgrade to be successful.</para>
-          </para>
-        </para><para>
-          <para>
-            <para>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata contentwidth="35px" fileref="http://fedoraproject.org/w/uploads/a/a4/Idea.png" scalefit="1" width="35px" />
-                </imageobject><caption>
-                  <para />
-                </caption>
-              </inlinemediaobject>
-            </para><para>
-              <emphasis>Maybe you know what should be on this page?</emphasis>
-              <literallayout>
-</literallayout>The Fedora release notes are a collective effort of dozens of people.  You can contribute by editing the wiki page that corresponds to this part of the release notes.</para>
-          </para>
-        </para><para>This section has not been updated for Fedora 10 by the beat writer (<ulink url="http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).">http://fedoraproject.org/wiki/Docs/Beats#Beat_Assignments).</ulink>  If you have some ideas or knowledge of what should be in this part of the release notes, you are encouraged to edit the wiki directly.  Read <ulink url="https://fedoraproject.org/wiki/Docs/Beats/HowTo">https://fedoraproject.org/wiki/Docs/Beats/HowTo</ulink> for more information, then get an account and start writing.</para>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Desktop.xml b/en-US/Desktop.xml
deleted file mode 100644
index 1e5d494..0000000
--- a/en-US/Desktop.xml
+++ /dev/null
@@ -1,730 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Desktop">
-  <title>Fedora Desktop</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    This section details changes that affect Fedora graphical desktop
-    users.
-  </para>
-
-  <section id="sn-GNOME">
-    <title>GNOME</title>
-
-    <para>
-      This release features
-      <ulink url="http://www.gnome.org/start/2.22/">GNOME</ulink> 2.22.
-    </para>
-
-    <para>
-      The GNOME splash screen has been disabled upstream intentionally.
-      To enable it, use <command>gconf-editor</command> or the following
-      command:
-    </para>
-<screen><![CDATA[gconftool-2 --set /apps/gnome-session/options/show_splash_screen --type bool true 
-]]></screen>
-    <para>
-      The lock screen dialog theme is not connected to the selected
-      screensaver in this release. To enable it, use
-      <command>gconf-editor</command> or the following command:
-    </para>
-<screen><![CDATA[gconftool-2 --set  --type string /apps/gnome-screensaver/lock_dialog_theme  "system"  
-]]></screen>
-	<para>
-		Blinking cursors are enabled by default in this release, and are centrally managed via a gconf setting. To turn it off, run the following command:
-	</para>
-<screen><![CDATA[gconftool-2 --type bool --set /desktop/gnome/interface/cursor_blink false]]></screen>
-    <section id="sn-Gvfs">
-      <title>Gvfs</title>
-
-      <para>
-        GNOME 2.22 features the new Gvfs, a userspace virtual
-        file-system with back-ends for sftp, ftp, dav, smb, obexftp, and
-        others. The Gvfs system is the replacement/successor of
-        <systemitem class="service">gnome-vfs</systemitem>.
-      </para>
-
-      <para>
-        Gvfs consists of two parts:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            GIO, which is a new shared library that is part of GLib and
-            provides the API for
-            <systemitem
-	      class="service">gvfs</systemitem>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Gvfs itself, a package that contains back-ends for the
-            various file system types and protocols
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        The Gvfs system runs a single master daemon,
-        <systemitem
-	  class="daemon">gvfsd</systemitem>, that keeps
-        track of the current
-        <systemitem class="service">gvfs</systemitem> mounts. Most
-        mounts are run in a separate daemon process. Clients talk to the
-        mounts with a combination of DBus calls (on the session bus and
-        using peer-to-peer DBus) and a custom protocol for file
-        contents.
-      </para>
-
-      <para>
-        A few file-system types previously supported by
-        <systemitem
-	  class="service">gnome-vfs</systemitem> may not be
-        yet supported by <systemitem class="service">gvfs</systemitem>.
-        Work continues to provide completed solutions for all these
-        types.
-      </para>
-    </section>
-
-    <section id="sn-GNOMEDisplayManager">
-      <title>GNOME Display Manager</title>
-
-      <para>
-        The GNOME Display Manager
-        (<systemitem
-	  class="service">gdm</systemitem>) has been
-	updated to the latest upstream code, which is a complete rewrite driven by Fedora developers.
-	</para>
-	<para>
-        <ulink url="/wiki/PolicyKit">PolicyKit</ulink> can be used to control shutdown and reboot. The configuration tool <command>gdmsetup</command> is currently missing, and is set to be replaced. For configuration changes, refer to the following:
-	</para>
-	<para>
-		<ulink url="http://live.gnome.org/GDM/2.22/Configuration" />
-	</para>
-	<para>
-		New features available on the login screen include:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            power management and monitoring on the login screen, so the
-            laptop hibernates or shuts down when the battery gets low
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            smarter user list
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-		  common default background between the login window and the desktop session, with no intermediate flicker
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        For more information on this feature:
-      </para>
-
-      <para>
-        <ulink url="http://fedoraproject.org/wiki/Features/NewGdm">http://fedoraproject.org/wiki/Features/NewGdm</ulink>
-      </para>
-      <para>
-	      Other notes:
-      </para>
-      <itemizedlist>
-	      <listitem>
-		      <para>
-			      <filename>~/.Xclients</filename> and <filename>~/.xsession</filename> are no longer read automatically at login time. If you use either of these files, install the <package>xorg-x11-xinit-session</package> package.
-		      </para>
-	      </listitem>
-	      <listitem>
-			<para>
-				Due to a bug introduced at the end of the development cycle (<ulink url="https://bugzilla.redhat.com/show_bug.cgi?id=445631">bug 445631</ulink>), users will be unable to select their language the first time the login screen appears. Users should log in once, and then logout again to get language selection. Unfortunately, this bug also effects the LiveCD.
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-				The shipped version of GDM does not support old style theme formats, and is considerably plainer than the version shipped in Fedora 8. A priority for Fedora 10 will be greeter aesthetics.
-			</para>
-		</listitem>
-	</itemizedlist>
-    </section>
-  </section>
-
-  <section id="sn-KDE">
-    <title>KDE</title>
-
-    <para>
-      This release features
-      <ulink url="http://kde.org/announcements/announce-4.0.3.php">KDE</ulink>
-      4.0.3. As the <package>kdepim</package> and
-      <package>kdevelop</package> packages are not part of KDE 4.0 and
-      <package>kdewebdev</package> is only partially available (no
-      <application>Quanta</application>) in KDE 4.0, the KDE 3.5.9
-      versions of those packages are shipped.
-    </para>
-
-    <para>
-      <ulink url="http://www.kde.org/announcements/4.0/">KDE 4.0</ulink>
-      features upgrades to core components such as the port to Qt 4. It
-      also introduces a number of brand new frameworks such as the
-      <application>Phonon</application>, a multimedia API;
-      <application>Solid</application>, a hardware integration
-      framework; <application>Plasma</application>, a re-written desktop
-      and panel with many new concepts; integrated desktop search;
-      compositing as a feature of <application>KWin</application>; and a
-      brand new visual style called Oxygen.
-      <ulink url="http://kde.org/announcements/announce-4.0.3.php">KDE
-      4.0.3</ulink> is a bugfix release from the KDE 4.0 release series.
-    </para>
-
-    <para>
-      Fedora 9 does <application role="strong">not</application> include
-      the legacy KDE 3 Desktop. It does include a compatibility KDE 3
-      Development Platform, which can be used to build and run KDE 3
-      applications within KDE 4 or any other desktop environment. Refer
-      to the <application>Backwards Compatibility</application> section
-      for more details about what is included.
-    </para>
-
-    <para>
-      Since <systemitem class="service">networkmanager</systemitem> does
-      not work with the version of
-      <application>NetworkManager</application> available in this
-      release, the KDE Live images use
-      <systemitem
-	class="service">nm-applet</systemitem> from
-      <package>NetworkManager-gnome</package> as a replacement. The
-      <systemitem class="daemon">gnome-keyring-daemon</systemitem>
-      facility saves passwords for these encryption technologies. (The
-      dummy <package>knetworkmanager</package> package from Fedora 8
-      that only called
-      <systemitem
-	class="service">nm-applet</systemitem> is no longer
-      used.)
-    </para>
-
-    <para>
-      As the native <application>KWin</application> window manager now
-      optionally supports compositing and desktop effects, the KDE Live
-      images no longer include <application>Compiz/Beryl</application>.
-      The <application>KWin</application> compositing/effects mode is
-      disabled by default, but can be enabled in
-      <command>systemsettings</command>. <application>Compiz</application> (with KDE 4 integration) is available from the repository by installing the <package>compiz-kde</package> package.
-    </para>
-
-    <section id="sn-WorkspaceChanges">
-      <title>Workspace Changes</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            <application>Plasma</application> replaces the old
-            <application>Kicker</application> and
-            <application>KDesktop</application>.
-            <application>Plasma</application> manages both the panel and
-            the desktop, and it is now possible to place the same
-            <application>Plasma</application> applets
-            (<application>plasmoids</application>) on both the panel and
-            the desktop if the applet supports the size restrictions
-            imposed by the panel.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The old KDE Control Center
-            (<application>KControl</application>) has been replaced by
-            <application>System Settings</application>
-            (<command>systemsettings</command>).
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <application>KDM</application> login manager uses a new
-            theme format. Therefore, <application>KDM</application>
-            themes written for KDE 3 do not work with the
-            <application>KDM</application> in KDE 4.
-            <application>KDM</application> now includes support for
-            theme configuration, thus the external
-            <command>kdmtheme</command> tool is no longer needed.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        All the above applications can be found in the
-        <package>kdebase-workspace</package> package.
-      </para>
-    </section>
-
-    <section id="sn-PackageandApplicationChanges">
-      <title>Package and Application Changes</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            The packages <package>qt</package> ,
-            <package>kdelibs</package> , and <package>kdebase</package>
-            now represent the KDE 4 version, obsoleting the
-            <package>qt4</package> , <package>kdelibs4</package> , and
-            <package>kdebase4</package> packages in previous releases of
-            Fedora.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The Qt/KDE 3 versions have been renamed
-            <package>qt3</package> , <package>kdelibs3</package> , and
-            <package>kdebase3</package> . Fedora 9 only includes parts
-            of <package>kdebase3</package> . Refer to the
-            <application>Backwards Compatibility</application> section
-            for details.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Upstream KDE has split the <package>kdebase</package> module
-            into three modules: <package>kdebase-runtime</package> ,
-            <package>kdebase</package> (sometimes called
-            <package>kdebase-apps</package> to distinguish it from the
-            old monolithic <package>kdebase</package> ), and
-            <package>kdebase-workspace</package> . This split is
-            reflected in the Fedora packages.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Fedora 9 adds a <package>kdegames3</package> package
-            containing the games not yet ported to KDE 4.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <application>Dolphin</application>, which is part of
-            <package>kdebase</package> , replaces
-            <package>d3lphin</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <package>kdebase-workspace</package> package now
-            includes support for <application>KDM</application> theme
-            configuration, and therefore obsoletes
-            <package>kdmtheme</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <application>Okular</application> replaces
-            <application>KPDF</application>,
-            <application>KGhostView</application>, and
-            <application>KFax</application> in
-            <package>kdegraphics</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The package <package>kaider</package> replaces
-            <application>KBabel</application>, which used to be part of
-            <package>kdesdk</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <package>okteta</package> package replaces
-            <application>KHexEdit</application>, which used to be part
-            of <package>kdeutils</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The packages <package>kalgebra</package> and
-            <package>marble</package> are now part of
-            <package>kdeedu</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <package>ksudoku</package> package is now part of
-            <package>kdegames</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The package <package>gwenview</package> is now part of
-            <package>kdegraphics</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <package>kiconedit</package> and
-            <package>kcoloredit</package> packages, which used to be
-            part of <package>kdegraphics</package> , are now separate
-            packages.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The package <package>kmid</package> , which used to be part
-            of <package>kdemultimedia</package> , is now a separate
-            package.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The Fedora KDE team has decided to drop the
-            <package>-extras</package> sub-packages, which contained
-            deprecated or unstable applications, because those
-            applications have been either fixed or dropped in KDE 4.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The package <package>kdeadmin-kpackage</package> has been
-            split out of <package>kdeadmin</package> because
-            <application>KPackage</application> now depends on
-            <package>smart</package> .
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            KDE 4 dropped the <package>kdeaddons</package> module.
-            Therefore, there is no <package>kdeaddons</package> package
-            in Fedora 9. The <application>Atlantik
-            Designer</application>, for use with
-            <package>kdegames3</package> , is still available as
-            <package>kdeaddons-atlantikdesigner</package>. The
-	    <package>ksig</package> application and
-	    the <package>konq-plugins</package> Konqueror plugins are
-	    now their own packages,
-	    and <package>extragear-plasma</package> replaces the Kicker
-	    addons.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-  
-  <section id="notes-packagekit">
-	  <title>PackageKit</title>
-	  <para>
-		  PackageKit is the new, default distribution-neutral package management framework and frontend. Refer to <ulink url="http://fedoraproject.org/wiki/PackageKit" /> for further details.
-	  </para>
-  </section>
-
-  <section id="sn-bluetooth">
-    <title>Bluetooth</title>
-
-    <para>
-      The Bluetooth feature in Fedora 9
-      (<ulink url="http://fedoraproject.org/wiki/Features/BluetoothFedora9">http://fedoraproject.org/wiki/Features/BluetoothFedora9</ulink>)
-      has several enhancements specific to this release. The future
-      generations of this feature are covered with greater detail at:
-    </para>
-
-    <para>
-      <ulink url="http://fedoraproject.org/wiki/Releases/FeatureBluetooth">http://fedoraproject.org/wiki/Releases/FeatureBluetooth</ulink>
-    </para>
-
-    <para>
-      File sending to a Bluetooth device is now handled with the
-      <command>bluetooth-sendto</command> program from the
-      <package>bluez-gnome</package> package, which replaces
-      <command>gnome-obex-sen</command>. Send a file in
-      <application>Nautilus</application> from the <guimenuitem>Send
-      to...</guimenuitem> function in the right-click context menu.
-    </para>
-
-    <para>
-      Pulling files from a Bluetooth device is now included in
-      <package>gnome-user-share</package> , which has ObexFTP and
-      <ulink
-      url="/wiki/ObexPush">ObexPush</ulink> support
-      built-in. Share files via
-      <guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Internet
-      and Network</guisubmenu><guisubmenu>Personal File
-      Sharing</guisubmenu><guimenuitem>Share Public files over
-      Bluetooth</guimenuitem> (ObexFTP support), or pull files using
-      <ulink url="/wiki/ObexPush">ObexPush</ulink> with
-      <guimenu>Personal</guimenu><guisubmenu>File
-      Sharing</guisubmenu><guimenuitem>Receive files in Downloads folder
-      over Bluetooth</guimenuitem>.
-    </para>
-
-    <para>
-      Files on the remote Bluetooth device can be viewed directly in
-      <application>Nautilus</application> through GVFS, which supports
-      Bluetooth devices. Synchronizing a Bluetooth device with a
-      personal information manager (PIM) device is done using
-      <command>gnome-pilot</command>
-    </para>
-
-    <para>
-      Browsing of Bluetooth devices is done via the right-click context
-      menu from the Bluetooth icon on the desktop panel.
-    </para>
-  </section>
-
-  <section id="sn-XULRunner">
-    <title>XULRunner</title>
-
-    <para>
-      Applications that require the <application>Gecko</application>
-      engine have had to depend on the entirety of
-      <application>Firefox</application>.
-      <application>XULRunner</application> is the Mozilla effort to
-      split the browser engine for applications that require only that
-      functionality, and no user interface parts. This split provides
-      more API/ABI stability and a cleaner build environment for
-      applications using <application>Gecko</application>. Many of the
-      applications in Fedora that previously used
-      <application>Gecko</application> now are built against
-      <application>XULRunner</application>.
-    </para>
-
-    <para>
-      For a current status, visit
-      <ulink url="http://fedoraproject.org/wiki/Features/XULRunner">http://fedoraproject.org/wiki/Features/XULRunner</ulink>.
-      To help with development, visit
-      <ulink url="http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges">http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges</ulink>.
-    </para>
-
-    <para>
-      For full upstream documentation, refer to
-      <ulink url="http://developer.mozilla.org/en/docs/XULRunner">http://developer.mozilla.org/en/docs/XULRunner</ulink>.
-    </para>
-  </section>
-
-  <section id="sn-Web-Browsers">
-    <title>Web Browsers</title>
-
-    <para>
-      This release of Fedora includes version 3.0 (beta 5) of the popular
-      <application>Firefox</application> web browser. Refer to
-      <ulink
-      url="http://firefox.com/">http://firefox.com/</ulink>
-      for more information about Firefox. The
-      <package>nspluginwrapper</package> package is included by default
-      even on 32-bit systems since it separates the plug-ins to run in
-      their own address space, which increases security and reliability
-      of the browser.
-    </para>
-
-    <para>
-      For information about <application>Firefox</application> in Fedora, refer to this feature page:
-    </para>
-
-    <para>
-      <ulink url="http://fedoraproject.org/wiki/Features/Firefox3">http://fedoraproject.org/wiki/Features/Firefox3</ulink>
-    </para>
-    
-    <section id="NSpluginwrapper">
-	    <title>NSpluginwrapper</title>
-	    <para>
-		    <package>nspluginwrapper</package> is now installed by default, which makes web browser plug-ins run in a separate memory address. This increases browser stability, as plug-in crashes will not affect the web browser itself. As well, this increases security, as Fedora 9 has optional SELinux policies to sandbox plug-ins, to decrease the impact of security issues.
-	    </para>
-    </section>
-
-    <section id="sn-Enabling-Flash-Plugin">
-      <title>Enabling Flash Plugin</title>
-
-      <para>
-        Fedora includes <package>swfdec</package> and
-        <package>gnash</package>, which are free and open source
-        implementations of Flash. We encourage you to try either of them
-	before seeking out Adobe's proprietary Flash Player plug-in software. The Adobe Flash Player plug-in uses a legacy sound framework that does not work correctly without additional support. Run the following command to enable this support:
-      </para>
-<screen>
-su -c "yum install libflashsupport"
-</screen>
-	<para>
-		Users of Fedora x86_64 must install the <package>nspluginwrapper.i386</package> package to enable
-		the 32-bit Adobe Flash Player plug-in in Firefox, and the <package>libflashsupport.i386</package>
-		package to enable sound from the plug-in.
-      </para>
-      <procedure>
-        <step>
-          <para>
-            Create the 32bit mozilla plugin directory:
-          </para>
-<screen><![CDATA[su -c "mkdir -p /usr/lib/mozilla/plugins" 
-]]></screen>
-        </step>
-        <step>
-          <para>
-            Install the <package>nspluginwrapper.i386</package> ,
-            <package>nspluginwrapper.x86_64</package> , and
-	    <package>libflashsupport.i386</package> packages:
-          </para>
-	  <screen><![CDATA[su -c "yum install nspluginwrapper.{i386,x86_64} libflashsupport.i386" 
-]]></screen>
-        </step>
-        <step>
-          <para>
-            Install <package>flash-plugin</package> as shown above.
-          </para>
-          <para>
-            Run <command>mozilla-plugin-config</command> to register the
-            flash plugin:
-          </para>
-<screen><![CDATA[su -c "mozilla-plugin-config -i -g -v" 
-]]></screen>
-        </step>
-        <step>
-          <para>
-            Close all <application>Firefox</application> windows, and
-            then relaunch <application>Firefox</application>.
-          </para>
-          <para>
-            Type <userinput>about:plugins</userinput> in the URL bar to
-            ensure the plugin is loaded.
-          </para>
-        </step>
-      </procedure>
-    </section>
-  </section>
-  
-  <section id="sn-mail-clients">
-	  <title>Mail Clients</title>
-	  <para>
-		  The <package>mail-notification</package> package has been split. The <application>Evolution</application> plug-in is now in a separate package, <package>mail-notification-evolution-plugin</package>. When the <package>mail-notification</package> package is updated, this plug-in is added automatically.
-	  </para>
-	  <para>
-		  Fedora 9 includes <application>Mozilla Thunderbird</application> version 2.0, which has numerous performance improvements, folder viewing enhancements, and enhanced mail notification support. For further details, refer to the Mozilla Thunderbird 2.0 release notes:
-	  </para>
-	  <para>
-		  <ulink url="http://www.mozilla.com/en-US/thunderbird/2.0.0.0/releasenotes/" />
-	  </para>
-  </section>
-
-  <section id="sn-DisablingPCSpeaker">
-    <title>Disabling PC Speaker</title>
-
-    <para>
-      PC speaker is enabled by default in Fedora. If you do not prefer
-      this, there are two ways to circumvent the sounds:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          Reduce its volume to a acceptable level or completely mute the
-          PC speaker in <command>alsamixer</command> with the setting
-          for <guimenuitem>PC Speak</guimenuitem>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Disable the PC speaker system wide by running the following
-          commands in a console.
-        </para>
-      </listitem>
-    </itemizedlist>
-<screen><![CDATA[su -
-modprobe -r pcspkr
-echo "install pcspkr :" >> /etc/modprobe.conf
-]]></screen>
-  </section>
-
-  <section id="sn-InternationalClockApplet">
-    <title>International Clock Applet</title>
-
-    <para>
-      The new clock applet in the GNOME panel has expanded to support
-      additional international timezones in the display, as well as
-      weather information for each configured timezone displayed. This
-      work, which involved merging <command>intlclock</command> with the
-      GNOME clock applet, provides all the functionality of
-      <command>system-config-date</command> and the weather applet.
-      Additional features include: users can choose arbtirary locations
-      instead of principal timezones; UI enhancements for new and old
-      functions; and full weather information shown in a tool tip.
-    </para>
-
-    <para>
-      Read more about this feature:
-    </para>
-
-    <para>
-      <ulink url="http://fedoraproject.org/wiki/Releases/FeatureClockApplet">http://fedoraproject.org/wiki/Releases/FeatureClockApplet</ulink>
-    </para>
-  </section>
-
-  <section id="sn-DictionariesConsolidated">
-    <title>Dictionaries Consolidated</title>
-
-    <para>
-      There is a new default spell checking back-end,
-      <command>hunspell</command>, for both the GNOME and KDE desktops,
-      as well as applications such as
-      <application>OpenOffice.org</application>,
-      <application>Firefox</application>, and other
-      <application>XULRunner</application>-based applications. This
-      common back-end includes a set of shared, multi-lingual
-      dictionaries for use with <command>hunspell</command>. This
-      feature uses a single set of common dictionaries regardless of the
-      application, which gives consistent suggestions for misspelled
-      words and uses less diskspace by eliminating duplicate
-      dictionaries.
-    </para>
-
-    <para>
-      Details on this effort are here:
-    </para>
-
-    <para>
-      <ulink url="http://fedoraproject.org/wiki/Releases/FeatureDictionary">http://fedoraproject.org/wiki/Releases/FeatureDictionary</ulink>
-    </para>
-  </section>
-  
-  <section id="Compiz">
-    <title>Compiz</title>
-    <para>
-      Fedora 9 ships with Compiz 0.7.2, which improves multi-display
-      support, adds KDE4 support, adds a configurable middle and
-      right-click button, and mouse wheel actions for GTK Window
-      Decorator. Compiz 0.7.2 adds many improvements and bug fixes.
-    </para>
-    <para>
-      For further details, refer to the Compiz 0.7.2 release
-      announcement:
-    </para>
-    <para>
-      <ulink url="http://lists.compiz-fusion.org/pipermail/community/2008-March/000168.html"/>
-    </para>
-  </section>
-  
-  <section id="vmmouse-driver">
-	  <title>vmmouse Driver</title>
-	  <para>
-		  Due to a bug in the shipping <package>xorg-x11-drv-vmmouse</package> driver, the mouse position may not be correctly positioned on a virtual machine guest's display. As a workaround until an update, add <option>Option NoAutoAddDevices</option> to the <option>ServerFlags</option> section of <filename>/etc/X11/xorg.conf</filename> in the guest machine. Create the section if necessary:
-	  </para>
-<screen>
-Section "ServerFlags"
-	Option      "NoAutoAddDevices"
-EndSection
-</screen>
-</section>
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
-</section> 
diff --git a/en-US/Devel.xml b/en-US/Devel.xml
deleted file mode 100644
index 57f98f4..0000000
--- a/en-US/Devel.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Devel">
-  <title>Development</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    This section covers various development tools and features.
-  </para>
-<!--
-  <section id="sn-Runtime">
-    <title>Runtime</title>
-      <para>
-        These are the new features in <package>glibc</package>:
-      </para>
-      <para>
-        <emphasis>No content</emphasis>
-    </para>
-  </section>
--->
-  <section id="sn-Tools">
-    <title>Tools</title>
-
-    <section id="sn-GCC-Compiler-Collection">
-      <title>GCC Compiler Collection</title>
-
-      <para>
-        This release of Fedora has been built with GCC 4.3.0, which is
-        included with the distribution.
-      </para>
-
-      <para>
-        For more information on GCC 4.3, refer to:
-      </para>
-
-      <para>
-        <ulink url="http://gcc.gnu.org/gcc-4.3/"/>
-      </para>
-<!--
-      <section id="sn-">
-	<title>Caveats</title>
-	<para>
-	  <emphasis>No content</emphasis>
-	</para>
-      </section>
--->
-      <section id="sn-gcc-code-generation">
-        <title>Code Generation</title>
-
-        <para>
-          Starting with <package>gcc-4.1.2-25</package> and
-          <package>glibc-2.6.90-14</package> , the
-          <option>-D_FORTIFY_SOURCE=2</option> option protects not only
-          C code, but also C++. There have been several security issues
-          already which would not have been exploitable if this checking
-          was in place earlier. Refer to this
-          announcement:
-	</para>
-	<para> <ulink
-	    url="https://www.redhat.com/archives/fedora-devel-announce/2007-September/msg00015.html"/> 
-	  for more details.
-        </para>
-      </section>
-<!--
-      <section id="sn-language-extensions">
-	<title>Language Extensions</title>
-	<para>
-	  <emphasis>No content</emphasis>
-	</para>
-      </section>
--->
-    </section>
-
-    <section id="sn-Eclipse">
-      <title>Eclipse</title>
-
-      <para>
-        This release of Fedora includes Fedora Eclipse, based on the
-	Eclipse SDK version 3.3.2. The 3.3.x series of releases has a <ulink url="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/whatsnew/eclipse-news.html">"New and Noteworthy"</ulink> page, and <ulink url="http://www.eclipse.org/eclipse/development/readme_eclipse_3.3.2.html">release notes</ulink> specific to 3.3.2 are also available.
-      </para>
-      
-      <para>
-        The Eclipse SDK is known variously as "the Eclipse Platform,"
-        "the Eclipse IDE," and "Eclipse." The Eclipse SDK is the
-        foundation for the combined release of twenty-one Eclipse
-        projects under the Callisto combined release umbrella:
-      </para>
-      <para>
-        <ulink
-	  url='http://www.eclipse.org/europa'/>
-      </para>
-      <para>
-        Some of the Europa projects are included in Fedora:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            CDT for C/C++ development:
-	  </para>
-	  <para>
-            <ulink
-	      url='http://www.eclipse.org/cdt'/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            GEF, the Graphical Editing Framework:
-	  </para>
-	  <para>
-            <ulink
-	      url='http://www.eclipse.org/gef'/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Mylyn, a task-focused UI for Eclipse, along with
-	    task connectors for Bugzilla and Trac:
-	  </para>
-	  <para> 
-	    <ulink
-	      url="http://www.eclipse.org/mylyn"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        Other Eclipse projects available in Fedora include:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            Subclipse, for integrating Subversion version control:
-	  </para>
-	  <para>
-            <ulink
-	      url='http://subclipse.tigris.org/'/>            
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            PyDev, for developing in Python:
-	  </para>
-	  <para>
-            <ulink
-	      url='http://pydev.sf.net'/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            PHPeclipse, for developing in PHP:
-	  </para>
-	  <para>
-            <ulink
-	      url='http://www.phpeclipse.de/'/>
-          </para>
-        </listitem>
-	<listitem>
-		<para>
-			E.P.I.C, for developing perl:
-		</para>
-		<para>
-			<ulink url="http://e-p-i-c.sourceforge.net/" />
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-			Photran, for developing in Fortran:
-		</para>
-		<para>
-			<ulink url="http://www.eclipse.org/photran/" />
-		</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>
-        Assistance in getting more projects packaged and tested with GCJ
-        is always welcome. Contact the interested parties through
-        fedora-devel-java-list and/or #fedora-java on freenode:
-      </para>
-      <para>
-        <ulink
-	  url='http://www.redhat.com/mailman/listinfo/fedora-devel-java-list/'/>
-      </para>
-
-      <para>
-        Fedora also includes plugins and features that are particularly
-        useful to FLOSS hackers, ChangeLog editing with
-        <package>eclipse-changelog</package> , and Bugzilla interaction
-        with <package>eclipse-mylyn-bugzilla</package> . Our CDT
-        package, <package>eclipse-cdt</package> , includes a snapshot
-	release of work to integrate with the GNU Autotools. There is also <package>eclipse-rpm-editor</package> for editing RPM specfiles.
-      </para>
-
-      <para>
-        The latest information regarding these projects can be found at
-        the Fedora Eclipse Project page:
-      </para>
-      <para>
-        <ulink
-	  url='http://sourceware.org/eclipse/'/>
-      </para>
-
-      <section id="sn-Eclipse-nonpkg">
-        <title>Non-packaged Plugins and Features</title>
-
-        <para>
-		Fedora Eclipse allows non-root users to make use of the Update Manager functionality for installing non-packaged plugins and features. Such plugins are installed in the user's home directory under the <filename>.eclipse</filename> directory.
-        </para>
-      </section>
-      
-      <section id="sn-Eclipse-upgrading">
-	      <title>Upgrading from Fedora 8</title>
-	      <para>
-		      Users upgrading from Fedora 8 should be aware that cached content in their home directory may not be flushed properly (see Eclipse bug <ulink url="https://bugs.eclipse.org/bugs/show_bug.cgi?id=215034">#215034</ulink>). To work around this issue, run Eclipse from a terminal with the <option>-clean</option> option. Note: this only needs to be done once.
-	      </para>
-      </section>
-      
-      <section id="sn-64bit-java">
-	      <title>64-bit Java Runtime Environments and JNI</title>
-	      <para>
-		      Do not try to run Fedora's x86_64 Eclipse packages on Sun's 32-bit JRE. They will fail. Either switch to a 64-bit proprietary JRE, or, if available, install the 32-bit version of the packages. To install a 32-bit version, run the following command (SWT is given as an example):
-	      </para>
-<screen>
-yum install libswt3-gtk2.i386
-</screen>
-		<para>
-			Likewise, the 32-bit JNI libraries shipped by default on ppc64 systems do not run with a 64-bit JRE. To install the 64-bit version, use the following command:
-		</para>
-<screen>
-yum install <replaceable>package_name</replaceable>.ppc64
-</screen>
-	</section>
-    </section>
-  </section>
-</section>
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/DevelToolsJava.xml b/en-US/DevelToolsJava.xml
deleted file mode 100644
index 3daa13f..0000000
--- a/en-US/DevelToolsJava.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/DevelToolsJava</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/DevelToolsJava</title>
-      <section id="">
-        <title>Java-like Environment </title>
-        <para>A Java-like free and open source environment is available within the Fedora Core 10 </para>
-        <programlisting>  release.
-  </programlisting>
-        <para> It has three components: <emphasis>GNU Java</emphasis> runtime (<programlisting format="linespecific">libgcj</programlisting>), the <emphasis>Eclipse Java</emphasis> compiler (<programlisting format="linespecific">ecj</programlisting>), and a set of wrappers and links (<programlisting format="linespecific">java-gcj-compat</programlisting>).  These three packages present the runtime environment and compiler to the user in the same way as other Java environments are presented.  Several major software packages such as <emphasis>OpenOffice.org Base</emphasis>, <emphasis>Eclipse</emphasis>, and <emphasis>Apache Tomcat</emphasis>, as well as other Java software packages included in this release, are compatible with this environment.</para><para>For more information, refer to the FAQ at <ulink url="http://www.fedoraproject.org/wiki/JavaFAQ"> JavaFAQ</ulink> .</para><para>Refer to this section of the Release Notes for information on installing Java packages:</para>
-        <para>
-          <ulink url="http://fedoraproject.org/w/index.php?title=./Docs/Beats/PackageNotes/Java"> PackageNotes/Java</ulink> .</para><section id="">
-          <title>Java Development </title>
-          <para>To avoid naming conflicts the following have been renamed:</para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <programlisting format="linespecific">rmic</programlisting> is now <programlisting format="linespecific">grmic</programlisting>
-              </para>
-            </listitem><listitem>
-              <para>
-                <programlisting format="linespecific">rmiregistry</programlisting> is now <programlisting format="linespecific">grmiregistry</programlisting>
-              </para>
-            </listitem><listitem>
-              <para>
-                <programlisting format="linespecific">jar</programlisting> is now <programlisting format="linespecific">fastjar</programlisting>
-              </para>
-            </listitem>
-          </itemizedlist><para>The <emphasis>GCJ compiler</emphasis> can now be used as a just-in-time (JIT) tool by using the <programlisting format="linespecific">gnu.jit</programlisting> facilities.  More support of the <emphasis>AWT</emphasis> and <emphasis>SWING</emphasis> packages have been added.</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Entertainment.xml b/en-US/Entertainment.xml
deleted file mode 100644
index d9af1d8..0000000
--- a/en-US/Entertainment.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Entertainment">
-  <title>Games and Entertainment</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    Fedora provides a selection of games that cover a variety of genres.
-    Users can install a small package of games for GNOME (called
-    <package>gnome-games</package> ) and KDE (
-    <package>kdegames</package> ). There are also many additional games
-    that span every major genre available in the repositories.
-  </para>
-
-  <para>
-    The Fedora Project website features a section dedicated to games
-    that details many of the available games, including overviews and
-    installation instructions. For more information, refer to:
-  </para>
-  <para>
-    <ulink url='http://fedoraproject.org/wiki/Games'/>
-  </para>
-
-  <para>
-    For a list of other games that are available for installation,
-    select <menuchoice><guimenu>Applications</guimenu><guimenuitem>Add /
-    Remove Software</guimenuitem></menuchoice>, or via the command line:
-  </para>
-<screen><![CDATA[yum groupinfo "Games and Entertainment" 
-]]></screen>
-  <para>
-    For help using <command>yum</command> to install the assorted game
-    packages, refer to the guide available at
-  </para>
-
-  <para>
-    <ulink url='http://docs.fedoraproject.org/yum/'/>
-  </para>
-</section>
diff --git a/en-US/FileSystems.xml b/en-US/FileSystems.xml
deleted file mode 100644
index b45c0af..0000000
--- a/en-US/FileSystems.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-FileSystems">
-  <title>File Systems</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    Fedora 9 provides basic support for encrypted swap partitions and
-    non-root file systems. To use it, add entries to
-    <filename>/etc/crypttab</filename> and reference the created devices
-    in <filename>/etc/fstab</filename>.
-  </para>
-
-  <para>
-    New in Fedora 9, the installer <application>Anaconda</application>
-    has support for creating encrypted file systems during installation.
-    For more information on that, refer to the
-    <ulink url="http://docs.fedoraproject.org/install-guide">Fedora
-    Installation Guide</ulink>.
-  </para>
-
-  <para>
-    Installing to encrypted volumes, including the root file system, is
-    now supported. There is no configuration tool for adding or removing
-    keys from volumes at a later time, or otherwise doing modification
-    of the encryption. Refer to this feature page for more information:
-  </para>
-
-  <para>
-    <ulink url="http://fedoraproject.org/wiki/Releases/FeatureEncryptedFilesystems" />
-  </para>
-
-  <para>
-    For full instructions on using encrypted file systems, refer to the
-    <ulink url="http://docs.fedoraproject.org/encryption-privacy-guide">Fedora
-    Encryption and Privacy Guide</ulink>.
-  </para>
-
-  <section id="sn-Ext4-Preview">
-    <title>Ext4 Preview</title>
-
-    <para>
-      The new ext4 file system is available in Fedora 9 as a nearly
-      feature complete preview. While an ext3 file system can be
-      mounted as ext4, an ext3 to ext4 conversion tool is planned that
-      converts existing ext3 on-disk format to ext4.
-    </para>
-    
-    <para>
-	    Fedora 9 may be installed onto an ext4 file system by adding the <option>ext4</option> option to the installer boot parameters and selecting custom partitioning.
-    </para>
-    
-    <note>
-	    <title><command>e2fsprogs</command> userspace tools</title>
-	    <para>
-		    The <command>e2fsprogs</command> userspace tools shipping with Fedora 9 are not yet fully ext4-capable. In particular, <command>fsck</command> ability is limited.
-	    </para>
-    </note>
-
-    <para>
-      For more information about this feature:
-    </para>
-
-    <para>
-      <ulink url="http://fedoraproject.org/wiki/FedoraExt4" />
-    </para>
-
-    <para>
-      <ulink url="http://fedoraproject.org/wiki/Features/Ext4" />
-    </para>
-  </section>
-</section>
diff --git a/en-US/I18n.xml b/en-US/I18n.xml
deleted file mode 100644
index 3a44642..0000000
--- a/en-US/I18n.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-I18n">
-  <title>Internationalization (i18n)</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    This section includes information on language support under Fedora.
-  </para>
-
-  <itemizedlist>
-    <listitem>
-      <para>
-        Localization (translation) of Fedora is coordinated by the
-        <ulink url="http://fedoraproject.org/wiki/L10N">Fedora
-        Localization Project</ulink>.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Internationalization of Fedora is maintained by the
-        <ulink
-	  url="http://fedoraproject.org/wiki/I18N">Fedora I18n
-        Project</ulink>.
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <section id="sn-Language-Coverage">
-    <title>Language Coverage</title>
-
-    <para>
-      Fedora features a variety of software which is translated in
-      <ulink url="http://translate.fedoraproject.org/languages">many
-      languages</ulink>. For a list of languages refer to the
-      <ulink url="http://translate.fedoraproject.org/module/anaconda">translation
-      statistics</ulink> for <application>Anaconda</application>, which
-      is one of the core software applications in Fedora.
-    </para>
-
-    <section id="sn-Language-Support-Installation">
-      <title>Language Support Installation</title>
-
-      <para>
-        To install additional language support from the
-        <emphasis>Languages</emphasis> group, use
-        <menuchoice><guimenu>Applications</guimenu><guimenuitem>Add/Remove
-        Software</guimenuitem></menuchoice>, or run this command:
-      </para>
-<screen>
-su -c "yum groupinstall <replaceable>language</replaceable>-support"
-</screen>
-      <para>
-        In the command above, <replaceable>language</replaceable> is one
-        of <option>assamese</option>, <option>bengali</option>,
-        <option>chinese</option>, <option>gujarati</option>,
-        <option>hindi</option>, <option>japanese</option>,
-        <option>kannada</option>, <option>korean</option>,
-        <option>malayalam</option>, <option>marathi</option>,
-        <option>oriya</option>, <option>punjabi</option>,
-        <option>sinhala</option>, <option>tamil</option>,
-        <option>telegu</option>, <option>thai</option>, and so on.
-      </para>
-
-      <para>
-        SCIM users upgrading from earlier releases of Fedora are
-        strongly urged to install <package>scim-bridge-gtk</package> .
-        This application works well with third-party C++ applications
-        linked against older versions of <package>libstdc++</package> .
-      </para>
-
-      <para>
-        To add SCIM support to input a particular language, install
-        <package>scim-lang-<replaceable>LANG</replaceable> </package> ,
-        where <replaceable>LANG</replaceable> is one of
-        <option>assamese</option>, <option>bengali</option>,
-        <option>chinese</option>, <option>dhivehi</option>,
-        <option>farsi</option>, <option>gujarati</option>,
-        <option>hindi</option>, <option>japanese</option>,
-        <option>kannada</option>, <option>korean</option>,
-        <option>latin</option>, <option>malayalam</option>,
-        <option>marathi</option>, <option>oriya</option>,
-        <option>punjabi</option>, <option>sinhalese</option>,
-        <option>tamil</option>, <option>telugu</option>,
-        <option>thai</option>, or <option>tibetan</option>.
-      </para>
-    </section>
-
-    <section id="sn-Transifex">
-      <title>Transifex</title>
-
-      <para>
-	      <ulink url="https://fedorahosted.org/transifex/">Transifex</ulink>
-        is Fedora's online tool to facilitate contributing translations
-        to projects hosted on remote and disparate version control
-        systems. Many of the core packages use Transifex to receive
-        translations from numerous contributors.
-      </para>
-
-      <para>
-        Through a combination of
-        <ulink url="http://translate.fedoraproject.org/">new Web
-        tools</ulink>, community growth, and better processes,
-        translators can contribute directly to any upstream project
-        through one translator-oriented Web interface. Developers of
-        projects with no existing translation community can easily reach
-        out to Fedora's established community for translations. In turn,
-        translators can reach out to numerous projects related to Fedora
-        to easily contribute translations.
-      </para>
-    </section>
-  </section>
-
-  <section id="sn-I18n-Fonts">
-    <title>Fonts</title>
-
-    <para>
-      Fonts for all available languages are installed by default on the
-      desktop to give good default language coverage.
-      <package>dejavu-fonts</package> replaces
-      <package>dejavu-lgc-fonts</package> as the default system font.
-    </para>
-
-    <section id="sn-Chinese-fonts">
-      <title>Chinese fonts</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            The <package>wqy-zenkai-fonts</package> package has been
-            added.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="sn-Indic-fonts">
-      <title>Indic fonts</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            The <package>samyak-fonts</package> package has been added.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <package>sarai-fonts</package> package has been added.
-          </para>
-        </listitem>
-	<listitem>
-		<para>
-			The <package>smc-fonts</package> package has been added for Malayalam.
-		</para>
-	</listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="sn-Japanese-fonts">
-      <title>Japanese fonts</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            <package>VLGothic-fonts</package> is the new default font
-            for Japanese in Fedora 9. It now has a subpackage
-            <package>VLGothic-fonts-proportional</package> for its
-            proportional version.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="sn-Nepali-fonts">
-      <title>Nepali fonts</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            The <package>madan-fonts</package> package has been added.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="sn-Thai-fonts">
-      <title>Thai fonts</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            The <package>thaifonts-scalable</package> package has been
-            added, making Thai TrueType fonts available in Fedora.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-
-  <section id="sn-Input-Methods">
-    <title>Input Methods</title>
-
-    <para>
-      It is now possible to start and stop the of Input Methods in GTK
-      applications during runtime thanks to the new
-      <emphasis>imsettings</emphasis> framework. The
-      <option>GTK_IM_MODULE</option> environment variable is no longer
-      needed by default but can still be used to override the
-      <emphasis>imsettings</emphasis>.
-    </para>
-
-    <section id="sn-im-chooser">
-      <title>im-chooser</title>
-
-      <para>
-        With the new <emphasis>imsettings</emphasis> framework,
-        <command>im-chooser</command> can now start and stop Input
-        Method usage dynamically on the GNOME Desktop.
-      </para>
-
-      <para>
-        Input methods only start by default on desktops running in an
-        Asian locale. The current list is: <systemitem>as</systemitem>,
-        <systemitem>bn</systemitem>, <systemitem>gu</systemitem>,
-        <systemitem>hi</systemitem>, <systemitem>ja</systemitem>,
-        <systemitem>kn</systemitem>, <systemitem>ko</systemitem>,
-        <systemitem>ml</systemitem>, <systemitem>mr</systemitem>,
-        <systemitem>ne</systemitem>, <systemitem>or</systemitem>,
-        <systemitem>pa</systemitem>, <systemitem>si</systemitem>,
-        <systemitem>ta</systemitem>, <systemitem>te</systemitem>,
-        <systemitem>th</systemitem>, <systemitem>ur</systemitem>,
-        <systemitem>vi</systemitem>, <systemitem>zh</systemitem>. Use
-        <application>im-chooser</application> via <menuchoice>
-        <guimenu>System</guimenu> <guisubmenu>Preferences</guisubmenu>
-        <guisubmenu>Personal</guisubmenu> <guimenuitem>Input
-        Method</guimenuitem></menuchoice> to enable or disable Input
-        method usage on your desktop.
-      </para>
-    </section>
-
-    <section id="sn-SCIM-hotkeys">
-      <title>SCIM hotkeys</title>
-
-      <para>
-        SCIM now only defines trigger hotkeys for Asian languages as in
-        the following table:
-      </para>
-      <table>
-        <title>Hotkeys</title>
-        <tgroup cols="2">
-          <colspec colname="xxx1"/>
-          <colspec colname="xxx2"/>
-          <tbody>
-            <row>
-<entry>
-							<para><emphasis role="strong">Language</emphasis></para>
-						</entry>
-<entry>
-							<para><emphasis role="strong">Trigger hotkeys</emphasis>
-							</para>
-						</entry>
-            </row>
-            <row>
-<entry>
-							<para>Chinese</para>
-						</entry>
-<entry>
-							<para><code>Ctrl-Space</code>
-							</para>
-						</entry>
-            </row>
-            <row>
-<entry>
-							<para>Indic</para>
-						</entry>
-<entry>
-							<para><code>Ctrl-Space</code>
-							</para>
-						</entry>
-            </row>
-            <row>
-<entry><para>Japanese</para>
-						</entry>
-<entry>
-							<para><code>Zenkaku_Hankaku</code>, <code>Alt-`</code>, or <code>Ctrl-Space</code>
-							</para>
-						</entry>
-            </row>
-            <row>
-<entry><para>Korean</para>
-						</entry>
-<entry><para><code>Shift-Space</code>, <code>Hangul</code>, or <code>Ctrl-Space</code>
-							</para>
-						</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </section>
-
-    <section id="sn-scim-python">
-      <title>scim-python</title>
-
-      <para>
-        This release adds the <package>scim-python</package> package,
-        which allows writing Input Method Engines for SCIM in python.
-      </para>
-    </section>
-
-    <section id="sn-scim-python-chinese">
-      <title>scim-python-chinese</title>
-
-      <para>
-        The <package>scim-python</package> package also includes a
-        subpackage <package>scim-python-pinyin</package> that provides
-        PinYin and ShuangPin Input Methods for improved input of
-        Simplified Chinese. The PinYin Input Method replaces
-        <package>scim-pinyin</package> as the default input method for
-        Simplified Chinese. The <package>scim-python-xingma</package>
-        package provides a number of tables for other Chinese input
-        methods.
-      </para>
-    </section>
-  </section>
-</section>
diff --git a/en-US/Installer.xml b/en-US/Installer.xml
deleted file mode 100644
index 9209e80..0000000
--- a/en-US/Installer.xml
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Installer">
-  <title>Installation Notes</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <important>
-    <title>Fedora Installation Guide</title>
-
-    <para>
-      To learn how to install Fedora, refer to
-      <ulink
-	url='http://docs.fedoraproject.org/install-guide/'>http://docs.fedoraproject.org/install-guide/</ulink>.
-    </para>
-  </important>
-  <note>
-    <title>Installation issues not covered in these release notes</title>
-    <para>
-      If you encounter a problem or have a question during installation
-      that is not covered in these relese notes, refer to
-      <ulink
-	url='http://fedoraproject.org/wiki/FAQ'>http://fedoraproject.org/wiki/FAQ</ulink>
-      and
-      <ulink
-	url='http://fedoraproject.org/wiki/Bugs/Common'>http://fedoraproject.org/wiki/Bugs/Common</ulink>.
-    </para>
-  </note>
-  <para>
-    <application>Anaconda</application> is the name of the Fedora
-    installer. This section outlines issues related to
-    <application>Anaconda</application> and installing Fedora 9.
-  </para>
-
-  <note>
-    <title>Downloading Large Files</title>
-
-    <para>
-      If you intend to download the Fedora DVD ISO image, keep in mind
-      that not all file downloading tools can accommodate files larger
-      than 2 GiB in size. Tools without this limitation include
-      <command>wget</command> 1.9.1-16 and above,
-      <command>curl</command>, and <command>ncftpget</command>.
-      <application>BitTorrent</application> is another method for
-      downloading large files. For information about obtaining and using
-      the torrent file, refer to
-      <ulink
-	url='http://torrent.fedoraproject.org/'>http://torrent.fedoraproject.org/</ulink>.
-    </para>
-  </note>
-
-  <para>
-    <application>Anaconda</application> tests the integrity of
-    installation media by default. This function works with the CD, DVD,
-    hard drive ISO, and NFS ISO installation methods. The Fedora Project
-    recommends that you test all installation media before starting the
-    installation process and before reporting any installation-related
-    bugs. Many of the bugs reported are actually due to
-    improperly-burned CDs or DVDs.
-  </para>
-
-  <para>
-    The <command>mediacheck</command> function is highly sensitive, and
-    may report some usable discs as faulty. This result is often caused
-    by disc writing software that does not include padding when creating
-    discs from ISO files. To use this test, at boot time hit any key to
-    enter the menu. Then press the <keycap>Tab</keycap> key, add the
-    option <option>mediacheck</option> to the parameter list, and press
-    <keycap>Enter</keycap>.
-  </para>
-
-  <para>
-    After you complete the <command>mediacheck</command> function
-    successfully, reboot to return the system to its normal state. On
-    many systems, this results in a faster installation process from the
-    disc. You may skip the <option>mediacheck</option> option when
-    rebooting.
-  </para>
-
-  <important>
-    <title>BitTorrent Automatically Verifies File Integrity</title>
-
-    <para>
-      If you use <application>BitTorrent</application>, 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, you should still use <command>mediacheck</command>
-      to test the integrity of the media.
-    </para>
-  </important>
-
-  <para>
-    To perform memory testing before you install Fedora, press any key
-    to enter the boot menu, then select <guimenuitem>Memory
-    Test</guimenuitem>. This option runs the
-    <application>Memtest86</application> stand alone memory testing
-    software in place of <application>Anaconda</application>.
-    <application>Memtest86</application> memory testing continues until
-    you press the <keycap>Esc</keycap> key.
-  </para>
-
-  <note>
-    <title>Memtest86 Availability</title>
-
-    <para>
-      You must boot from Installation Disc 1, the DVD, or a rescue CD in
-      order to use this feature.
-    </para>
-  </note>
-
-  <para>
-    Fedora 9 supports graphical FTP and HTTP installations. However, the
-    installer image must either fit in RAM or appear on local storage,
-    such as Installation Disc 1. Therefore, only systems with more than
-    192MiB of RAM, or which boot from Installation Disc 1, can use the
-    graphical installer. Systems with 192MiB RAM or less fall back to
-    using the text-based installer automatically. If you prefer to use
-    the text-based installer, type <command>linux text</command> at the
-    <prompt>boot:</prompt>
-    prompt.
-  </para>
-
-  <section id="sn-Changes-in-Anaconda">
-    <title>Changes in Anaconda</title>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          Built-in support for resizing ext2, ext3, and ntfs
-          partitions.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Support for installation to encrypted block devices, including
-          the root filesystem.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Consolidated network booting ISO image, replacing old
-          <filename>boot.iso</filename>,
-          <filename>diskboot.img</filename>, and
-          <filename>rescuecd.iso</filename>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Second stage installer location now independent of software
-          package location.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-	  Native installation to <systemitem>x86</systemitem> and
-	  <systemitem>x86_64</systemitem> machines using EFI and
-	  booting via <systemitem>grub</systemitem>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Hardware probing and detection now based on HAL and
-          <systemitem>udev</systemitem>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Support for persistence in Live images on USB flash media.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section id="sn-Installation-Related-Issues">
-    <title>Installation Related Issues</title>
-
-    <section id="sn-IDE-devices">
-      <title>IDE Device Names</title>
-
-      <para>
-        Use of <filename>/dev/hdX</filename> on i386 and x86_64 for IDE
-        drives has changed to <filename>/dev/sdX</filename>. See notes
-        about the importance of labeling devices for upgrades from
-        releases before Fedora 7, and partition limitations.
-      </para>
-    </section>
-
-    <section id="sn-IDE-RAID">
-      <title>IDE RAID</title>
-
-      <para>
-        Not all IDE RAID controllers are supported. If your RAID
-        controller is not yet supported by <package>dmraid</package> ,
-        you may combine drives into RAID arrays by configuring Linux
-        software RAID. For supported controllers, configure the RAID
-        functions in the computer BIOS.
-      </para>
-    </section>
-
-    <section id="sn-Multiple-NICs-and-PXE-Installation">
-      <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>
-<screen><![CDATA[IPAPPEND 2 
-APPEND ksdevice=bootif
-]]></screen>
-      <para>
-        The configuration options above causes the installer to use the
-        same network interface as BIOS and PXE use. You can also use the
-        following option:
-      </para>
-<screen><![CDATA[ksdevice=link 
-]]></screen>
-      <para>
-        This option causes the installer to use the first network device
-        it finds that is linked to a network switch.
-      </para>
-    </section>
-    
-  </section>
-
-  <section id="Upgrade-Related-Issues">
-    <title>Upgrade Related Issues</title>
-
-    <para>
-      Refer to
-      <ulink url='http://fedoraproject.org/wiki/DistributionUpgrades'>http://fedoraproject.org/wiki/DistributionUpgrades</ulink>
-      for detailed recommended procedures for upgrading Fedora.
-    </para>
-    
-    <section id="sn-emacs-notes">
-	    <title>Emacs</title>
-	    <para>
-		    If you are upgrading to Fedora 9 and use <package>emacs</package>, you must upgrade to the latest version of emacs for your prior release to ensure a clean upgrade. Fedora 8 users must have <package>emacs-22.1-10.fc8</package> or later, while Fedora 7 users must have <package>emacs-22.1-7.fc7</package>.
-	    </para>
-	    <para>
-		    To see what version of <package>emacs</package> is installed, run the <command>rpm -q emacs</command> command.
-	    </para>
-   </section>
-
-    <section id="sn-scsi-partition-limit">
-      <title>SCSI driver partition limits</title>
-
-      <para>
-        Whereas older IDE drivers supported up to 63 partitions per
-        device, SCSI devices are limited to 15 partitions per device.
-        <application>Anaconda</application> uses the
-        <systemitem
-	  class="library">libata</systemitem> driver in the
-        same fashion as the rest of Fedora, so it is unable to detect
-        more than 15 partitions on an IDE disk during the installation
-        or upgrade process.
-      </para>
-
-      <para>
-        If you are upgrading a system with more than 15 partitions, you
-        may need to migrate the disk to Logical Volume Management (LVM).
-        This restriction may cause conflicts with other installed
-        systems if they do not support LVM. Most modern Linux
-        distributions support LVM, and drivers are available for other
-        operating systems as well.
-      </para>
-    </section>
-
-    <section id="sn-label-disk-partitions">
-      <title>Disk partitions must be labeled</title>
-
-      <para>
-        A change in the way that the Linux kernel handles storage
-        devices means that device names like <filename
-        class="devicefile">/dev/hdX</filename> or <filename
-        class="devicefile">/dev/sdX</filename> may differ from the
-        values used in earlier
-        releases. <application>Anaconda</application> solves this
-        problem by relying on partition labels or UUIDs for finding
-        devices. If these are not present, then
-        <application>Anaconda</application> presents a warning
-        indicating that partitions need to be labelled and that the
-        upgrade can not proceed. Systems that use Logical Volume
-        Management (LVM) and the device mapper usually do not require
-        relabeling.
-      </para>
-
-      <section id="check-disk-partition-labels">
-        <title>To check disk partition labels</title>
-
-        <para>
-          To view partition labels, boot the existing Fedora
-          installation, and enter the following at a terminal prompt:
-        </para>
-<screen><![CDATA[/sbin/blkid]]></screen>
-        <para>
-          Confirm that each volume line in the list has a
-          <option>LABEL=</option> value, as shown below:
-        </para>
-<screen><![CDATA[/dev/hdd1: LABEL="/boot" UUID="ec6a9d6c-6f05-487e-a8bd-a2594b854406" SEC_TYPE="ext2" TYPE="ext3"]]></screen>
-      </section>
-
-      <section id="update-fs-mount-entries">
-        <title>Update the file system mount entries</title>
-
-        <para>
-          If any filesystem labels were added or modified, then the
-          device entries in <filename>/etc/fstab</filename> must be
-          adjusted to match:
-        </para>
-<screen><![CDATA[su -c "cp /etc/fstab /etc/fstab.orig"
-su -c "gedit /etc/fstab"]]></screen>
-        <para>
-          An example of a mount by label entry is:
-        </para>
-<screen><![CDATA[LABEL=f7-slash  /  ext3  defaults  1 1]]></screen>
-      </section>
-
-      <section id="update-grub.conf">
-        <title>Update the <filename>grub.conf</filename> kernel root entry</title>
-
-        <para>
-          If the label for the
-          <filename
-	    class="partition">/</filename> (root)
-          filesystem was modified, the kernel boot parameter in the grub
-          configuration file must also be modified:
-        </para>
-<screen><![CDATA[su -c "gedit /boot/grub/grub.conf"]]></screen>
-        <para>
-          A matching example kernel grub line is:
-        </para>
-<screen><![CDATA[kernel /vmlinuz-2.6.20-1.2948.fc6 ro root=LABEL=f7-slash rhgb quiet]]></screen>
-      </section>
-
-      <section id="test-changed-labels">
-        <title>Test changes made to labels</title>
-
-        <para>
-          If partition labels were adjusted, or the
-          <filename>/etc/fstab</filename> file modified, then boot the
-          existing Fedora installation to confirm that all partitions
-          still mount normally and login is successful. When complete,
-          reboot with the installation media to start the installer and
-          begin the upgrade.
-        </para>
-      </section>
-    </section>
-
-    <section id="Upgrades-versus-Installs">
-      <title>Upgrades versus fresh installations</title>
-
-      <para>
-        In general, fresh installations are recommended over upgrades,
-        particularly for systems that include software from third-party
-        repositories. Third-party packages remaining from a previous
-        installation may not work as expected on an upgraded Fedora
-        system. If you decide to perform an upgrade anyway, the
-        following information may be helpful:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            Before you upgrade, back up the system completely. In
-            particular, preserve <filename>/etc</filename>,
-            <filename>/home</filename>, and possibly
-            <filename>/opt</filename> and
-            <filename>/usr/local</filename> if customized packages are
-            installed there. You may wish to use a multi-boot approach
-            with a "clone" of the old installation on alternate
-            partition(s) as a fallback. In that case, create alternate
-            boot media, such as a GRUB boot floppy.
-          </para>
-          <note>
-            <title>System Configuration Backups</title>
-            <para>
-              Backups of configurations in <filename>/etc</filename> are
-              also useful in reconstructing system settings after a
-              fresh installation.
-            </para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>
-            After you complete the upgrade, run the following command:
-          </para>
-<screen><![CDATA[rpm -qa --last > RPMS_by_Install_Time.txt 
-]]></screen>
-          <para>
-            Inspect the end of the output for packages that pre-date the
-            upgrade. Remove or upgrade those packages from third-party
-            repositories, or otherwise deal with them as necessary. Some
-            previously installed packages may no longer be available in
-            any configured repository. To list all these packages, use
-            the following command:
-          </para>
-<screen><![CDATA[su -c "yum list extras"]]></screen>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-  
-  <section id="Kickstart-HTTP-Issue">
-    <title>Kickstart HTTP Issue</title>
-    <para>
-      When using a Kickstart configuration file via HTTP, kickstart
-      file retrieval may fail with an error that indicates the file
-      could not be retrieved. Click the <guilabel>OK</guilabel> button
-      several times without making modifications to override this
-      error successfully. As a workaround, use one of the other
-      supported methods to retrieve Kickstart configurations.
-    </para>
-  </section>
-  
-</section>
-
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/Kernel.xml b/en-US/Kernel.xml
deleted file mode 100644
index ec0b337..0000000
--- a/en-US/Kernel.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Kernel">
-  <title>Linux Kernel</title>
-
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    This section covers changes and important information regarding the
-    2.6.25 based kernel in Fedora 9. The 2.6.25 kernel includes:
-  </para>
-
-  <itemizedlist>
-    <listitem>
-      <para>
-        Tickless support for x86 64-bit systems (32-bit was added
-        previously), which greatly improves power management.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Some elements of the realtime kernel project.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        The kernel has a new version naming scheme to more closely match
-        the upstream version naming scheme.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        The kernel spec file is now named
-        <filename>kernel.spec</filename> rather than
-        <filename>kernel-2.6.spec</filename>.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        The kernel spec file has new macros that ease the kernel
-        building process. Refer to
-        <ulink
-	  url="http://fedoraproject.org/wiki/Docs/CustomKernel"/>
-        for further information.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        The kernel in Fedora 9 no longer loads modules by default for
-        ISA sound cards. Load the module by hand using the command
-        <command>modprobe module-name</command>, or put an entry in
-        <filename>/etc/modprobe.conf</filename>. For example, for the
-        Creative SoundBlaster AWE64, add the following entry:
-      </para>
-<screen><![CDATA[install snd-sbawe]]></screen>
-    </listitem>
-    <listitem>
-      <para>
-	Work on <option>paravirt_ops</option> in the upstream kernel has
-	progressed sufficiently that the <package>kernel-xen</package>
-	package has been obsoleted. For further details refer to see
-	[[Docs/Beats/Virtualization#Unified_Kernel_Image | Unified
-	Kernel Image]].
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <section id="sn-Version">
-    <title>Version</title>
-
-    <para>
-      Fedora may include additional patches to the kernel for
-      improvements, bug fixes, or additional features. For this reason,
-      the Fedora kernel may not be line-for-line equivalent to the
-      so-called <firstterm>vanilla kernel</firstterm> from the
-      kernel.org web site:
-    </para>
-
-    <para>
-      <ulink url='http://www.kernel.org/' />
-    </para>
-
-    <para>
-      To obtain a list of these patches, download the source RPM package
-      and run the following command against it:
-    </para>
-<screen><![CDATA[rpm -qpl kernel-<version>.src.rpm 
-]]></screen>
-  </section>
-
-  <section id="sn-Changelog">
-    <title>Changelog</title>
-
-    <para>
-      To retrieve a log of changes to the package, run the following
-      command:
-    </para>
-<screen><![CDATA[rpm -q --changelog kernel-<version> 
-]]></screen>
-    <para>
-      If you need a user friendly version of the changelog, refer to
-      <ulink url='http://wiki.kernelnewbies.org/LinuxChanges' />. A
-      short and full diff of the kernel is available from
-      <ulink url='http://kernel.org/git' />. The Fedora version kernel
-      is based on the Linus tree.
-    </para>
-
-    <para>
-      Customizations made for the Fedora version are available from
-      <ulink
-	url='http://cvs.fedoraproject.org' />.
-    </para>
-  </section>
-
-  <section id="sn-Kernel-Flavors">
-    <title>Kernel Flavors</title>
-
-    <para>
-      Fedora 9 includes the following kernel builds:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          Native kernel, for use in most systems. Configured sources are
-          available in the <package>kernel-devel</package> package.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The kernel-PAE, for use in 32-bit x86 systems with more than
-          4GB of RAM, or with CPUs that have an NX (No eXecute) feature.
-          This kernel support both uniprocessor and multi-processor
-          systems. Configured sources are available in the
-          <package>kernel-PAE-devel</package> package.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Virtualization kernel for use with the Xen emulator package.
-          Configured sources are available in the
-          <package>kernel-xen-devel</package> package.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      You may install kernel headers for all kernel flavors at the same
-      time. The files are installed in the
-      <filename
-	class="directory">/usr/src/kernels/<replaceable>version</replaceable>[-PAE|-xen|-kdump]-<replaceable>arch</replaceable>/</filename>
-      tree. Use the following command:
-    </para>
-<screen><![CDATA[su -c "yum install kernel{,-PAE,-xen,-kdump}-devel" 
-]]></screen>
-    <para>
-      Select one or more of these flavors, separated by commas and no
-      spaces, as appropriate. Enter the
-      <systemitem
-	class="username">root</systemitem> password when
-      prompted.
-    </para>
-
-    <note>
-      <title>x86 Kernel Includes Kdump</title>
-
-      <para>
-        Both the x86_64 and the i686 kernels are now relocatable, so
-        they no longer require a separate kernel for kdump capability.
-        PPC64 still requires a separate <package>kdump</package> kernel.
-      </para>
-    </note>
-
-    <note>
-      <title>Default Kernel Provides SMP</title>
-
-      <para>
-        There is no separate SMP kernel available for Fedora on i386,
-        x86_64, and ppc64. Multiprocessor support is provided by the
-        native kernel.
-      </para>
-    </note>
-
-    <note>
-      <title>PowerPC Kernel Support</title>
-
-      <para>
-        There is no support for Xen or kdump for the PowerPC
-        architecture in Fedora. 32-bit PowerPC does still have a
-        separate SMP kernel.
-      </para>
-    </note>
-  </section>
-
-  <section id="sn-Preparing-for-Kernel-Development">
-    <title>Preparing for Kernel Development</title>
-
-    <para>
-      Fedora 9 does not include the <package>kernel-source</package>
-      package provided by older versions since only the
-      <package>kernel-devel</package> package is required now to build
-      external modules. Configured sources are available, as described
-      in <xref linkend="sn-Kernel-Flavors"/>.
-    </para>
-
-    <important>
-      <title>Custom Kernel Building</title>
-
-      <para>
-        For information on kernel development and working with custom
-        kernels, refer to
-        <ulink
-	  url="http://fedoraproject.org/wiki/Docs/CustomKernel"/>.
-      </para>
-    </important>
-  </section>
-
-  <section id="sn-Reporting-Bugs">
-    <title>Reporting Bugs</title>
-
-    <para>
-      Refer to
-      <ulink url='http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html' />
-      for information on reporting bugs in the Linux kernel. You may
-      also use <ulink url='http://bugzilla.redhat.com' /> for reporting
-      bugs that are specific to Fedora.
-    </para>
-  </section>
-</section>
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/Legacy.xml b/en-US/Legacy.xml
deleted file mode 100644
index 8d8261b..0000000
--- a/en-US/Legacy.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Legacy">
-  <title>Fedora Legacy - Community Maintenance Project</title>
-
-  <para>
-    The Fedora Legacy Project was a community-supported open source
-    project to extend the lifecycle of select "maintenance mode" Red Hat
-    Linux and Fedora Core distributions. The current model for
-    supporting maintenance distributions has been re-examined. Fedora
-    Legacy was unable to extend support to older Fedora Core releases as
-    it had planned. As of now, Fedora Core 4 and earlier distributions
-    are no longer being maintained. Fedora Core 5 will no longer be
-    maintained 30 days after the Fedora 7 release.
-  </para>
-
-  <note>
-    <title>Legacy Repo was included in Fedora Core 6</title>
-
-    <para>
-      Fedora Core 6 shipped with a software repository configuration for
-      Fedora Legacy. This repository was not enabled by default in the
-      Fedora Core 6 release.
-    </para>
-  </note>
-</section>
diff --git a/en-US/Live.xml b/en-US/Live.xml
deleted file mode 100644
index dbcf64e..0000000
--- a/en-US/Live.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Live">
-  <title>Fedora Live Images</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    The Fedora release includes several live ISO images in addition to
-    the traditional installation images. These ISO images are bootable,
-    and you can burn them to media and use them to try out Fedora. They
-    also include a feature that allows you to install the Live image
-    content to your hard drive for persistence and higher performance.
-  </para>
-
-  <section id="sn-Available-Images">
-    <title>Available Images</title>
-
-    <para>
-      For a complete list of current spins available, and instructions
-      for using them, refer to:
-    </para>
-
-    <para>
-      <ulink
-	url="http://fedoraproject.org/wiki/CustomSpins"/>
-    </para>
-  </section>
-
-  <section id="sn-Usage-Information">
-    <title>Usage Information</title>
-
-    <para>
-      To boot from the Live image, insert it into your computer and
-      restart. To log in and use the desktop environment, enter the
-      username <systemitem class="username">fedora</systemitem>. Hit
-      <keycap>Enter</keycap> at the password prompt, since there is no
-      password on this account. The Live images do not automatically
-      login so users can select a preferred language. After logging in,
-      if you wish to install the contents of the live image to your hard
-      drive, click on the <guilabel>Install to Hard Drive</guilabel>
-      icon on the desktop.
-    </para>
-  </section>
-
-  <section id="sn-text-mode-installation">
-    <title>Text Mode Installation</title>
-
-    <para>
-      You can do a text mode installation of the Live images using the
-      <command>liveinst</command> command in the console.
-    </para>
-  </section>
-
-  <section id="sn-direct-installation">
-    <title>Direct Installation</title>
-
-    <para>
-      You can add <option>liveinst</option> or <option>textinst</option>
-      as a boot loader option to perform a direct installation without
-      booting up the live CD/DVD.
-    </para>
-
-    <section id="sn-USB-Booting">
-      <title>USB Booting</title>
-
-      <para>
-        Another way to use these Live images is to put them on a USB
-        stick. To do this, install the <package>livecd-tools</package>
-        package from the development repository. Then, run the
-        <command>livecd-iso-to-disk</command> script:
-      </para>
-<screen><![CDATA[/usr/bin/livecd-iso-to-disk /path/to/live.iso /dev/sdb1]]></screen>
-      <para>
-        Replace <replaceable>/dev/sdb1</replaceable> with the partition
-        where you want to put the image.
-      </para>
-
-      <para>
-        This is <emphasis>not</emphasis> a destructive process; any data
-        you currently have on your USB stick <emphasis>is
-        preserved</emphasis>.
-      </para>
-    </section>
-
-    <section id="sn-live-usb-persistence">
-      <title>Live USB Persistence</title>
-
-      <para>
-	Support for persistent changes with a Live image exists for
-        Fedora 9. The primary use case is booting from a Live image on
-        a USB flash drive and storing changes to that same device. To
-        do this, download the Live image and then run the following
-        command:
-      </para>
-      <screen><![CDATA[livecd-iso-to-disk --overlay-size-mb 512 /path/to/live.iso /dev/sdb1]]></screen>
-      <para>
-        Replace <replaceable>/dev/sdb1</replaceable> with the
-        partition where you want to put the image.
-      </para>
-
-      <para>
-        Replace <replaceable>512</replaceable> with the desired size in
-        megabytes of the persistent data, or overlay. The
-        <command>livecd-iso-to-disk</command> shell script is stored in
-        the <filename class="directory">LiveOS</filename> directory at
-        the top level of the CD image. The USB media must have
-        sufficient free space for the Live image, plus the overlay, plus
-        any other data to be stored on the media.
-      </para>
-    </section>
-    
-    <section id="Tool-Changes">
-      <title>Tool Changes</title>
-      <para>
-	Work has continued to better integrate the Live images with
-	the rest of the system, and improve the tools used for
-	building them. The <command>livecd-creator</command> utility
-	now provides an API for building alternative front-ends, as
-	well as tools for other types of images.
-      </para>
-    </section>
-
-    <section id="sn-Differences-From-a-Regular-Fedora-Install">
-      <title>Differences From a Regular Fedora Install</title>
-
-      <para>
-        The following items are different from a normal Fedora install
-        with the live images.
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-		  Live images provide a subset of packages available in the regular DVD image. Both connect to the same repository that has all the packages.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-	    SSH is disabled by default. SSH is disabled because the
-	    default username in the Live images does not have any
-	    password.  However, installation to hard disk prompts for
-	    creating a new username and password.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-	    Live image installations do not allow any package
-	    selection or upgrade capability since they copy the entire
-	    file system from media or USB disks, to the hard
-	    disk. After the installation is complete, and your system
-	    has been rebooted, you can add and remove packages as
-	    desired with the <application>Add/Remove
-	    Packages</application> tool, <command>yum</command>, or
-	    the other software management tools.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Live images do not work on <systemitem>i586</systemitem>
-            architecture.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-</section>
diff --git a/en-US/MailServers.xml b/en-US/MailServers.xml
deleted file mode 100644
index ddfdef0..0000000
--- a/en-US/MailServers.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-MailServers">
-  <title>Mail Servers</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    This section concerns electronic mail servers or mail transfer
-    agents (MTAs).
-  </para>
-
-  <section id="sendmail">
-    <title>Sendmail</title>
-
-    <para>
-      By default, the <application>Sendmail</application> mail transport
-      agent (MTA) does not accept network connections from any host
-      other than the local computer. To configure
-      <application>Sendmail</application> as a server for other clients:
-    </para>
-    <orderedlist>
-      <listitem>
-        <para>
-          Edit <filename>/etc/mail/sendmail.mc</filename> and either
-          change the <option>DAEMON_OPTIONS</option> line to also listen
-          on network devices, or comment out this option entirely using
-          the <option>dnl</option> comment delimiter.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Install the <package>sendmail-cf</package> package:
-        </para>
-<screen>
-yum install sendmail-cf
-</screen>
-      </listitem>
-      <listitem>
-        <para>
-          Regenerate <filename>/etc/mail/sendmail.cf</filename>:
-        </para>
-<screen>
-make -C /etc/mail
-</screen>
-      </listitem>
-    </orderedlist>
-  </section>
-</section>
diff --git a/en-US/OverView.xml b/en-US/OverView.xml
deleted file mode 100644
index df48157..0000000
--- a/en-US/OverView.xml
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-OverView">
-  <title>Release Highlights</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <section id="sn-Fedora-Tour">
-    <title>Fedora Tour</title>
-
-    <para>
-      You can find a tour filled with pictures and videos of this
-      exciting new release at
-      <ulink url='http://fedoraproject.org/wiki/Tours/Fedora9'/>.
-    </para>
-    <section id="sn-Release-Summary">
-	    <title>Release Summary</title>
-	    <para>
-		    For a less technical user friendly summary of the important changes in this release, refer to:
-	    </para>
-	    <para>
-		    <ulink url="http://fedoraproject.org/wiki/Releases/9/ReleaseSummary" />
-	    </para>
-    </section>
-  </section>
-
-  <section id="sn-New-in-Fedora">
-    <title>New in Fedora</title>
-
-    <para>
-      This release includes significant new versions of many key
-      components and technologies. The following sections provide a
-      brief overview of major changes from the last release of Fedora.
-    </para>
-
-    <section id="sn-Spins">
-      <title>Spins</title>
-
-      <para>
-        Fedora includes several different
-        <ulink
-	  url="http://fedoraproject.org/wiki/CustomSpins"><firstterm>spins</firstterm></ulink>,
-        which are variations of Fedora built from a specific set of
-        software packages. Each spin has a combination of software to
-        meet the requirements of a specific kind of end user. In
-        addition to a very small <filename>boot.iso</filename> image for
-        network installation, users have the following spin choices:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            A regular Fedora image for desktops, workstations, and
-            server users. This spin provides a good upgrade path and
-            similar environment for users of previous releases of
-            Fedora.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            One of several Live images that can be run from a disc or
-            USB flash device, and can be installed to hard disk as
-            desired. Refer to the
-            <ulink
-	      url="http://fedoraproject.org/wiki/Docs/Beats/Live">"Live"</ulink>
-            section for more information about the Live images.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        More custom spins are available at
-        <ulink
-	  url="http://spins.fedoraproject.org"/>. These Live
-        images can be used on USB media via the
-        <package>livecd-iso-to-disk</package> utility available in the
-        <package>livecd-tools</package> package.
-      </para>
-    </section>
-
-    <section>
-      <title>Jigdo</title>
-
-      <para>
-        Fedora releases are also available via Jigdo. This distribution
-        method can improve the speed of obtaining the installation ISO
-        images. Instead of waiting for torrent downloads to complete,
-        Jigdo seeks the fastest mirrors it can find via the Fedora
-        Project Mirror Manager infrastructure, and downloads the bits it
-        needs from these mirrors. To optimize seeking these bits, you
-        can tell Jigdo to scan a DVD or CD you already have, and cut
-        down on redundant downloads. This feature becomes particularly
-        useful if you:
-      </para>
-      <orderedlist>
-        <listitem>
-          <para>
-            Download all the test releases and then get the final
-            release, in which case you have 90% of the data already with
-            each subsequent download.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download both the DVD and the CD set, in which case the DVD
-            holds 95% of the data needed for the CD sets.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download any combination of the above.
-          </para>
-        </listitem>
-      </orderedlist>
-    </section>
-    
-    <section id="Upgrading-using-PreUpgrade">
-	    <title>Upgrading using PreUpgrade</title>
-	    <para>
-		    PreUpgrade is an application users run on an existing Fedora 7 or 8 installation, that resolves and downloads packages required to upgrade Fedora. While PreUpgrade downloads the necessary packages, users are free to continue using their systems.
-	    </para>
-	    <para>
-		    To use PreUpgrade to upgrade Fedora 8 to Fedora 9:
-	    </para>
-	    <orderedlist>
-		    <listitem>
-			    <para>
-				    Back up all important data before upgrading.
-			    </para>
-		    </listitem>
-		    <listitem>
-			    <para>
-				    Run the <command>yum update</command> command as root to make sure all packages are updated to their latest versions.
-			    </para>
-		    </listitem>
-		    <listitem>
-			    <para>
-				    Run the <command>yum install preupgrade</command> command as root to install PreUpgrade.
-			    </para>
-		    </listitem>
-		    <listitem>
-			    <para>
-				    Run the <command>preupgrade</command> command as root to start the PreUpgrade application.
-			    </para>
-		    </listitem>
-		    <listitem>
-			    <para>
-				    Select <guimenuitem>Fedora 9 (Sulphur)</guimenuitem> on the <computeroutput>Choose desired release</computeroutput> screen, and click the <guibutton>Apply</guibutton> button.
-			    </para>
-		    </listitem>
-		    <listitem>
-			    <para>
-				    When all of the packages have downloaded, reboot your system to start the Fedora 9 installer.
-			    </para>
-		    </listitem>
-	    </orderedlist>
-	    <para>
-		    For further information, refer to the PreUpgrade Wiki:
-	    </para>
-	    <para>
-		    <ulink url="http://fedoraproject.org/wiki/Features/PreUpgrade" />
-	    </para>
-    </section>
-		    
-
-    <section id="sn-New-Features">
-      <title>Features</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            This release features
-            <ulink
-	      url="http://www.gnome.org/start/2.22/notes/C/">GNOME
-            2.22</ulink>. GNOME now includes a webcam photo and video
-            creation utility called <application>Cheese</application>,
-            improved network filesystem support, a new international
-            clock applet, Google Calendar support and custom email
-            labels in Evolution, a new Remote Desktop Viewer, improved
-            accessibility features, and
-            <application>PolicyKit</application> integration.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            KDE 4.0.3 is available in the KDE Live image as well as the
-            regular DVD.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Xfce 4.5.2 is available as part of this release.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <ulink url="http://fedoraproject.org/wiki/NetworkManager">
-            NetworkManager</ulink> 0.7 provides improved mobile
-            broadband support, including GSM and CDMA devices, and now
-            supports multiple devices and ad-hoc networking for sharing
-            connections.  It is now enabled by default on
-            installations from DVD, CD, the network, and Live images.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-	    The Fedora installer, <application>Anaconda</application>,
-	    now supports partition resizing for ext2/3, NTFS
-	    filesystems, creating and installing to encrypted file
-	    systems, improved Rescue Mode with FirstAidKit,
-	    independent locations for the second stage installer and
-	    the software packages. A redesigned,
-	    larger <filename>netboot.iso</filename> image now features
-	    a second stage installer partly for this reason.
-          </para>
-        </listitem>
-	<listitem>
-	  <para>
-	    Live USB images now support persistence, so your data and
-	    setting changes will be preserved even after rebooting.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <ulink url="http://www.packagekit.org/">PackageKit</ulink>,
-	    a new set of graphical and console tools, with a framework
-	    for cross-distribution software management, has
-	    replaced <application>Pirut</application> in this release
-	    of Fedora. The <application>PackageKit</application>
-	    graphical updater is available instead
-	    of <application>Pup</application>. Behind <application>PackageKit</application>,
-	    the performance of <command>yum</command> has been
-	    significantly improved.
-		</para>
-	</listitem>
-	<listitem>
-	  <para>
-	    FreeIPA makes managing auditing, identity and policy
-	    processes easier by providing web-based and command line
-	    provisioning, and administration tools to ease system
-	    administration. FreeIPA combines the power of the Fedora
-	    Directory Server with FreeRADIUS, MIT Kerberos, NTP and
-	    DNS to provide an easy, out of the box solution.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <ulink url="http://en.wikipedia.org/wiki/Ext4">Ext4</ulink>,
-	    the next version of the mature and stable ext3 filesystem
-	    is available as a option in this release. Ext4 features
-	    better performance, higher storage capacity and several
-	    other new features.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    This release of Fedora uses
-	    <ulink url="http://upstart.ubuntu.com/"><application>Upstart</application></ulink>,
-	    an event-based replacement for
-	    the <filename>/sbin/init</filename> daemon.
-	  </para>
-        </listitem>
-	<listitem>
-	  <para>
-	    Firefox 3 (beta 5) brings a number of major improvements including
-	    a native look and feel, desktop integration, the new
-	    Places replacement for bookmarks, and a re-worked address
-	    bar.
-		</para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The completely free and open source Java environment
-	    OpenJDK 6 is installed by
-	    default. <ulink url="http://fedoraproject.org/wiki/IcedTea">IcedTea</ulink>
-	    7, derived from OpenJDK 1.7, is no longer the
-	    default. <ulink url="http://fedoraproject.org/wiki/IcedTea">IcedTea</ulink>
-	    includes a browser plug-in based on GCJ, and is available
-	    for both x86 and x86_64 architectures. GCJ is still the
-	    default on PPC architecture.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <ulink url="http://fedoraproject.org/wiki/OpenOffice">OpenOffice.org</ulink>
-	    2.4, with many new features, is available as part of
-	    Fedora 9.
-	  </para>
-	</listitem>
-	<listitem>
-          <para>
-            Fedora now includes
-            <ulink url="http://perldoc.perl.org/perldelta.html">
-            <application>Perl 5.10.0</application></ulink>, which
-            features a smaller memory footprint and other improvements.
-          </para>
-        </listitem>
-	<listitem>
-	  <para>
-	    Fedora now
-	    includes <ulink url="http://www.tug.org/texlive/">TeXLive</ulink>
-	    to replace the older, unmaintained TeX distribution.
-		</para>
-	</listitem>
-        <listitem>
-          <para>
-            Fedora 9 features a 2.6.25 based kernel.
-          </para>
-        </listitem>
-	<listitem>
-	  <para>
-	    Kernel crashes can be more automatically reported to
-	    <ulink url="http://www.kerneloops.org/" /> and diagnosed
-	    in a friendly way via the <package>kerneloops</package>
-	    package installed by default. Crash signatures are
-	    commonly referred to as oopses in Linux.
-	  </para>
-	</listitem>
-        <listitem>
-          <para>
-            Work on the start-up and shutdown in X has yielded
-            noticeable improvements.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-
-  <section id="sn-Road-Map">
-    <title>Road Map</title>
-
-    <para>
-      The proposed plans for the next release of Fedora are available at
-      <ulink url="http://fedoraproject.org/wiki/RoadMap" />.
-    </para>
-  </section>
-</section>
diff --git a/en-US/PackageChanges.xml b/en-US/PackageChanges.xml
deleted file mode 100644
index db736e2..0000000
--- a/en-US/PackageChanges.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-PackageChanges">
-  <title>Package Changes</title>
-
-  <para>
-    For a list of packages that were updated since the previous release,
-    refer to
-    <ulink url='http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages'>http://fedoraproject.org/wiki/Docs/Beats/PackageChanges/UpdatedPackages</ulink>.
-    You can also find a comparison of major packages between all Fedora
-    versions at
-    <ulink url='http://distrowatch.com/fedora'>http://distrowatch.com/fedora</ulink>.
-  </para>
-</section>
diff --git a/en-US/PackageNotes.xml b/en-US/PackageNotes.xml
deleted file mode 100644
index 1faa9a3..0000000
--- a/en-US/PackageNotes.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-PackageNotes">
-  <title>Package Notes</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    The following sections contain information regarding software
-    packages that have undergone significant changes for Fedora 9. For
-    easier access, they are generally organized using the same groups
-    that are shown in the installation system.
-  </para>
-  
-  <section id="sn-sound-card-utility-changes">
-	  <title>Sound Card Utility</title>
-	  <para>
-		  The <command>system-config-soundcard</command> utility has been removed, due to <ulink url="https://www.redhat.com/archives/fedora-devel-list/2008-March/msg02148.html">numerous</ulink> legacy design and implementation issues. Modern technologies, including udev and the HAL, have made certain sound cards work out of the box. Any sound card not working out of the box should be reported as a <ulink url="https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora">bug</ulink>. Preferences can still be fine-tuned within the desktop environment, using, among others, the PulseAudio tools.
-	  </para>
-  </section>
-
-  <section id="sn-perl-changes">
-    <title>Perl</title>
-
-    <para>
-      Fedora 9 now includes Perl 5.10.0, the first "major" release
-      update in perl5 in some time. The Perl interpreter itself is
-      faster with a smaller memory footprint, and has several UTF-8 and
-      threading improvements. The Perl installation is now relocatable,
-      a blessing for systems administrators and operating system
-      packagers. Perl 5.10.0 also adds a new smart match operator, a
-      switch statement, named captures, state variables, and better
-      error messages.
-    </para>
-
-    <para>
-      For more information, refer to:
-    </para>
-
-    <para>
-      <ulink url="http://perldoc.perl.org/perldelta.html"/>
-    </para>
-  </section>
-
-  <section id="sn-yum-changes">
-    <title>Yum Changes</title>
-
-    <para>
-      The <systemitem>installonlyn</systemitem> plugin functionality has
-      been folded into the core <package>yum</package> package. The
-      <option>installonlypkgs</option> and
-      <option>installonly_limit</option> options are used by default to
-      limit the system to retain only two kernel packages. You can
-      adjust the package set or the number of packages, or disable the
-      option entirely to match your preferences. More details are
-      available in the man page for <filename>yum.conf</filename>.
-    </para>
-
-    <para>
-      The <command>yum</command> command now retries when it detects a
-      lock. This function is useful if a daemon is checking for updates,
-      or if you are running <command>yum</command> and one of its
-      graphical frontends simultaneously.
-    </para>
-
-    <para>
-      The <command>yum</command> command now understands a cost
-      parameter in its configuration file, which is the relative cost of
-      accessing a software repository. It is useful for weighing one
-      software repository's packages as greater or less than any other.
-      The cost parameter defaults to 1000, with lower costs given
-      priority.
-    </para>
-    
-    <para>
-      In Fedora 9 Rawhide,
-      the <filename>/etc/yum.repos.d/fedora-development.repo</filename>
-      file has been changed
-      to <filename>/etc/yum.repos.d/fedora-rawhide.repo</filename>. References
-      to <computeroutput>development</computeroutput>
-      in <filename>fedora-rawhide.repo</filename> have been changed
-      to <computeroutput>rawhide</computeroutput>. Due to the way that
-      RPM deals with configuration files, the
-      existing <filename>/etc/yum.repos.d/fedora-development.repo</filename>
-      file is saved
-      as <filename>/etc/yum.repos.d/fedora-development.repo.rpmsave</filename>
-      if it was previous modified. Users of the development repository
-      may need to update scripts custom configuration files to use the
-      new name.
-    </para>
-  </section>
-
-  <section id="sn-pam_mount">
-    <title>pam_mount</title>
-
-    <para>
-      The <systemitem>pam_mount</systemitem> facility now uses a
-      configuration file written in XML. The
-      <filename>/etc/security/pam_mount.conf</filename> file will be
-      converted to <filename>/etc/security/pam_mount.conf.xml</filename>
-      during update with
-      <command>/usr/bin/convert_pam_mount_conf.pl</command>, which
-      removes all comments. Any per-user configuration files must be
-      converted manually, with the conversion script if desired. A
-      sample <filename>pam_mount.conf.xml</filename> file with detailed
-      comments about the available options appears at
-      <filename>/usr/share/doc/pam_mount-*/pam_mount.conf.xml</filename>.
-    </para>
-  </section>
-
-  <section id="sn-texlive">
-    <title>TeXLive</title>
-
-    <para>
-      <ulink url="http://www.tug.org/texlive/">TeXLive</ulink> is a
-      replacement for the old, unmaintained TeX package. It offers new
-      style packages and fixes many security problems with the old
-      distribution.
-    </para>
-  </section>
-
-  <section id="sn-ltsp">
-    <title>LTSP</title>
-    <para>
-      The Linux Terminal Server Project (LTSP) has been included
-      directly into Fedora 9. Work is ongoing. For the latest news and
-      documentation, refer to:
-    </para>
-    <para>
-      <ulink url="http://k12linux.fedorahosted.org/" />
-    </para>
-  </section>
-
-  <section id="sn-utility-packages">
-    <title>Utility Packages</title>
-    <para>
-	    The <package>nautilus-open-terminal</package> package now uses a GConf key to control its behavior when launched by right-clicking the Desktop. To enable its previous behavior, which opens the resulting terminal in the user's home directory, use this command:
-    </para>
-    <para>
-<screen>
-gconftool-2 -s /apps/nautilus-open-terminal/desktop_opens_home_dir --type=bool true
-</screen>
-    </para>
- 
-    <para>
-      The <package>i810switch</package> package has been removed. This
-      functionality is now available through the
-      <command>xrandr</command> command in the
-      <package>xorg-x11-server-utils</package> package.
-    </para>
-
-    <para>
-      The <package>evolution-exchange</package> package replaces
-      <package>evolution-connector</package> , and provides a capability
-      under the old name.
-    </para>
-
-    <para>
-      The <package>system-config-firewall</package> and
-      <package>system-config-selinux</package> packages replace
-      <package>system-config-security-level</package> . The
-      <package>system-config-selinux</package> package is part of the
-      <package>policycoreutils-gui</package> package.
-    </para>
-  </section>
-  
-  <section id="pilotlink-hal-policykit">
-	  <title>pilot-link and HAL/PolicyKit Interaction</title>
-	  <para>
-		  The <package>pilot-link</package> package now blacklists the <computeroutput>visor</computeroutput> module by default. Users are encouraged to try the direct USB access present in recent versions of <package>pilot-link</package>. This is enabled by passing the <option>--port usb:</option> option to the various <package>pilot-link</package> tools, instead of the serial devices used in the past (typically <filename>/dev/pilot</filename> or <filename>/dev/ttyUSB0</filename>, <filename>/dev/ttyUSB1</filename>, and so forth). For example:
-	  </para>
-<screen>
-pilot-xfer --port usb: --list
-</screen>
-	   <para>
-		   The <package>hal-info</package> and <package>hal</package> packages have been updated to correctly set permissions for the necessary USB devices using PolicyKit. If you have any existing manual configurations, revert the changes to avoid possible conflicts.
-	   </para>
-	   <para>
-		   For further information, refer to the <filename>README.fedora</filename> included in the <package>pilot-link</package> package.
-	   </para>
-   </section>
-   
-  <section id="sn-package-legal-info">
-    <title>Legal Information</title>
-    <para>
-      The following legal information concerns some software in
-      Fedora.
-    </para>
-    <screen><![CDATA[Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig]]></screen>
-  </section>
-
-</section>
diff --git a/en-US/ProjectOverview.xml b/en-US/ProjectOverview.xml
deleted file mode 100644
index b3727f0..0000000
--- a/en-US/ProjectOverview.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-ProjectOverview">
-  <title>Fedora Project</title>
-
-  <para>
-    The goal of the Fedora Project is to work with the Linux community
-    to build a complete, general-purpose operating system exclusively
-    from open source software. The Fedora Project is driven by the
-    individuals that contribute to it. As a tester, developer,
-    documenter, or translator, you can make a difference. Refer to
-    <ulink url="http://fedoraproject.org/join-fedora.html"/> for
-    details. For information on the channels of communication for Fedora
-    users and contributors, refer to
-    <ulink
-      url="http://fedoraproject.org/wiki/Communicate"/>.
-  </para>
-
-  <para>
-    The Fedora Project is driven by the individuals that contribute to
-    it. As a tester, developer, documenter, or translator, you can make
-    a difference. See
-    <ulink url='http://fedoraproject.org/wiki/Join'>http://fedoraproject.org/wiki/Join</ulink>
-    for details. For information on the channels of communication for
-    Fedora users and contributors, refer to
-    <ulink url='http://fedoraproject.org/wiki/Communicate'>http://fedoraproject.org/wiki/Communicate</ulink>.
-  </para>
-
-  <para>
-    In addition to the website, the following mailing lists are
-    available:
-  </para>
-
-  <itemizedlist>
-    <listitem>
-      <para>
-        <ulink url='mailto:fedora-list at redhat.com'>fedora-list at redhat.com</ulink>,
-        for users of Fedora releases
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <ulink url='mailto:fedora-test-list at redhat.com'>fedora-test-list at redhat.com</ulink>,
-        for testers of Fedora test releases
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <ulink url='mailto:fedora-devel-list at redhat.com'>fedora-devel-list at redhat.com</ulink>,
-        for developers, developers, developers
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <ulink url='mailto:fedora-docs-list at redhat.com'>fedora-docs-list at redhat.com</ulink>,
-        for participants of the Documentation Project
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <para>
-    To subscribe to any of these lists, send an email with the word
-    "subscribe" in the subject to
-    <replaceable>&lt;listname>-request</replaceable>, where
-    <replaceable>&lt;listname></replaceable> is one of the above list
-    names. Alternately, you can subscribe to Fedora mailing lists
-    through the Web interface at
-    <ulink
-      url='http://www.redhat.com/mailman/listinfo/'>http://www.redhat.com/mailman/listinfo/</ulink>.
-  </para>
-
-  <para>
-    The Fedora Project also uses several IRC (Internet Relay Chat)
-    channels. IRC is a real-time, text-based form of communication,
-    similar to Instant Messaging. With it, you may have conversations
-    with multiple people in an open channel, or chat with someone
-    privately one-on-one. To talk with other Fedora Project participants
-    via IRC, access the Freenode IRC network. Refer to the Freenode
-    website at
-    <ulink url='http://www.freenode.net/'>http://www.freenode.net/</ulink>
-    for more information.
-  </para>
-
-  <para>
-    Fedora Project participants frequent the #fedora channel on the
-    Freenode network, while Fedora Project developers may often be found
-    on the #fedora-devel channel. Some of the larger projects may have
-    their own channels as well. This information may be found on the
-    webpage for the project, and at
-    <ulink
-      url='http://fedoraproject.org/wiki/Communicate'>http://fedoraproject.org/wiki/Communicate</ulink>.
-  </para>
-
-  <para>
-    In order to talk on the #fedora channel, you need to register your
-    nickname, or <firstterm>nick</firstterm>. Instructions are given
-    when you <command>/join</command> the channel.
-  </para>
-
-  <note>
-    <title>IRC Channels</title>
-
-    <para>
-      The Fedora Project and Red Hat have no control over the Fedora
-      Project IRC channels or their content.
-    </para>
-  </note>
-</section>
diff --git a/en-US/Runtime.xml b/en-US/Runtime.xml
deleted file mode 100644
index 4d20cae..0000000
--- a/en-US/Runtime.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Runtime</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Runtime</title>
-      <section id="">
-        <title>Runtime </title>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Security_SELinux.xml b/en-US/Security_SELinux.xml
deleted file mode 100644
index 011140c..0000000
--- a/en-US/Security_SELinux.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Security/SELinux</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Security/SELinux</title>
-      <section id="">
-        <title>SELinux </title>
-        <para>The SELinux project pages have troubleshooting tips, explanations, and pointers to documentation and references.  Some useful links include the following:</para>
-        <itemizedlist>
-          <listitem>
-            <para> New SELinux project pages: <ulink url="http://fedoraproject.org/w/index.php?title=SELinux">SELinux</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Troubleshooting tips: <ulink url="http://fedoraproject.org/w/index.php?title=SELinux/Troubleshooting">SELinux/Troubleshooting</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Frequently Asked Questions: <ulink url="http://docs.fedoraproject.org/selinux-faq/"> SELinux FAQ</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Listing of SELinux commands: <ulink url="http://fedoraproject.org/w/index.php?title=SELinux/Commands">SELinux/Commands</ulink>
-            </para>
-          </listitem><listitem>
-            <para> Details of confined domains: <ulink url="http://fedoraproject.org/w/index.php?title=SELinux/Domains">SELinux/Domains</ulink>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/SystemDaemons.xml b/en-US/SystemDaemons.xml
deleted file mode 100644
index 301bc4e..0000000
--- a/en-US/SystemDaemons.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-System-Services">
-  <title>System Services</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <section id="sn-Upstart">
-    <title>Upstart</title>
-
-    <para>
-      Fedora 9 features the Upstart initialization system. All System V
-      init scripts should run fine in compatibility mode. However, users
-      who have made customizations to their
-      <filename>/etc/inittab</filename> file will need to port those
-      modifications to upstart. For information on how upstart works, see the <command>init(8)</command> and <command>initctl(8)</command> man pages. For information on writing upstart scripts, see the <command>events(5)</command> man page, and also the Upstart Getting Started Guide:
-    </para>
-    <para>
-	    <ulink url="http://upstart.ubuntu.com/getting-started.html" />
-    </para>
-    <para>
-	    Due to the change of init systems, it is recommended that users who do an upgrade on a live file system to Fedora 9, reboot soon afterwards.
-    </para>
-</section>
-    
-    <section id="NetworkManager">
-	    <title>NetworkManager</title>
-	    <para>
-		    Fedora 9 features <ulink url="http://fedoraproject.org/wiki/NetworkManager">NetworkManager</ulink>. NetworkManager 0.7 provides improved mobile broadband support, including GSM and CDMA devices, and now supports multiple devices, ad-hoc networking for sharing connections, and the use of system-wide network configuration. It is now enabled by default on all installations. When using NetworkManager, be aware of the following:
-	    </para>
-	    
-	    <itemizedlist>
-		    <listitem>
-			    <para>
-				    NetworkManager does not currently support all virtual device types. Users who use bridging, bonding, or VLANs may need to switch to the old network service after configuration of those interfaces.
-			    </para>
-		    </listitem>
-		    <listitem>
-			    <para>
-				    NetworkManager starts the network asynchronously. Users who have applications that require the network to be fully initialized during boot should set the <option>NETWORKWAIT</option> variable in <filename>/etc/sysconfig/network</filename>. Please <ulink url="https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora">file bugs</ulink> about cases where this is necessary, so we can fix the applications in question.
-			    </para>
-		    </listitem>
-	    </itemizedlist>
-  </section>
-  
-  <section id="sn-services-Autofs">
-	  <title>Autofs</title>
-	  <para>
-		  Autofs is no longer installed by default. Users who wish to use Autofs can choose it from the <guimenu>System Tools</guimenu> group in the installer, or with the package installation tools.
-	  </para>
-  </section>
-  
-</section>
diff --git a/en-US/WebServers.xml b/en-US/WebServers.xml
deleted file mode 100644
index b0a524b..0000000
--- a/en-US/WebServers.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-WebServers">
-  <title>Web Servers</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <section id="sn-dbd-driver">
-    <title>PostgreSQL DBD Driver</title>
-
-    <para>
-      Users of the <filename>mod_dbd</filename> module should note that
-      the <filename>apr-util</filename> DBD driver for PostgreSQL is now
-      distributed as a separate dynamically-loaded module. The driver
-      module is now included in the <package>apr-util-pgsql</package>
-      package. A MySQL driver is now also available, in the
-      <package>apr-util-mysql</package> package.
-    </para>
-  </section>
-
-  <section id="sn-turbogears-apps">
-    <title>TurboGears Applications</title>
-
-    <para>
-      SQLAlchemy has been updated to 0.4.x. TurboGears Applications
-      developed using SQLAlchemy for their database layer will need to
-      update their startup scripts. Instead of:
-    </para>
-<screen><![CDATA[import pkg_resources
-pkg_resources.require('TurboGears')]]></screen>
-    <para>
-      the start script needs to have:
-    </para>
-<screen><![CDATA[__requires__ = 'TurboGears[future]'
-import pkg_resources]]></screen>
-  </section>
-
-  <section id="sn-Drupal">
-    <title>Drupal</title>
-
-    <para>
-      Drupal has been updated from the 5.x series to 6.2. For details,
-      refer to:
-    </para>
-
-    <para>
-      <ulink url="http://drupal.org/drupal-6.2" />
-    </para>
-
-    <para>
-      Remember to log in to your site as the admin user, and disable any
-      third-party modules before upgrading this package. After upgrading
-      the package:
-    </para>
-    <orderedlist>
-      <listitem>
-        <para>
-          Copy
-          <filename>/etc/drupal/default/settings.php.rpmsave</filename>
-          to <filename>/etc/drupal/default/settings.php</filename>, and
-          repeat for any additional sites' settings.php files.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Browse to <ulink url="http://host/drupal/update.php" /> to run
-          the upgrade script.
-        </para>
-      </listitem>
-    </orderedlist>
-  </section>
-  
-  <section id="sn-Squid">
-	  <title>Squid</title>
-	  <para>
-		  Squid has been updated from version 2.6 to 3.0.STABLE2. The configuration files are not entirely backwards compatible. For further details, refer to the Squid release notes:
-	  </para>
-	  <para>
-		  <ulink url="http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE2-RELEASENOTES.html" />
-	  </para>
-	  <para>
-		  As well, due to a bug, the transparent proxy does not work. This should be resolved after the first update.
-	  </para>
-  </section>
-</section>
diff --git a/en-US/Welcome.xml b/en-US/Welcome.xml
deleted file mode 100644
index ffae2ed..0000000
--- a/en-US/Welcome.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Welcome">
-  <title>Welcome to Fedora</title>
-
-  <para>
-    The Fedora Project is a Red Hat sponsored and community supported
-    open source project. Its goal is the rapid progress of free and open
-    source software and content. The Fedora Project makes use of public
-    forums, open processes, rapid innovation, meritocracy, and
-    transparency in pursuit of the best operating system and platform
-    that free and open source software can provide.
-  </para>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <important>
-    <title>Older Release Notes on the Web</title>
-
-    <para>
-      If you are migrating from a release of Fedora older than the
-      immediately previous one, you should refer to older Release Notes
-      for additional information. You can find older Release Notes at
-      <ulink
-	url="http://docs.fedoraproject.org/release-notes/"/>.
-    </para>
-  </important>
-
-  <para>
-    You can help the Fedora Project community continue to improve Fedora
-    if you file bug reports and enhancement requests. Refer to
-    <ulink url='http://fedoraproject.org/wiki/BugsAndFeatureRequests' />
-    for more information about bugs. Thank you for your participation.
-  </para>
-
-  <para>
-    To find out more general information about Fedora, refer to the
-    following Web pages:
-  </para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Fedora Overview</para>
-      <para><ulink url='http://fedoraproject.org/wiki/Overview'/></para>
-    </listitem>
-    <listitem>
-      <para>Fedora FAQ</para>
-      <para><ulink url='http://fedoraproject.org/wiki/FAQ'/></para>
-    </listitem>
-    <listitem>
-      <para>Help and Discussions</para>
-      <para><ulink url='http://fedoraproject.org/wiki/Communicate'/></para>
-    </listitem>
-    <listitem>
-      <para>Participate in the Fedora Project</para>
-      <para><ulink url='http://fedoraproject.org/wiki/Join'/></para>
-    </listitem>
-  </itemizedlist>
-
-  <note>
-    <title>Document Links</title>
-
-    <para>
-      Many links may not work properly from within the installation
-      environment, due to resource constraints. The release notes are
-      also available post-installation as part of the desktop Web
-      browser's default home page. If you are connected to the internet,
-      use these links to find other helpful information about Fedora and
-      the community that creates and supports it.
-    </para>
-  </note>
-</section>
diff --git a/en-US/Xorg.xml b/en-US/Xorg.xml
deleted file mode 100644
index b9b5170..0000000
--- a/en-US/Xorg.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
-
-<section id="sn-Xorg">
-  <title>X Window System (Graphics)</title>
-  <note>
-    <title>Latest Release Notes on the Web</title>
-    <para>
-      These release notes may be updated. To view the latest release
-      notes for Fedora, visit:
-    </para>
-    <para>
-      <ulink
-	url='http://docs.fedoraproject.org/release-notes/'/>
-    </para>
-  </note>
-  <para>
-    This section contains information related to the X Window System
-    implementation, X.Org, provided with Fedora.
-  </para>
-
-  <section id="sn-Faster-X-Start-up-and-Shutdown">
-    <title>Faster X Start-up and Shutdown</title>
-
-    <para>
-      Fedora 9 features a number of changes designed to make X faster in
-      starting and shutting down and to make other improvements. Full
-      details of the project can be found through this feature page:
-    </para>
-
-    <para>
-      <ulink url="http://fedoraproject.org/wiki/Features/OneSecondX" />.
-    </para>
-  </section>
-
-  <section id="sn-X-Configuration-Changes">
-    <title>X Configuration Changes</title>
-
-    <para>
-      The X.Org 1.4.99 X server has been modified to automatically
-      detect and configure most hardware, eliminating the need to modify
-      the <filename>/etc/X11/xorg.conf</filename> configuration file.
-      The only hardware configured by default in the
-      <filename>xorg.conf</filename> configuration file written by
-      <application>Anaconda</application> is:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          the graphics driver, and
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          the keyboard map
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      All other hardware, such as monitors (both LCD and CRT), USB mice,
-      and touchpads, should be detected and configured automatically.
-    </para>
-
-    <para>
-      The X server queries the attached monitor for supported resolution
-      ranges, and attempts to pick the highest resolution available with
-      the correct aspect ratio for the display. Set the preferred
-      resolution in <menuchoice>
-      <guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Screen
-      Resolution</guimenuitem></menuchoice>, and the default resolution
-      for the system in <menuchoice>
-      <guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Display</guimenuitem></menuchoice>.
-    </para>
-
-    <para>
-      If the <filename>/etc/X11/xorg.conf</filename> configuration file
-      is not present, X automatically detects the appropriate driver,
-      and assumes a 105-key US keyboard layout.
-    </para>
-    <para>
-      In certain situations,
-      the <computeroutput>evdev</computeroutput> driver was used, even
-      when the <computeroutput>kbd</computeroutput> driver was
-      specified in <filename>/etc/X11/xorg.conf</filename>. Removing
-      the <computeroutput>evdev</computeroutput> driver caused errors
-      and warnings such as the following:
-    </para>
-    <screen><![CDATA[
-(WW) Warning, couldn't open module evdev
-(II) UnloadModule: "evdev"
-(EE) Failed to load module "evdev" (module does not exist, 0)
-(EE) No input driver matching `evdev'
-[config/hal] NewInputDeviceRequest failed
-(II) LoadModule: "evdev"]]></screen>
-    <para>
-      In Fedora 9, the XKB settings are read
-      from <filename>/etc/sysconfig/keyboard</filename>, which gives
-      users the correct layout. The <option>KEYTABLE</option> option,
-      configured in <filename>/etc/sysconfig/keyboard</filename>, also
-      sets the layout for X. The <option>XKB_VARIANT</option>
-      and <option>XKB_OPTIONS</option> variables can be configured to
-      customize XKB.
-    </para>
-  </section>
-
-  <section id="sn-Third-Party-Video-Drivers">
-    <title>Third Party Video Drivers</title>
-
-    <para>
-      Refer to the
-      <ulink url="http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers">Xorg
-      third-party drivers</ulink> page for detailed guidelines on using
-      third-party video drivers.
-    </para>
-  </section>
-</section>


commit 382089ae078669d1791ab690761b1b41f95c09a8
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Wed Oct 15 07:00:00 2008 -0700

    File's contents are pulled in to the over-arching Development.xml already.
    
    * mw-render did such a good job that Tools.xml was pulled in to Development.xml because of transclusion in the original location.  No need for this many extra section files.

diff --git a/en-US/Tools.xml b/en-US/Tools.xml
deleted file mode 100644
index 9242d7a..0000000
--- a/en-US/Tools.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools</title>
-      <section id="">
-        <title>Tools </title>
-        <section id="">
-          <title>Eclipse </title>
-          <para>This release of Fedora includes Fedora Eclipse, based on the <ulink url="http://www.eclipse.org"> Eclipse</ulink> SDK version 3.4.  The 3.4 series of releases has a <ulink url="http://help.eclipse.org/stable/index.jsp?topic=/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html"> "What's New in 3.4" page</ulink> , and <ulink url="http://www.eclipse.org/eclipse/development/readme_eclipse_3.4.html"> release notes specific to 3.4</ulink>  are also available.</para><para>Some of the notable features in 3.4 include a number of improvements in handling bookmarks, easier ways to find and install plug-ins, and additional help with refactoring.</para>
-        </section><section id="">
-          <title>Additional plugins </title>
-          <para>This release of Fedora includes plugins for C/C++ <programlisting format="linespecific">eclipse-cdt</programlisting>, RPM specfile editing <programlisting format="linespecific">eclipse-rpm-editor</programlisting>, PHP <programlisting format="linespecific">eclipse-phpeclipse</programlisting>, Subversion <programlisting format="linespecific">eclipse-subclipse</programlisting>, SELinux <programlisting format="linespecific">eclipse-slide</programlisting> and <programlisting format="linespecific">eclipse-setools</programlisting>, regular expression testing <programlisting format="linespecific">eclipse-quickrex</programlisting>, Fortran <programlisting format="linespecific">eclipse-photran</programlisting>, Bugzilla integration <programlisting format="linespecific">eclipse-mylyn</programlisting>, Git <programlisting format="linespecific">eclipse-egit</programlisting>, Perl <programlisting format="linespecific">eclipse-epic</programlisting>, Checkstyle <programlisti
 ng format="linespecific">eclipse-checkstyle</programlisting>, and Python <programlisting format="linespecific">eclipse-pydev</programlisting>.</para><section id="">
-            <title>Translations from the Babel project [eclipse-nls] </title>
-            <para>This release also includes the Babel language packs, which provide translations for Eclipse and Eclipse plugins in a number of languages.  Note that some of the languages have very low coverage: even if you have the translations installed, you will probably still see many strings in English.  The Babel project accepts contributions if you would like to help their translation efforts.</para>
-            <para>
-              <ulink url="http://www.eclipse.org/babel/">http://www.eclipse.org/babel/</ulink>
-            </para>
-          </section><section id="">
-            <title>Upgrading from Fedora 9 </title>
-            <para>Users upgrading from Eclipse 3.3 will need to migrate any plug-ins they have installed from sources other than RPMs. The simplest way to do this is to re-install.  For plug-in developers migrating from 3.3, refer to the "Plug-in Migration Guide":</para>
-            <para>[<ulink url="http://help.eclipse.org/ganymede/nav/2_3">http://help.eclipse.org/ganymede/nav/2_3</ulink>
-            </para>
-          </section>
-        </section><section id="">
-          <title>GCC Compiler Collection </title>
-          <para>This release of Fedora has been built with GCC 4.3.2, which is included with the distribution. </para>
-          <para> For more information on GCC 4.3, refer to:</para>
-          <para>
-            <ulink url="http://gcc.gnu.org/gcc-4.3/">http://gcc.gnu.org/gcc-4.3/</ulink>
-          </para><section id="">
-            <title>Target-Specific Improvements </title>
-            <section id="">
-              <title>IA-32/x86-64 </title>
-              <para>
-                <emphasis>ABI changes</emphasis>
-              </para><itemizedlist>
-                <listitem>
-                  <para> Starting with GCC 4.3.1, decimal floating point variables are aligned to their natural boundaries when they are passed on the stack for i386.</para>
-                </listitem>
-              </itemizedlist><para>
-                <emphasis>Command-line changes</emphasis>
-              </para><itemizedlist>
-                <listitem>
-                  <para> Starting with GCC 4.3.1, the <programlisting format="linespecific">-mcld</programlisting> option has been added to automatically generate a <programlisting format="linespecific">cld</programlisting> instruction in the prologue of functions that use string instructions. This option is used for backward compatibility on some operating systems and can be enabled by default for 32-bit x86 targets by configuring GCC with the <programlisting format="linespecific">--enable-cld</programlisting> configure option.</para>
-                </listitem>
-              </itemizedlist>
-            </section>
-          </section>
-        </section><section id="">
-          <title>Improved Haskell support </title>
-          <para>Fedora 10 introduces better support for Haskell.  With a new set of packaging guidelines and tools, it is incredibly easy to support any Haskell program using the Glasgow Haskell Compiler.  Package creation and deployment, leveraging Fedora's quality tools plus a few new friends has never been easier.  As support for Haskell grows there will be continued development for Haskell as more libraries are introduced.</para>
-          <para>Package creation is quite simple.  Haskell already provides the infrastructure for compiling and deploying packages consistently. Setting up a package for Fedora takes very little time, meaning code that works in Haskell works in Fedora too.</para>
-          <para>Fedora also provides tools for enterprise deployment of Fedora packages.  With the inclusion of Haskell in Fedora, the developer is now free to write enterprise level applications in Haskell and feel secure knowing the code can be used in Fedora.</para>
-          <para>
-            <ulink url="https://fedoraproject.org/wiki/Features/GoodHaskellSupport">https://fedoraproject.org/wiki/Features/GoodHaskellSupport</ulink>
-          </para>
-        </section><section id="">
-          <title>Objective CAML (OCaml) coverage greatly extended </title>
-          <para>Fedora 10 contains the OCaml 3.10.2 advanced programming language and a very comprehensive list of packages:</para>
-          <para>
-            <ulink url="http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora#Package_status">http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora#Package_status</ulink>
-          </para><para>OCaml was available as an update to Fedora 9 but not in the initial release. </para>
-        </section><section id="">
-          <title>NetBeans </title>
-          <para>This release of Fedora includes NetBeans IDE,  version 6.1. NetBeans IDE is an Integrated Development Environment (IDE) for Java, C/C++, Ruby, PHP,  etc. Default configuration of the NetBeans IDE (Java SE IDE configuration) supports development of programs for the Java platform, Standard Edition (Java SE), including development of the modules for the NetBeans Platform.</para>
-          <para>The NetBeans IDE is a modular system and includes facilities for updating and installing plugins. There is a wide spectrum of plugins for the NetBeans IDE that are provided by community members and third-party companies.</para>
-          <section id="">
-            <title>Resources </title>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ulink url="http://www.netbeans.org/">http://www.netbeans.org/</ulink> - Official site of the NetBeans project.</para>
-              </listitem><listitem>
-                <para>
-                  <ulink url="http://wiki.netbeans.org/">http://wiki.netbeans.org/</ulink> - NetBeans Wiki pages.</para>
-              </listitem><listitem>
-                <para>
-                  <emphasis>linux-packaging at installer.netbeans.org</emphasis> - Mailing list for discussion of the packaging issues.</para>
-              </listitem><listitem>
-                <para>
-                  <ulink url="https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans">https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans</ulink> - Bug list for the NetBeans IDE.</para>
-              </listitem><listitem>
-                <para>
-                  <ulink url="https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans-platform8">https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans-platform8</ulink> - Bug list for the NetBeans Platform.</para>
-              </listitem><listitem>
-                <para>
-                  <ulink url="http://www.netbeans.org/issues/">http://www.netbeans.org/issues/</ulink> -  Issue Tracker of the NetBeans project. Please, use <emphasis>Component: installer</emphasis>, <emphasis>OS: Linux</emphasis>, <emphasis>Subcomponent: rpm</emphasis> to file the issues related to the NetBeans RPMs.</para>
-              </listitem>
-            </itemizedlist>
-          </section>
-        </section><section id="">
-          <title>AMQP Infrastructure </title>
-          <para> The AMQP Infrastructure package is a subset of the RedHat Enterprise MRG. The package allows for development of scalable, interoperable and high-performance enterprise applications. </para>
-          <para>More specifically it consists of the following.  </para>
-          <itemizedlist>
-            <listitem>
-              <para> AMQP (protocol version 0-10) messaging broker/server</para>
-            </listitem><listitem>
-              <para> Client bindings for C++, Python, and Java (using the JMS interface)</para>
-            </listitem><listitem>
-              <para> A set of command line interface configuration/management utilities</para>
-            </listitem><listitem>
-              <para> A high-performance asynchronous message store for durable messages and messaging configuration.</para>
-            </listitem>
-          </itemizedlist><para />
-          <section id="">
-            <title>Resources </title>
-            <para>For more information refer to the following resources.</para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ulink url="http://www.redhat.com/mrg/resources">http://www.redhat.com/mrg/resources</ulink> RedHat MRG Documentation</para>
-              </listitem><listitem>
-                <para>
-                  <ulink url="http://amqp.org/">http://amqp.org/</ulink> AMQP Project Site</para>
-              </listitem>
-            </itemizedlist>
-          </section>
-        </section><section id="">
-          <title>Appliance Building Tools </title>
-          <para>Appliances are pre-installed and pre-configured system images. This package includes tools and meta-data that make it easier for ISVs, developers, OEMS, etc. to create and deploy virtual appliances. The two components of this feature are the ACT (Appliance Creation Tool) and the AOS (The Appliance Operating System).  Install the <programlisting format="linespecific">appliance-tools</programlisting> package with <emphasis>Add/Remove Software</emphasis> or <programlisting format="linespecific">
-              <para>yum<programlisting format="linespecific">
-                  <para>.</para>
-                </programlisting>
-              </para>
-            </programlisting>
-          </para><section id="">
-            <title>Appliance Creation Tool </title>
-            <para>The Appliance Creation Tool is a tool that creates Appliance Images from a kickstart file. This tool uses the live CD creator API as well as patches to the live CD API that allow for the creation of multi-partitioned disk images. These disk images can then be booted in a virtual container such as Xen, KVM, and VMware. This tool is included in the <programlisting format="linespecific">appliance-tools</programlisting> package. This package contains tools for building appliance images on Fedora based systems including derived distributions such as RHEL, CentOS, and others.</para>
-          </section><section id="">
-            <title>Appliance Operating System </title>
-            <para>The Appliance Operating System is a scaled down version of Fedora with a small footprint. It contains only the packages necessary to run an appliance. The hardware supported by this spin of Fedora would be limited, primarily focusing on virtual containers such as KVM and VMware. The goal is to create a base that developers can build their applications on top of, only pulling in packages that their software requires.</para>
-          </section><section id="">
-            <title>Resources </title>
-            <para>
-              <ulink url="http://thincrust.net/">http://thincrust.net/</ulink> -- Appliance Tool Project Site </para>
-          </section>
-        </section><section id="">
-          <title>Python NSS Bindings </title>
-          <para>Python bindings for NSS/NSPR allow Python programs to utilize the NSS cryptographic libraries for SSL/TLS and PKI certificate management.  The <programlisting format="linespecific">python-nss</programlisting> package provides a Python binding to the NSS and NSPR support libraries.</para><para>Network Security Services (NSS) is a set of libraries supporting security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates and other security standards. NSS has received FIPS 140 validation from NIST. </para>
-          <section id="">
-            <title>Resources </title>
-            <para>
-              <ulink url="http://people.redhat.com/jdennis/python-nss/doc/api/html/index.html">http://people.redhat.com/jdennis/python-nss/doc/api/html/index.html</ulink> -- Library Documentation</para>
-          </section>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file


commit 47c18b754e282a49c73beb7cee762a0836bcfef6
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Wed Oct 15 06:54:27 2008 -0700

    Content from set of files were included in the mw-render output in the master Tool.xml file instead.
    
    * mw-render did a good job of pulling content that was transcluded, so these files are duplicates of sections that are within Tools.xml.  There is no value in having them as individual files.

diff --git a/en-US/AMQP_Infrastructure.xml b/en-US/AMQP_Infrastructure.xml
deleted file mode 100644
index c96c0d0..0000000
--- a/en-US/AMQP_Infrastructure.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/AMQP</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/AMQP</title>
-      <section id="">
-        <title>AMQP Infrastructure </title>
-        <para> The AMQP Infrastructure package is a subset of the RedHat Enterprise MRG. The package allows for development of scalable, interoperable and high-performance enterprise applications. </para>
-        <para>More specifically it consists of the following.  </para>
-        <itemizedlist>
-          <listitem>
-            <para> AMQP (protocol version 0-10) messaging broker/server</para>
-          </listitem><listitem>
-            <para> Client bindings for C++, Python, and Java (using the JMS interface)</para>
-          </listitem><listitem>
-            <para> A set of command line interface configuration/management utilities</para>
-          </listitem><listitem>
-            <para> A high-performance asynchronous message store for durable messages and messaging configuration.</para>
-          </listitem>
-        </itemizedlist><para />
-        <section id="">
-          <title>Resources </title>
-          <para>For more information refer to the following resources.</para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <ulink url="http://www.redhat.com/mrg/resources">http://www.redhat.com/mrg/resources</ulink> RedHat MRG Documentation</para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://amqp.org/">http://amqp.org/</ulink> AMQP Project Site</para>
-            </listitem>
-          </itemizedlist>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Appliance_Building_Tools.xml b/en-US/Appliance_Building_Tools.xml
deleted file mode 100644
index 65ff62d..0000000
--- a/en-US/Appliance_Building_Tools.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/ApplianceTools</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/ApplianceTools</title>
-      <section id="">
-        <title>Appliance Building Tools </title>
-        <para>Appliances are pre-installed and pre-configured system images. This package includes tools and meta-data that make it easier for ISVs, developers, OEMS, etc. to create and deploy virtual appliances. The two components of this feature are the ACT (Appliance Creation Tool) and the AOS (The Appliance Operating System).  Install the <programlisting format="linespecific">appliance-tools</programlisting> package with <emphasis>Add/Remove Software</emphasis> or <programlisting format="linespecific">
-            <para>yum<programlisting format="linespecific">
-                <para>.</para>
-              </programlisting>
-            </para>
-          </programlisting>
-        </para><section id="">
-          <title>Appliance Creation Tool </title>
-          <para>The Appliance Creation Tool is a tool that creates Appliance Images from a kickstart file. This tool uses the live CD creator API as well as patches to the live CD API that allow for the creation of multi-partitioned disk images. These disk images can then be booted in a virtual container such as Xen, KVM, and VMware. This tool is included in the <programlisting format="linespecific">appliance-tools</programlisting> package. This package contains tools for building appliance images on Fedora based systems including derived distributions such as RHEL, CentOS, and others.</para>
-        </section><section id="">
-          <title>Appliance Operating System </title>
-          <para>The Appliance Operating System is a scaled down version of Fedora with a small footprint. It contains only the packages necessary to run an appliance. The hardware supported by this spin of Fedora would be limited, primarily focusing on virtual containers such as KVM and VMware. The goal is to create a base that developers can build their applications on top of, only pulling in packages that their software requires.</para>
-        </section><section id="">
-          <title>Resources </title>
-          <para>
-            <ulink url="http://thincrust.net/">http://thincrust.net/</ulink> -- Appliance Tool Project Site</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Eclipse.xml b/en-US/Eclipse.xml
deleted file mode 100644
index cc9f184..0000000
--- a/en-US/Eclipse.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/Eclipse</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/Eclipse</title>
-      <section id="">
-        <title>Eclipse </title>
-        <para>This release of Fedora includes Fedora Eclipse, based on the <ulink url="http://www.eclipse.org"> Eclipse</ulink> SDK version 3.4.  The 3.4 series of releases has a <ulink url="http://help.eclipse.org/stable/index.jsp?topic=/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html"> "What's New in 3.4" page</ulink> , and <ulink url="http://www.eclipse.org/eclipse/development/readme_eclipse_3.4.html"> release notes specific to 3.4</ulink>  are also available.</para><para>Some of the notable features in 3.4 include a number of improvements in handling bookmarks, easier ways to find and install plug-ins, and additional help with refactoring.</para>
-      </section><section id="">
-        <title>Additional plugins </title>
-        <para>This release of Fedora includes plugins for C/C++ <programlisting format="linespecific">eclipse-cdt</programlisting>, RPM specfile editing <programlisting format="linespecific">eclipse-rpm-editor</programlisting>, PHP <programlisting format="linespecific">eclipse-phpeclipse</programlisting>, Subversion <programlisting format="linespecific">eclipse-subclipse</programlisting>, SELinux <programlisting format="linespecific">eclipse-slide</programlisting> and <programlisting format="linespecific">eclipse-setools</programlisting>, regular expression testing <programlisting format="linespecific">eclipse-quickrex</programlisting>, Fortran <programlisting format="linespecific">eclipse-photran</programlisting>, Bugzilla integration <programlisting format="linespecific">eclipse-mylyn</programlisting>, Git <programlisting format="linespecific">eclipse-egit</programlisting>, Perl <programlisting format="linespecific">eclipse-epic</programlisting>, Checkstyle <programlisting
  format="linespecific">eclipse-checkstyle</programlisting>, and Python <programlisting format="linespecific">eclipse-pydev</programlisting>.</para><section id="">
-          <title>Translations from the Babel project [eclipse-nls] </title>
-          <para>This release also includes the Babel language packs, which provide translations for Eclipse and Eclipse plugins in a number of languages.  Note that some of the languages have very low coverage: even if you have the translations installed, you will probably still see many strings in English.  The Babel project accepts contributions if you would like to help their translation efforts.</para>
-          <para>
-            <ulink url="http://www.eclipse.org/babel/">http://www.eclipse.org/babel/</ulink>
-          </para>
-        </section><section id="">
-          <title>Upgrading from Fedora 9 </title>
-          <para>Users upgrading from Eclipse 3.3 will need to migrate any plug-ins they have installed from sources other than RPMs. The simplest way to do this is to re-install.  For plug-in developers migrating from 3.3, refer to the "Plug-in Migration Guide":</para>
-          <para>[<ulink url="http://help.eclipse.org/ganymede/nav/2_3">http://help.eclipse.org/ganymede/nav/2_3</ulink>
-          </para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/GCC_Compiler_Collection.xml b/en-US/GCC_Compiler_Collection.xml
deleted file mode 100644
index c0fb95c..0000000
--- a/en-US/GCC_Compiler_Collection.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/GCC</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/GCC</title>
-      <section id="">
-        <title>GCC Compiler Collection </title>
-        <para>This release of Fedora has been built with GCC 4.3.2, which is included with the distribution. </para>
-        <para> For more information on GCC 4.3, refer to:</para>
-        <para>
-          <ulink url="http://gcc.gnu.org/gcc-4.3/">http://gcc.gnu.org/gcc-4.3/</ulink>
-        </para><section id="">
-          <title>Target-Specific Improvements </title>
-          <section id="">
-            <title>IA-32/x86-64 </title>
-            <para>
-              <emphasis>ABI changes</emphasis>
-            </para><itemizedlist>
-              <listitem>
-                <para> Starting with GCC 4.3.1, decimal floating point variables are aligned to their natural boundaries when they are passed on the stack for i386.</para>
-              </listitem>
-            </itemizedlist><para>
-              <emphasis>Command-line changes</emphasis>
-            </para><itemizedlist>
-              <listitem>
-                <para> Starting with GCC 4.3.1, the <programlisting format="linespecific">-mcld</programlisting> option has been added to automatically generate a <programlisting format="linespecific">cld</programlisting> instruction in the prologue of functions that use string instructions. This option is used for backward compatibility on some operating systems and can be enabled by default for 32-bit x86 targets by configuring GCC with the <programlisting format="linespecific">--enable-cld</programlisting> configure option.</para>
-              </listitem>
-            </itemizedlist>
-          </section>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Improved_Haskell_support.xml b/en-US/Improved_Haskell_support.xml
deleted file mode 100644
index 28225f8..0000000
--- a/en-US/Improved_Haskell_support.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/Haskell</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/Haskell</title>
-      <section id="">
-        <title>Improved Haskell support </title>
-        <para>Fedora 10 introduces better support for Haskell.  With a new set of packaging guidelines and tools, it is incredibly easy to support any Haskell program using the Glasgow Haskell Compiler.  Package creation and deployment, leveraging Fedora's quality tools plus a few new friends has never been easier.  As support for Haskell grows there will be continued development for Haskell as more libraries are introduced.</para>
-        <para>Package creation is quite simple.  Haskell already provides the infrastructure for compiling and deploying packages consistently. Setting up a package for Fedora takes very little time, meaning code that works in Haskell works in Fedora too.</para>
-        <para>Fedora also provides tools for enterprise deployment of Fedora packages.  With the inclusion of Haskell in Fedora, the developer is now free to write enterprise level applications in Haskell and feel secure knowing the code can be used in Fedora.</para>
-        <para>
-          <ulink url="https://fedoraproject.org/wiki/Features/GoodHaskellSupport">https://fedoraproject.org/wiki/Features/GoodHaskellSupport</ulink>
-        </para>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/NetBeans.xml b/en-US/NetBeans.xml
deleted file mode 100644
index ee627ad..0000000
--- a/en-US/NetBeans.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/NetBeans</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/NetBeans</title>
-      <section id="">
-        <title>NetBeans </title>
-        <para>This release of Fedora includes NetBeans IDE,  version 6.1. NetBeans IDE is an Integrated Development Environment (IDE) for Java, C/C++, Ruby, PHP,  etc. Default configuration of the NetBeans IDE (Java SE IDE configuration) supports development of programs for the Java platform, Standard Edition (Java SE), including development of the modules for the NetBeans Platform.</para>
-        <para>The NetBeans IDE is a modular system and includes facilities for updating and installing plugins. There is a wide spectrum of plugins for the NetBeans IDE that are provided by community members and third-party companies.</para>
-        <section id="">
-          <title>Resources </title>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <ulink url="http://www.netbeans.org/">http://www.netbeans.org/</ulink> - Official site of the NetBeans project.</para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://wiki.netbeans.org/">http://wiki.netbeans.org/</ulink> - NetBeans Wiki pages.</para>
-            </listitem><listitem>
-              <para>
-                <emphasis>linux-packaging at installer.netbeans.org</emphasis> - Mailing list for discussion of the packaging issues.</para>
-            </listitem><listitem>
-              <para>
-                <ulink url="https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans">https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans</ulink> - Bug list for the NetBeans IDE.</para>
-            </listitem><listitem>
-              <para>
-                <ulink url="https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans-platform8">https://admin.fedoraproject.org/pkgdb/packages/bugs/netbeans-platform8</ulink> - Bug list for the NetBeans Platform.</para>
-            </listitem><listitem>
-              <para>
-                <ulink url="http://www.netbeans.org/issues/">http://www.netbeans.org/issues/</ulink> -  Issue Tracker of the NetBeans project. Please, use <emphasis>Component: installer</emphasis>, <emphasis>OS: Linux</emphasis>, <emphasis>Subcomponent: rpm</emphasis> to file the issues related to the NetBeans RPMs.</para>
-            </listitem>
-          </itemizedlist>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file
diff --git a/en-US/Objective_CAML_OCaml_coverage_greatly_extended.xml b/en-US/Objective_CAML_OCaml_coverage_greatly_extended.xml
deleted file mode 100644
index 20341d7..0000000
--- a/en-US/Objective_CAML_OCaml_coverage_greatly_extended.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/OCaml</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/OCaml</title>
-      <section id="">
-        <title>Objective CAML OCaml coverage greatly extended</title>
-        <para>Fedora 10 contains the OCaml 3.10.2 advanced programming language and a very comprehensive list of packages:</para>
-        <para>
-          <ulink url="http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora#Package_status">http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora#Package_status</ulink>
-        </para><para>OCaml was available as an update to Fedora 9 but not in the initial release.</para>
-      </section>
-    </section>
-  </article>
-</book>
diff --git a/en-US/Python_NSS_Bindings.xml b/en-US/Python_NSS_Bindings.xml
deleted file mode 100644
index f636ca7..0000000
--- a/en-US/Python_NSS_Bindings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
-
- <book>
-  <article lang="en">
-    <articleinfo>
-      <title>Docs/Beats/Devel/Tools/PythonNSS</title>
-    </articleinfo><section id="">
-      <title>Docs/Beats/Devel/Tools/PythonNSS</title>
-      <section id="">
-        <title>Python NSS Bindings </title>
-        <para>Python bindings for NSS/NSPR allow Python programs to utilize the NSS cryptographic libraries for SSL/TLS and PKI certificate management.  The <programlisting format="linespecific">python-nss</programlisting> package provides a Python binding to the NSS and NSPR support libraries.</para><para>Network Security Services (NSS) is a set of libraries supporting security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates and other security standards. NSS has received FIPS 140 validation from NIST. </para>
-        <section id="">
-          <title>Resources </title>
-          <para>
-            <ulink url="http://people.redhat.com/jdennis/python-nss/doc/api/html/index.html">http://people.redhat.com/jdennis/python-nss/doc/api/html/index.html</ulink> -- Library Documentation</para>
-        </section>
-      </section>
-    </section>
-  </article>
-</book>
\ No newline at end of file


commit 0588ba94dfd550faca993603f77b028fe6d98527
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Tue Oct 14 22:40:12 2008 -0700

    Migrating changes from Wiki about Xen.
    
    * Bringing in minor but important edit for virt users.

diff --git a/en-US/Kernel.xml b/en-US/Kernel.xml
index 461792c..ec0b337 100644
--- a/en-US/Kernel.xml
+++ b/en-US/Kernel.xml
@@ -67,18 +67,11 @@
     </listitem>
     <listitem>
       <para>
-        The Fedora kernel offers <filename>paravirt_ops</filename>
-        support in <filename>domU</filename>, as part of the kernel
-        team's efforts to reduce the work required to produce current
-        Xen kernels.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <application>Xen</application> fully virtualized guests can
-        directly boot a kernel and initrd image and pass kernel boot
-        args. For more details refer to
-        <ulink url="http://fedoraproject.org/wiki/Features/XenFullvirtKernelBoot" />.
+	Work on <option>paravirt_ops</option> in the upstream kernel has
+	progressed sufficiently that the <package>kernel-xen</package>
+	package has been obsoleted. For further details refer to see
+	[[Docs/Beats/Virtualization#Unified_Kernel_Image | Unified
+	Kernel Image]].
       </para>
     </listitem>
   </itemizedlist>


commit 74be9ff3fe2c48580c60c94223cdba461e1ec401
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date:   Tue Oct 14 22:31:30 2008 -0700

    Removed F9 cruft; confirming legal content for now.
    
    * Removed crufty stuff from F9;
    * Section with a legal notice remains until I confirm TTL of that section.

diff --git a/en-US/Package_Notes.xml b/en-US/Package_Notes.xml
index fe1859d..9622ea6 100644
--- a/en-US/Package_Notes.xml
+++ b/en-US/Package_Notes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<?
+
 
  <book>
   <article lang="en">
@@ -11,62 +11,21 @@
       <section id="">
         <title>Package Notes</title>
         <para>The following sections contain information regarding software packages that have undergone significant changes for Fedora 10. For easier access, they are generally organized using the same groups that are shown in the installation system. </para>
-        <section id="">
-          <title>Sound Card Utility </title>
-          <para>The <programlisting format="linespecific">system-config-soundcard</programlisting> utility has been removed, due to <ulink url="https://www.redhat.com/archives/fedora-devel-list/2008-March/msg02148.html"> numerous</ulink>  legacy design and implementation issues. Modern technologies, including udev and the HAL, have made most sound cards work out of the box. Any sound card not working out of the box should be reported as a <ulink url="https://bugzilla.redhat.com/"> bug</ulink> . Preferences can still be fine-tuned within the desktop environment, using, among others, the PulseAudio tools.</para>
-        </section><section id="">
-          <title>Perl </title>
-          <para>Fedora 9 now includes Perl 5.10.0, the first "major" release update in perl5 in some time.  The Perl interpreter itself is faster with a smaller memory footprint, and has several UTF-8 and threading improvements. The Perl installation is now relocatable, a blessing for systems administrators and operating system packagers.  Perl 5.10.0 also adds a new smart match operator, a switch statement, named captures, state variables, and better error messages.</para>
-          <para>For more information, refer to:</para>
-          <para>
-            <ulink url="http://perldoc.perl.org/perldelta.html">http://perldoc.perl.org/perldelta.html</ulink>
-          </para>
-        </section><section id="">
-          <title>Yum Changes </title>
-          <para>The <programlisting format="linespecific">installonlyn</programlisting> plugin functionality has been folded into the core <programlisting format="linespecific">yum</programlisting> package. The <programlisting format="linespecific">installonlypkgs</programlisting> and <programlisting format="linespecific">installonly_limit</programlisting> options are used by default to limit the system to retain only two kernel packages. You can adjust the package set or the number of packages, or disable the option entirely to match your preferences. More details is available in the man page for <programlisting format="linespecific">yum.conf</programlisting>.</para><para>The <programlisting format="linespecific">yum</programlisting> command now retries when it detects a lock.  This function is useful if a daemon is checking for updates, or if you are running <programlisting format="linespecific">yum</programlisting> and one of its graphical frontends simultaneously.</para>
 <para>The <programlisting format="linespecific">yum</programlisting> command now understands a cost parameter in its configuration file, which is the relative cost of accessing a software repository.  It is useful for weighing one software repository's packages as greater or less than any other. The cost parameter defaults to 1000, with lower costs given priority.</para><para>In Fedora 9 Rawhide, the <programlisting format="linespecific">/etc/yum.repos.d/fedora-development.repo</programlisting> file has been changed to <programlisting format="linespecific">/etc/yum.repos.d/fedora-rawhide.repo</programlisting>. References to <programlisting format="linespecific">development</programlisting> in <programlisting format="linespecific">fedora-rawhide.repo</programlisting> have been changed to <programlisting format="linespecific">rawhide</programlisting>. Due to the way that RPM deals with configuration files, the existing <programlisting format="linespecific">/etc/yum.repos.d/fed
 ora-development.repo</programlisting> file is saved as <programlisting format="linespecific">/etc/yum.repos.d/fedora-development.repo.rpmsave</programlisting> if it was previously modified. Users of the <programlisting format="linespecific">development</programlisting> repository may need to update scripts and custom configuration files to use the new name.</para>
-        </section><section id="">
-          <title>pam_mount </title>
-          <para> The <programlisting format="linespecific">pam_mount</programlisting> facility now uses a configuration file written in XML.  The <programlisting format="linespecific">/etc/security/pam_mount.conf</programlisting> file will be converted to <programlisting format="linespecific">/etc/security/pam_mount.conf.xml</programlisting> during update with <programlisting format="linespecific">/usr/bin/convert_pam_mount_conf.pl</programlisting>, which removes all comments. Any per-user configuration files must be converted manually, with the conversion script if desired.  A sample <programlisting format="linespecific">pam_mount.conf.xml</programlisting> file with detailed comments about the available options appears at <programlisting format="linespecific">/usr/share/doc/pam_mount-*/pam_mount.conf.xml</programlisting>.</para>
-        </section><section id="">
-          <title>TeXLive </title>
-          <para>
-            <ulink url="http://www.tug.org/texlive/"> TeXLive</ulink>  is a replacement for the old, unmaintained TeX package.  It offers new style packages and fixes many security problems with the old distribution.</para>
-        </section><section id="">
-          <title>LTSP </title>
-          <para>The Linux Terminal Server Project (LTSP) has been included directly into Fedora 9.  Work is ongoing.  For the latest news and documentation, refer to:</para>
-          <para>
-            <ulink url="http://k12linux.fedorahosted.org/">http://k12linux.fedorahosted.org/</ulink>
-          </para>
-        </section><section id="">
-          <title>Utility Packages </title>
-          <para>The <programlisting format="linespecific">nautilus-open-terminal</programlisting> package now uses a <emphasis>GConf</emphasis> key to control its behavior when launched by right-clicking the Desktop.  To enable its previous behavior, which opens the resulting terminal in the user's home directory, use this command:</para><para />
-          <programlisting>
-gconftool-2 -s /apps/nautilus-open-terminal/desktop_opens_home_dir --type=bool true
-</programlisting>
-          <para />
-          <para>The <programlisting format="linespecific">i810switch</programlisting> package has been removed.  This functionality is now available through the <programlisting format="linespecific">xrandr</programlisting> command in the <programlisting format="linespecific">xorg-x11-server-utils</programlisting> package.</para><para>The <programlisting format="linespecific">evolution-exchange</programlisting> package replaces <programlisting format="linespecific">evolution-connector</programlisting>, and provides a capability under the old name.</para><para>The <programlisting format="linespecific">system-config-firewall</programlisting> and <programlisting format="linespecific">system-config-selinux</programlisting> packages replace <programlisting format="linespecific">system-config-security-level</programlisting>.  The <programlisting format="linespecific">system-config-selinux</programlisting> package is part of the the <programlisting format="linespecific">policycoreut
 ils-gui</programlisting> package.</para>
-        </section><section id="">
-          <title>pilot-link and HAL/PolicyKit Interaction </title>
-          <para>The <programlisting format="linespecific">pilot-link</programlisting> package now blacklists the <programlisting format="linespecific">visor</programlisting> module by default. Users are encouraged to try the direct USB access present in recent versions of <programlisting format="linespecific">pilot-link</programlisting>. This is enabled by passing the <programlisting format="linespecific">--port usb:</programlisting> option to the various <programlisting format="linespecific">pilot-link</programlisting> tools, instead of the serial devices used in the past (typically <programlisting format="linespecific">/dev/pilot</programlisting> or <programlisting format="linespecific">/dev/ttyUSB0</programlisting>, <programlisting format="linespecific">/dev/ttyUSB1</programlisting>, and so forth). For example:</para><para />
-          <programlisting>
-pilot-xfer --port usb: --list
-</programlisting>
-          <para />
-          <para>The <programlisting format="linespecific">hal-info</programlisting> and <programlisting format="linespecific">hal</programlisting> packages have been updated to correctly set permissions for the necessary USB devices using PolicyKit. If you have any existing manual configurations, revert the changes to avoid possible conflicts.</para><para>For further information, refer to the <programlisting format="linespecific">README.fedora</programlisting> included in the <programlisting format="linespecific">pilot-link</programlisting> package.</para>
-        </section><section id="">
+	<section id="">
           <title>GIMP </title>
           <para> Fedora 10 includes version 2.6 of the GNU Image Manipulation Program.</para>
           <para>This new version is designed to be backwards compatible, so existing third party plug-ins and scripts should continue to work -- with a minor caveat: The included Script-Fu Scheme interpreter doesn't accept variable definitions without an initial value anymore (which isn't compliant to the language standard). Scripts included in Fedora packages should not have this problem, but if you use scripts from other sources, please refer to the <ulink url="http://www.gimp.org/release-notes/gimp-2.6.html"> GIMP Release notes</ulink> for more details and how you can fix scripts that have this problem.</para><para>Additionally, the <programlisting format="linespecific">gimptool</programlisting> script which is used to build and install third party plug-ins and scripts has been moved from the <programlisting format="linespecific">gimp</programlisting> to the <programlisting format="linespecific">gimp-devel</programlisting> package. Install this package if you want to use 
 <programlisting format="linespecific">gimptool</programlisting>.</para>
         </section><section id="">
           <title>Legal Information </title>
-          <para>The following legal information concerns some software in Fedora.</para>
-          <para />
-          <programlisting>
-Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
-</programlisting>
-          <para />
+          <para>The following legal information concerns some software
+	    in Fedora.</para>
+          <para>
+	    Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c)
+	    2002-2004 James W. Newkirk, Michael C. Two, Alexei A.
+	    Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
+	  </para>
         </section>
       </section>
     </section>
   </article>
-</book>
\ No newline at end of file
+</book>





More information about the docs-commits mailing list