2.4 Added open source licence to Playbooks doc (ansible#1546) (ansibl…

…e#1558) * Added open source licence to Playbooks doc https://issues.redhat.com/browse/AAP-26693
emurtoug · Jul 10, 2024 · a916728 · a916728
1 parent 6f43974
commit a916728
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/downstream/aap-common/apache-2.0-license.adoc b/downstream/aap-common/apache-2.0-license.adoc
@@ -1,7 +1,7 @@
 [id="apache-2.0-license"]
 
 [.text-center]
-Apache License
+*Apache License*
 [.text-center]
 Version 2.0, January 2004
 [.text-center]

diff --git a/downstream/aap-common/gplv3-license-text.adoc b/downstream/aap-common/gplv3-license-text.adoc
@@ -1,13 +1,13 @@
 [id="gplv3-license-text"]
 
 [.text-center]
-GNU GENERAL PUBLIC LICENSE
+*GNU GENERAL PUBLIC LICENSE*
 [.text-center]
 Version 3, 29 June 2007
 
 Copyright © 2007 Free Software Foundation, Inc.<<https://fsf.org/>>
 
-Everyone is permitted to copy and distribute ve>rbatim copies of this license document, but changing it is not allowed.
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
 [discrete]
 ==== Preamble

diff --git a/downstream/assemblies/playbooks/assembly-open-source-license.adoc b/downstream/assemblies/playbooks/assembly-open-source-license.adoc
@@ -0,0 +1,5 @@
+[id="assembly-open-source-license"]
+
+= Open source license
+
+include::../aap-common/gplv3-license-text.adoc[leveloffset=+1]
diff --git a/downstream/modules/playbooks/ref-playbook-execution.adoc b/downstream/modules/playbooks/ref-playbook-execution.adoc
@@ -11,7 +11,7 @@ At a minimum, each play defines two things:
 * the managed nodes to target, using a pattern
 * at least one task to execute
 
-[Note]
+[NOTE]
 ====
 In Ansible 2.10 and later, use the fully-qualified collection name in your playbooks to ensure the correct module is selected, because multiple collections can contain modules with the same name (for example, `user`). 
 ====

diff --git a/downstream/titles/playbooks/playbooks-getting-started/docinfo.xml b/downstream/titles/playbooks/playbooks-getting-started/docinfo.xml
@@ -4,6 +4,7 @@
 <subtitle>Getting started with ansible playbooks</subtitle>
 <abstract>
     <para>This guide shows how to create and use playbooks to address your automation requirements.</para>
+    <para>This document includes content from the upstream docs.ansible.com documentation, which is covered by the GNU GENERAL PUBLIC LICENSE v3.0.</para>
 </abstract>
 <authorgroup>
     <orgname>Red Hat Customer Content Services </orgname>

diff --git a/downstream/titles/playbooks/playbooks-getting-started/master.adoc b/downstream/titles/playbooks/playbooks-getting-started/master.adoc
@@ -16,10 +16,11 @@ This guide provides an introduction to the use of Ansible Playbooks..
 
 include::{Boilerplate}[]
 
-//include::playbooks/assembly-playbook-gs.adoc[leveloffset=+1]
 include::playbooks/assembly-intro-to-playbooks.adoc[leveloffset=+1]
 include::playbooks/assembly-networking-playbook.adoc[leveloffset=+1]
 include::playbooks/assembly-playbook-practical-example.adoc[leveloffset=+1]
+include::playbooks/assembly-open-source-license.adoc[leveloffset=+1]
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ At a minimum, each play defines two things: @@
     * the managed nodes to target, using a pattern
     * at least one task to execute
-    [Note]
+    [NOTE]
     ====
     In Ansible 2.10 and later, use the fully-qualified collection name in your playbooks to ensure the correct module is selected, because multiple collections can contain modules with the same name (for example, `user`).
     ====
@@ Expand Down @@