[musicians-guide] Modified some copyright/contributor things

Christopher Antila crantila at fedoraproject.org
Sun Jul 10 02:20:50 UTC 2011


commit dd08817b7bd7a90ec3f717a926ac62640eb78cc6
Author: Christopher Antila <crantila at fedoraproject.org>
Date:   Sat Jul 9 21:30:20 2011 -0400

    Modified some copyright/contributor things

 en-US/Author_Group.xml     |    9 +++++++++
 en-US/Contributors.xml     |   28 ++++++++++++++++++++++++++++
 en-US/Musicians_Guide.ent  |    2 +-
 en-US/Musicians_Guide.xml  |    6 ++++--
 en-US/Qtractor.xml         |    2 +-
 en-US/Revision_History.xml |   32 +++++++++++++++++++++-----------
 6 files changed, 64 insertions(+), 15 deletions(-)
---
diff --git a/en-US/Author_Group.xml b/en-US/Author_Group.xml
index d638385..04939ae 100644
--- a/en-US/Author_Group.xml
+++ b/en-US/Author_Group.xml
@@ -3,6 +3,14 @@
 <!ENTITY % BOOK_ENTITIES SYSTEM "Musicians_Guide.ent">
 %BOOK_ENTITIES;
 ]>
+
+  <authorgroup>
+	  <corpauthor>
+		  Fedora Project Contributors
+	  </corpauthor>
+  </authorgroup>
+
+<!--
 <authorgroup>
 	<author>
 		<firstname>Christopher</firstname>
@@ -14,3 +22,4 @@
 	</author>
 </authorgroup>
 
+  -->
\ No newline at end of file
diff --git a/en-US/Contributors.xml b/en-US/Contributors.xml
new file mode 100644
index 0000000..a4dcee4
--- /dev/null
+++ b/en-US/Contributors.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Musicians_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<appendix id="appe-Musicians_Guide-Contributors">
+	<title>Contributors</title>
+	
+	<para>
+		The following people have contributed to the &O_S; &PRODVER; Musicians' Guide, or a previous version.
+	</para>
+	<para>
+		<itemizedlist>
+			<listitem>
+				<para>
+					<ulink url="https://fedoraproject.org/wiki/User:Crantila">Christopher Antila</ulink> (writer)
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					Motohiro Kanda (translator&mdash;Japanese)
+				</para>
+			</listitem>
+		</itemizedlist>
+	</para>
+	
+</appendix>
+
diff --git a/en-US/Musicians_Guide.ent b/en-US/Musicians_Guide.ent
index e312c8c..ed05f24 100644
--- a/en-US/Musicians_Guide.ent
+++ b/en-US/Musicians_Guide.ent
@@ -1,7 +1,7 @@
 <!ENTITY PRODUCT "Fedora Documentation">
 <!ENTITY BOOKID "musicians-guide">
 <!ENTITY YEAR "2011">
-<!ENTITY HOLDER "Red Hat, Inc. and others">
+<!ENTITY HOLDER "Fedora Project Contributors">
 <!ENTITY PRODVER "16">
 <!ENTITY PREVVER "15">
 <!ENTITY O_S "Fedora">
diff --git a/en-US/Musicians_Guide.xml b/en-US/Musicians_Guide.xml
index ed6cfb8..64dd737 100644
--- a/en-US/Musicians_Guide.xml
+++ b/en-US/Musicians_Guide.xml
@@ -15,6 +15,7 @@
 	Audacity.xml : lines 243, 244, and 245
 	SuperCollider/SuperCollider-Composing.xml : lines 24, 25, and 26
 	Ardour.xml : line 461
+	Qtractor.xml : line 343
 -->
 
 <book status="draft">
@@ -55,8 +56,9 @@
 			<xi:include href="Solfege.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 		</part>
 		
-	<!-- End Chapters -->
+	<!-- Appendices -->
+	<xi:include href="Contributors.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<index />
+	<!-- <index /> -->
 </book>
 
diff --git a/en-US/Qtractor.xml b/en-US/Qtractor.xml
index e82bb57..276c256 100644
--- a/en-US/Qtractor.xml
+++ b/en-US/Qtractor.xml
@@ -340,7 +340,7 @@ You can import <application>LilyPond</application> MIDI output in <application>Q
 					<listitem><para>You must use <application>FluidSynth</application>, covered in <xref linkend="chap-Musicians_Guide-FluidSynth" />.</para></listitem>
 					<listitem>
 						<para>
-							Download a recording of the MIDI portion of this tutorial from <ulink url="http://docs.fedoraproject.org/en-US/Fedora/&PRODVER;/html/Musicians_Guide/files/Qtractor/FMG-Qtractor-MIDI-Recording.flac" />.
+							Download a recording of the MIDI portion of this tutorial from <ulink url="http://docs.fedoraproject.org/en-US/Fedora/16/html/Musicians_Guide/files/Qtractor/FMG-Qtractor-MIDI-Recording.flac" />.
 						</para>
 					</listitem>
 					<listitem>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index de587da..910710e 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -360,8 +360,11 @@
 				</author>
 				<revdescription>
 					<simplelist>
