[release-notes: 2/2] some include changes, bonus merge

[Pete Travis]

commit ff04bab6ffdbe42f87e6d4b5b16bf771628a23f1
Merge: ae12079 85cebcd
Author: Pete Travis <immanetize at fedoraproject.org>
Date:   Tue Oct 14 22:47:52 2014 -0600

    some include changes, bonus merge

 .gitignore                           |   11 +++
 en-US/Development.xml                |   42 ++++++++++++
 en-US/Printing.xml                   |    8 ++
 en-US/Products-Server.xml            |  123 +++++++++++++++++++---------------
 en-US/Section-Sysadmin.xml           |    4 +-
 en-US/Server_Configuration_Tools.xml |    6 ++
 en-US/System_Daemons.xml             |   34 ++++++++-
 7 files changed, 169 insertions(+), 59 deletions(-)
---
diff --cc en-US/Section-Sysadmin.xml
index 7ab2e12,c0fb97d..16d5ac5
--- a/en-US/Section-Sysadmin.xml
+++ b/en-US/Section-Sysadmin.xml
@@@ -58,11 -60,12 +58,11 @@@
      <xi:include href="Server_Configuration_Tools.xml"
                  xmlns:xi="http://www.w3.org/2001/XInclude" />
  
-     <xi:include href="Xorg.xml"
+ <!--    <xi:include href="Xorg.xml"
                  xmlns:xi="http://www.w3.org/2001/XInclude" />
  
 -
 +              -->
      <xi:include href="Monitoring.xml"
                  xmlns:xi="http://www.w3.org/2001/XInclude" />
 --->
    </section>