[release-notes/f18: 22/22] Merge branch 'master' into f18

[Nick Bebout]

commit 24c715ed71c531b61c198d6c9811b73c20c37552
Merge: a459a33 32c882c
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 8 23:19:55 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	en-US/Revision_History.xml

 .tx/config                 |    1 -
 en-US/Boot.xml             |    8 +++---
 en-US/Cloud.xml            |    6 ----
 en-US/Desktop.xml          |   16 ++++++++---
 en-US/Development.xml      |    7 ++++-
 en-US/File_Systems.xml     |    2 +-
 en-US/I18n.xml             |   14 ++++++++--
 en-US/Installation.xml     |   59 ++++++++++++++++++++++++++++++++----------
 en-US/Networking.xml       |    2 +-
 en-US/Revision_History.xml |    7 +++++
 en-US/Virtualization.xml   |   61 +++----------------------------------------
 en-US/Web_Servers.xml      |    2 +-
 12 files changed, 93 insertions(+), 92 deletions(-)
---
diff --cc en-US/Revision_History.xml
index fb85df3,f85542b..44f2ddc
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@@ -8,13 -8,13 +8,20 @@@
    <simpara>
      <revhistory>
        <revision>
 +        <revnumber>18.0</revnumber>
 +        <date>Tue Jan 8 2013</date>
 +        <revdescription>
 +          <simplelist>
 +            <member>Revision for F18 final</member>
 +          </simplelist>
 +        </revdescription>
+ 	<revnumber>17.98</revnumber>
+ 	<date>Wed Nov 7 2012</date>
+ 	<revdescription>
+ 	  <simplelist>
+ 	    <member>Prepare for Fedora 18 Beta</member>
+ 	  </simplelist>
+ 	</revdescription>
        </revision>
        <revision>
  	<revnumber>17.95</revnumber>