-					  <member>Adjusted all Guide hyperlinks to use the "PRODVER" entity, so they will be automatically updated.</member>
 					  <member>Added links to Qtractor tutorial recordings and revised opening paragraphs of tutorial.</member>
+					  <member>Updated copyright holder from "Red Hat Inc. and others" to "Fedora Project Contributors."</member>
+					  <member>Added "Contributors" appendix.</member>
+					  <member>Removed index; will replace it when it's useful.</member>
+					  <member>Removed my name from the Author_Group.xml, moved it into Contributors appendx.</member>
 					</simplelist>
 				</revdescription>
 			</revision>
@@ -381,18 +384,16 @@
 			<!-- TODO: standardize the paragraph about installing JACK -->
 			<!-- TODO: ensure correct permissions for JACK; I think I have the user group wrong -->
 			<!-- TODO: Bug 710330 ("Section 11.5.1 Broken Link to Local Help File") -->
-			<!-- TODO: include the Qtractor tutorial recording -->
-			<!-- TODO: change copyright holder, front-page placement of my name, and create "contributors to this guide" appendix -->
 			<!-- TODO: Update all files to use the &OPERATING_SYSTEM; and &O_S; entities for "Fedora Linux" and "Fedora"
 						Progress:
 						-Ardour.xml -->
 			<!-- QA: Bug 673519 ("Where is 'Percussion' check-box?") -->
 			<!-- DONE: finish the "TODO" in Ardour.xml at line 178 -->
+			<!-- DONE: change copyright holder, front-page placement of my name, and create "contributors to this guide" appendix -->
+			<!-- DONE: include the Qtractor tutorial recording -->
 			
 			<!-- Fedora 16 (LilyPond) -->
-			<!-- TODO: Bug 710333 ("Section 12.6 Needs to Be Rewritten") -->
 			<!-- TODO: Bug 710334 ("Section 12.7 Needs to Be Rewritten") -->
-			<!-- TODO: Bug 665664 ("LilyPond Example Scores Are Incomplete") -->
 			<!-- TODO: Introduction: is "ooolilypond" gone or replaced? -->
 			<!-- TODO: Revise the LilyPond introductory chapters -->
 			<!-- DONE: Bug 710336 ("Section 13 Integration with Section 12") -->
@@ -401,18 +402,27 @@
 			<!-- QA: Bug 670540 ("Qsynth's MIDI driver... ") -->
 			<!-- QA: Bug 670533 ("Qtractor chapter needs step-by-step... ") -->
 			
-			<!-- Fedora 17 or Later -->
-			<!-- TODO: Revise Ardour.xml, and input correct semantic XML tags -->
-			<!-- TODO: Bug 665662 ("SuperCollider Chapters Are in First Person") -->
-			<!-- TODO: Bug 622168 ("Rosegarden Tutorial Is Boring") -->
+			<!-- Fedora 17 (early 2012) -->
+			<!-- TODO: convert SuperCollider examples to <xi:include ... /> -->
+			<!-- TODO: convert LilyPond examples to <xi:include ... /> -->
 			<!-- TODO: add source-file and PDF/graphics examples to LilyPond-syntax.xml; already started for example at line 365 -->
+			
+			<!-- Fedora 18 (late 2012) -->
+			<!-- TODO: Rewrite LilyPond-orchestra to use a musical work from "open culture" -->
+			<!-- TODO: Bug 710333 ("Section 12.6 Needs to Be Rewritten") -->
+			<!-- TODO: Bug 665664 ("LilyPond Example Scores Are Incomplete") -->
+			<!-- TODO: Bug 665662 ("SuperCollider Chapters Are in First Person") -->
 			<!-- TODO: fix the example around line 630 of SC Basic Programming -->
+			
+			<!-- Fedora 19 (early 2013) -->
 			<!-- TODO: convert images to format given by R. Landmann (as line 164 of Audacity?) -->
-			<!-- TODO: convert SuperCollider examples to <xi:include ... /> -->
-			<!-- TODO: convert LilyPond examples to <xi:include ... /> -->
 			<!-- TODO: see whether SELinux can be configured to determine who/what has access to real-time stuff for JACK -->
 			<!-- TODO: fix up the SELinux portion of "Install SoundFont Files" in FluidSynth (ch. 10.2.5 in f15) -->
 			
+			<!-- Fedora 20 (late 2013) -->
+			<!-- TODO: Bug 622168 ("Rosegarden Tutorial Is Boring") -->
+			<!--		Evaluate whether to keep or remove this tutorial, replacing it with a better application, or adding another tutorial to Qtractor -->
+			
 			<!-- Ongoing Tasks -->
 			<!-- TODO: Revise all chapters for correct XML tagging -->
 			<!-- TODO: Revise all chapters to use the Chicago Manual of Style, deferring to the Apple Style Guide where necessary -->


More information about the docs-commits mailing list