[software-collections-guide: 16/17] Merge branch 'master' into comm

[Petr Kovář]

commit 9d170c3b195f4c876857b57041cdab69f294f405
Merge: cd1dcf4 2338926
Author: Petr Kovar <pkovar at redhat.com>
Date:   Fri Jul 11 17:33:22 2014 +0200

    Merge branch 'master' into comm
    
    Conflicts:
    	en-US/Getting_More_Information.xml
    	en-US/Packaging_Software_Collections.xml
    	en-US/Revision_History.xml
    	en-US/Software_Collections_Guide.xml

 en-US/Advanced_Topics.xml                        |    8 +-
 en-US/Extending_Red_Hat_Software_Collections.xml |  617 +++++++++++++++++++++-
 en-US/Introducing_Software_Collections.xml       |    6 +-
 en-US/Packaging_Software_Collections.xml         |   55 ++-
 en-US/Preface.xml                                |    2 +-
 en-US/Software_Collections_Guide.xml             |    6 +-
 en-US/Troubleshooting_Software_Collections.xml   |   28 +
 7 files changed, 691 insertions(+), 31 deletions(-)
---
diff --cc en-US/Packaging_Software_Collections.xml
index bcc36ba,abcaf37..47c0dbb
--- a/en-US/Packaging_Software_Collections.xml
+++ b/en-US/Packaging_Software_Collections.xml
@@@ -279,9 -309,12 +309,12 @@@ install -p -m 644 %{scl_name}.7 %{build
  %files build
  %{_root_sysconfdir}/rpm/macros.%{scl}-config
  
+ %files scldevel
+ %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel
+ 
  %changelog
  * Fri Aug 30 2013 John Doe &lt;jdoe at example.com&gt; 1-1
--- Initial package</programlisting>
++- Initial package]]></programlisting>
      </section>
      <!--<section id="sect-Packages_in_the_Software_Collection_Namespace">
        <title>Packages in the &DSCL; Namespace</title>