[musicians-guide] Many small changes; see Revision History

crantila crantila at fedoraproject.org
Fri Dec 24 06:20:01 UTC 2010


commit b37750adca84e7a480eb6e30e516d7d63dec8537
Author: Christopher Antila <crantila at fedoraproject.org>
Date:   Fri Dec 24 01:19:38 2010 -0500

    Many small changes; see Revision History

 .directory                                      |    5 +++
 en-US/Audacity.xml                              |    6 ++--
 en-US/Book_Info.xml                             |   43 ++++++++++++----------
 en-US/LilyPond/LilyPond-counterpoint.xml        |    4 +-
 en-US/LilyPond/LilyPond-orchestra.xml           |    4 +-
 en-US/LilyPond/LilyPond-piano.xml               |    4 +-
 en-US/Musicians_Guide.ent                       |    6 ++--
 en-US/Musicians_Guide.xml                       |   12 +------
 en-US/Revision_History.xml                      |   24 +++++++++++++
 en-US/SuperCollider/SuperCollider-Composing.xml |    6 ++--
 10 files changed, 68 insertions(+), 46 deletions(-)
---
diff --git a/.directory b/.directory
new file mode 100644
index 0000000..8acd845
--- /dev/null
+++ b/.directory
@@ -0,0 +1,5 @@
+[Dolphin]
+Timestamp=2010,12,23,17,16,45
+
+[Settings]
+ShowDotFiles=false
diff --git a/en-US/Audacity.xml b/en-US/Audacity.xml
index 14ea050..db85ec3 100644
--- a/en-US/Audacity.xml
+++ b/en-US/Audacity.xml
@@ -281,9 +281,9 @@
 			<para>
 				Use the <citetitle>Tutorial Start</citetitle> file if you want to do the tutorial.  The <citetitle>Tutorial End</citetitle> file and <citetitle>Exported FLAC</citetitle> file are completed examples.  When you finish the tutorial, your project will probably not be the same as ours.
 				<itemizedlist>
-				<listitem><para><citetitle>Tutorial Start</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/Audacity/Audacity-start.tar.lzma" /></para></listitem>
-				<listitem><para><citetitle>Tutorial End</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/Audacity/Audacity-start.tar.lzma" /></para></listitem>
-				<listitem><para><citetitle>Exported FLAC</citetitle>is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/Audacity/Audacity-export.flac" /></para></listitem>
+				<listitem><para><citetitle>Tutorial Start</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/Audacity/Audacity-start.tar.lzma" /></para></listitem>
+				<listitem><para><citetitle>Tutorial End</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/Audacity/Audacity-start.tar.lzma" /></para></listitem>
+				<listitem><para><citetitle>Exported FLAC</citetitle>is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/Audacity/Audacity-export.flac" /></para></listitem>
 				</itemizedlist>
 			</para>
 		</section>
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 5b0ed7a..9bcbcda 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -4,25 +4,28 @@
 %BOOK_ENTITIES;
 ]>
 <bookinfo id="book-Musicians_Guide-Musicians_Guide">
-	<title>Musicians' Guide</title>
-	<subtitle>A guide to Fedora Linux's audio creation and music capabilities.</subtitle>
-<!-- Haydn: <subtitle>A guide to Fedora Linux's audio creation and music capabilities, written in a new and special way.</subtitle> -->
-	<productname>Fedora Draft Documentation</productname>
-	<productnumber></productnumber>
-	<edition>14.0.1</edition>
-	<pubsnumber>0</pubsnumber>
-	<abstract>
-		<para>This document explores some audio-creation and music activities possible with Fedora Linux.  Computer audio concepts are explained, and a selection of programs are demonstrated with tutorials showing typical usage.
-		</para>
-	</abstract>
-	<corpauthor>
-		<inlinemediaobject>
-			<imageobject>
-				<imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
-			</imageobject>
-		</inlinemediaobject>
-	</corpauthor>
-	<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <title>Musicians' Guide</title>
+  <subtitle>Audio creation and music software in Fedora Linux.</subtitle>
+  <!-- Haydn: <subtitle>A guide to Fedora Linux's audio creation and music capabilities, written in a new and special way.</subtitle> -->
+  <productname>Fedora Draft Documentation</productname>
+  <pubsnumber>0</pubsnumber> <!-- NB: I have no idea why this is here, but the book doesn't work without it -CRA -->
+  <edition>15.0</edition>
+  
+  <abstract>
+    <para>
+      This document explores some audio-creation and music activities possible with Fedora Linux. Computer audio concepts are explained, and a selection of programs are demonstrated with tutorials showing typical usage.
+    </para>
+  </abstract>
+  
+  <corpauthor>
+    <inlinemediaobject>
+      <imageobject>
+	<imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+      </imageobject>
+    </inlinemediaobject>
+  </corpauthor>
+  
+  <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </bookinfo>
 
diff --git a/en-US/LilyPond/LilyPond-counterpoint.xml b/en-US/LilyPond/LilyPond-counterpoint.xml
index 0e9c673..0eac8c6 100644
--- a/en-US/LilyPond/LilyPond-counterpoint.xml
+++ b/en-US/LilyPond/LilyPond-counterpoint.xml
@@ -15,8 +15,8 @@
 		<para>
 			You do not need these files to do the tutorial.  They are example completions.
 			<itemizedlist>
-			<listitem><para><citetitle>LilyPond Input File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/LilyPond/Counterpoint-source.ly" /></para></listitem>
-			<listitem><para><citetitle>PDF Output File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/files/LilyPond/Counterpoint-result.pdf" /></para></listitem>
+			<listitem><para><citetitle>LilyPond Input File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/LilyPond/Counterpoint-source.ly" /></para></listitem>
+			<listitem><para><citetitle>PDF Output File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/files/LilyPond/Counterpoint-result.pdf" /></para></listitem>
 			</itemizedlist>
 		</para>
 	</section>
diff --git a/en-US/LilyPond/LilyPond-orchestra.xml b/en-US/LilyPond/LilyPond-orchestra.xml
index a13f8b4..0313824 100644
--- a/en-US/LilyPond/LilyPond-orchestra.xml
+++ b/en-US/LilyPond/LilyPond-orchestra.xml
@@ -21,8 +21,8 @@
 		<para>
 			You do not need the <application>LilyPond</application> input file to do the tutorial.  You do need the PDF output file to do the tutorial.  Use the input file if you encounter problems, or to check your result.
 			<itemizedlist>
-			<listitem><para><citetitle>LilyPond Input File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/LilyPond/Orchestra-source.ly" /></para></listitem>
-			<listitem><para><citetitle>PDF Output File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/LilyPond/Orchestra-result.pdf" /></para></listitem>
+			<listitem><para><citetitle>LilyPond Input File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/LilyPond/Orchestra-source.ly" /></para></listitem>
+			<listitem><para><citetitle>PDF Output File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/LilyPond/Orchestra-result.pdf" /></para></listitem>
 			</itemizedlist>
 		</para>
 	</section>
diff --git a/en-US/LilyPond/LilyPond-piano.xml b/en-US/LilyPond/LilyPond-piano.xml
index 5944491..f546751 100644
--- a/en-US/LilyPond/LilyPond-piano.xml
+++ b/en-US/LilyPond/LilyPond-piano.xml
@@ -21,8 +21,8 @@
 		<para>
 			You do not need the <application>LilyPond</application> input file to do the tutorial.  You should use the input file if you encounter problems, and to compare your completion.  You do need the PDF output file to do the tutorial.
 			<itemizedlist>
-			<listitem><para><citetitle><application>LilyPond</application> Input File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/LilyPond/Piano-source.ly" /></para></listitem>
-			<listitem><para><citetitle>PDF Output File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/LilyPond/Piano-result.pdf" />.</para></listitem>
+			<listitem><para><citetitle><application>LilyPond</application> Input File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/LilyPond/Piano-source.ly" /></para></listitem>
+			<listitem><para><citetitle>PDF Output File</citetitle> at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/LilyPond/Piano-result.pdf" />.</para></listitem>
 			</itemizedlist>
 		</para>
 	</section>
diff --git a/en-US/Musicians_Guide.ent b/en-US/Musicians_Guide.ent
index bb3c27a..2d97d86 100644
--- a/en-US/Musicians_Guide.ent
+++ b/en-US/Musicians_Guide.ent
@@ -1,6 +1,6 @@
 <!ENTITY PRODUCT "Fedora Documentation">
 <!ENTITY BOOKID "musicians-guide">
-<!ENTITY YEAR "2010">
+<!ENTITY YEAR "2011">
 <!ENTITY HOLDER "Red Hat, Inc. and others">
-<!ENTITY PRODVER "14">
-<!ENTITY PREVVER "13">
\ No newline at end of file
+<!ENTITY PRODVER "15">
+<!ENTITY PREVVER "14">
\ No newline at end of file
diff --git a/en-US/Musicians_Guide.xml b/en-US/Musicians_Guide.xml
index 703c3ff..4c10523 100644
--- a/en-US/Musicians_Guide.xml
+++ b/en-US/Musicians_Guide.xml
@@ -7,7 +7,7 @@
 <!-- 
 	NOTE: All of the following documents have a hard-coded URL that must be changed with each Fedora version.
 	
-	They are currently updated for Fedora 14
+	They are currently updated for Fedora 15
 	
 	LilyPond/LilyPond-counterpoint.xml : lines 18 and 19
 	LilyPond/LilyPond-orchestra.xml : lines 24 and 25
@@ -22,11 +22,6 @@
 	<!-- Start Chapters -->
 		<part>
 			<title>Linux Audio Basics</title>
-			<partintro>
-				<para>
-					asdf
-				</para>
-			</partintro>
 			
 			<xi:include href="Sound_Cards.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			<xi:include href="Sound_Servers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -36,11 +31,6 @@
 		
 		<part>
 			<title>Audio and Music Software</title>
-			<partintro>
-				<para>
-					asdf
-				</para>
-			</partintro>
 			
 			<!-- Audio Editor -->
 			<xi:include href="Audacity.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index d44baee..a924a5f 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -170,7 +170,31 @@
 				</revdescription>
 			</revision>
 			
+			<revision>
+				<revnumber>15.0</revnumber>
+				<date>Thurs Dec 23 2010</date>
+				<author>
+					<firstname>Christopher</firstname>
+					<surname>Antila</surname>
+					<email>crantila at fedoraproject.org</email>
+				</author>
+				<revdescription>
+					<simplelist>
+					  <member>Changed version numbering to correspond more closely to the intended Fedora release version.</member>
+					  <member>Removed "asdf" part introductions.</member>
+					  <member>Updated entity (.ent) file for Fedora 15.</member>
+					  <member>Updated hard-coded links to supplemental files for Fedora 15.</member>
+					  <member>Changed subtitle to remove possessive ("Fedora Linux's").</member>
+					</simplelist>
+				</revdescription>
+			</revision>
+			
+			<!-- NOTE: When adding a revision here, be sure to update the <edition> tag in "Book_Info.xml" -->
+			
 			<!-- Finite Tasks -->
+			<!-- TODO: Make the Ardour external files work -->
+			<!-- TODO: Bug 654187 ("Errors in Musicians' Guide LilyPond section") -->
+			<!-- TODO: Bug 622168 ("Rosegarden Tutorial Is Boring") -->
 			<!-- TODO: fix the example around line 630 of SC Basic Programming -->
 			<!-- TODO: convert images to format given by R. Landmann (as line 164 of Audacity?) -->
 			<!-- TODO: convert SuperCollider examples to <xi:include ... /> -->
diff --git a/en-US/SuperCollider/SuperCollider-Composing.xml b/en-US/SuperCollider/SuperCollider-Composing.xml
index 4e3a1a5..6ca48a3 100644
--- a/en-US/SuperCollider/SuperCollider-Composing.xml
+++ b/en-US/SuperCollider/SuperCollider-Composing.xml
@@ -21,9 +21,9 @@
 		<para>
 			The following files represent complete versions of the program.  You should try to complete the program yourself before reviewing these versions:
 			<itemizedlist>
-			<listitem><para><citetitle>Method One</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/SuperCollider/Method_One.sc" /></para></listitem>
-			<listitem><para><citetitle>Method One (Optimized)</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/SuperCollider/Method_One-optimized.sc" /></para></listitem>
-			<listitem><para>A FLAC-format recording of <citetitle>Method One</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/14/Musicians_Guide/files/SuperCollider/Method_One.flac" /></para></listitem>
+			<listitem><para><citetitle>Method One</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/SuperCollider/Method_One.sc" /></para></listitem>
+			<listitem><para><citetitle>Method One (Optimized)</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/SuperCollider/Method_One-optimized.sc" /></para></listitem>
+			<listitem><para>A FLAC-format recording of <citetitle>Method One</citetitle> is available at <ulink url="http://docs.fedoraproject.org/en-US/Fedora/15/Musicians_Guide/files/SuperCollider/Method_One.flac" /></para></listitem>
 			</itemizedlist>
 		</para>
 		<para>


More information about the docs-commits mailing list