[musicians-guide] Version 15.9.4; added entities for Fedora and Fedora Linux

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


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

    Version 15.9.4; added entities for Fedora and Fedora Linux

 en-US/Audacity.xml                                 |   10 +++++-----
 en-US/Book_Info.xml                                |    2 +-
 en-US/FluidSynth.xml                               |    6 +++---
 en-US/Planet_CCRMA_at_Home.xml                     |   18 +++++++++---------
 en-US/Qtractor.xml                                 |    2 +-
 en-US/Real_Time_and_Low_Latency.xml                |    6 +++---
 en-US/Revision_History.xml                         |   19 +++++--------------
 en-US/Solfege.xml                                  |    4 ++--
 en-US/Sound_Cards.xml                              |    2 +-
 en-US/Sound_Servers.xml                            |    6 +++---
 .../SuperCollider-Basic_Programming.xml            |    4 ++--
 en-US/SuperCollider/SuperCollider-Exporting.xml    |    2 +-
 12 files changed, 36 insertions(+), 45 deletions(-)
---
diff --git a/en-US/Audacity.xml b/en-US/Audacity.xml
index d3d31e2..73f073b 100644
--- a/en-US/Audacity.xml
+++ b/en-US/Audacity.xml
@@ -33,7 +33,7 @@
 				Audacity uses several "libraries."  Libraries are incomplete programs that add capabilities to other programs or applications.  Libraries can be shared between programs.  The libraries needed by Audacity will be installed automatically.
 			</para>
 			<para>
-				The version of Audacity from the Fedora repository does not use an MP3 library.  If you do not want to use MP3 files with Audacity, you should follow the instructions in <xref linkend="sect-Musicians_Guide-Audacity-Installation" />.  If you want to use MP3 files with Audacity, you should follow the instructions in <xref linkend="sect-Musicians_Guide-Audacity-Installation_with_RPM_Fusion" />.
+				The version of Audacity from the &O_S; repository does not use an MP3 library.  If you do not want to use MP3 files with Audacity, you should follow the instructions in <xref linkend="sect-Musicians_Guide-Audacity-Installation" />.  If you want to use MP3 files with Audacity, you should follow the instructions in <xref linkend="sect-Musicians_Guide-Audacity-Installation_with_RPM_Fusion" />.
 			</para>
 			<para>
 				Audacity can use the JACK Audio Connection Kit.  You should install JACK before installing Audacity.  Follow the instructions in <xref linkend="sect-Musicians_Guide-Install_and_Configure_JACK" /> to install JACK.  We recommend using Audacity without JACK, but JACK is installed whether or not you use it.
@@ -50,7 +50,7 @@
 			
 			<procedure>
 				<para>
-					This method installs Audacity from the Fedora repository.  This version of Audacity does not use an MP3 library, and cannot process MP3 files.
+					This method installs Audacity from the &O_S; repository.  This version of Audacity does not use an MP3 library, and cannot process MP3 files.
 				</para>
 				<step><para>Use PackageKit or KPackageKit to install the <package>audacity</package> package.</para></step>
 				<step><para>The proposed installation includes Audacity and all of the libraries that Audacity uses.  Continue installing Audacity by reviewing and approving the proposed installation.</para></step>
@@ -62,7 +62,7 @@
 			<title>Installation with MP3 Support</title>
 			<procedure>
 				<para>
-					This method installs Audacity from the RPM Fusion repository.  This version of Audacity uses an MP3 library, and can process MP3 files.  The Fedora Project cannot provide support for this version of Audacity because it is not prepared by Fedora.
+					This method installs Audacity from the RPM Fusion repository.  This version of Audacity uses an MP3 library, and can process MP3 files. &O_S; cannot provide support for this version of Audacity because it is not prepared by &O_S;.
 				</para>
 				<step><para>Run this command in a terminal: </para>
 <screen><command>su -c 'yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/\</command>
@@ -139,7 +139,7 @@
 <computeroutput>1 [MobilePre      ]: USB-Audio - MobilePre</computeroutput>
 <computeroutput>                  M Audio MobilePre at usb-0000:00:13.0-2</computeroutput></screen>
 						<para>In this example output, the square brackets surround the name of the sound card.  The names of the sound cards in this example output are <literal>SB</literal> and <literal>MobilePre</literal>.</para></step>
-						<step><para>Identify the name of the sound card that you want to use.  If you do not see your sound card in the list outputted by <code>cat</code>, then your Fedora does not detect it.  You should also remember the number of the sound card, which is printed to the left of the name.  You can use two different sound cards for recording and playback.</para></step>
+						<step><para>Identify the name of the sound card that you want to use.  If you do not see your sound card in the list outputted by <code>cat</code>, then your operating system does not detect it.  You should also remember the number of the sound card, which is printed to the left of the name.  You can use two different sound cards for recording and playback.</para></step>
 					</substeps>
 				</step>
 				<step><para>Start Audacity.</para></step>
@@ -290,7 +290,7 @@
 		<section id="sect-Musicians_Guide-Audacity-Tutorial-Scenario">
 			<title>Scenario</title>
 			<para>
-				You tell a friend about some open-source audio applications in Fedora Linux.  Your friend wants you to help them make a new sound that will play when they log in to their computer.  You search your music CD collection, and find a favourite recording.  You and your friend decide to use a few clips from the CD to start your new log-in sound.
+				You tell a friend about some open-source audio applications in &OPERATING_SYSTEM;.  Your friend wants you to help them make a new sound that will play when they log in to their computer.  You search your music CD collection, and find a favourite recording.  You and your friend decide to use a few clips from the CD to start your new log-in sound.
 			</para>
 		</section>
 		
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index a8147c6..66ed0d6 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -9,7 +9,7 @@
 	<!-- 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> <!-- N.B.: I have no idea why this is here, but the book doesn't work without it -CRA -->
-	<edition>15.9.3</edition>
+	<edition>15.9.4</edition>
   
 	<abstract>
 		<para>
diff --git a/en-US/FluidSynth.xml b/en-US/FluidSynth.xml
index 901e6c4..b673eaf 100644
--- a/en-US/FluidSynth.xml
+++ b/en-US/FluidSynth.xml
@@ -19,7 +19,7 @@
 			What <application>FluidSynth</application> enables users to do is eliminate the hardware component of using SoundFonts, so that any computer becomes capable of synthesizing from SoundFont files, which are often simply referred to as "a SoundFont."  As fonts change the look of text characters, SoundFonts change the sound of MIDI notes - the overall meaning is the same when conveyed by any font (or SoundFont), but the particular nuance is changed.
 		</para>
 		<para>
-			Fedora offers a few SoundFonts in the default repositories.  By default, <application>FluidSynth</application> installs the FluidR3 General MIDI ("GM") SoundFont, which contains a wide array of conventional (and some non-conventional) "patches."  To see the other options that are available, use PackageKit, KPackageKit, or yum to search for "soundfont".
+			&O_S; offers a few SoundFonts in the default repositories.  By default, <application>FluidSynth</application> installs the FluidR3 General MIDI ("GM") SoundFont, which contains a wide array of conventional (and some non-conventional) "patches."  To see the other options that are available, use PackageKit, KPackageKit, or yum to search for "soundfont".
 		</para>
 		<section id="sect-Musicians_Guide-FluidSynth-How_to_Get_a_SoundFont">
 			<title>How to Get a SoundFont</title>
@@ -106,7 +106,7 @@
 		<section id="sect-Musicians_Guide-FluidSynth-Req_and_Inst-Install_SoundFont_Files">
 			<title>Install SoundFont Files</title>
 			<para>
-				<application>Qsynth</application> automatically installs a SoundFont for use with <application>FluidSynth</application>, but if you did not install <application>Qsynth</application>, or if you want to add additional SoundFont files with additional programs, you will need to install them separately.  The Fedora package repositories offer a small selection of SoundFont files, which you can find by searching for "soundfont" with <application>PackageKit</application>, <application>KPackageKit</application>, or <application>yum</application>.  These files will automatically be installed correctly.  If you wish to install additional SoundFont files, it is recommended that you install them in the same location - and with the same security settings - as the ones available from the Fedora repositories.  If you do this, then you enable all users of the computer system to access the files, you will not "lose" them if you forget where they are stored, and you help to minimize the po
 tential security risk of using software downloaded from the internet.
+				<application>Qsynth</application> automatically installs a SoundFont for use with <application>FluidSynth</application>, but if you did not install <application>Qsynth</application>, or if you want to add additional SoundFont files with additional programs, you will need to install them separately.  The &O_S; package repositories offer a small selection of SoundFont files, which you can find by searching for "soundfont" with <application>PackageKit</application>, <application>KPackageKit</application>, or <application>yum</application>.  These files will automatically be installed correctly.  If you wish to install additional SoundFont files, it is recommended that you install them in the same location&mdash;and with the same security settings&mdash;as the ones available from the &O_S; repositories.  If you do this, then you enable all users of the computer system to access the files, you will not "lose" them if you forget where they are stored, and you help to minimize 
 the potential security risk of using software downloaded from the internet.
 			</para>
 			<para>
 				The following steps move a SoundFont file called <filename>myFont.sf2</filename> to the default folder (<filename>/usr/share/soundfonts</filename>), and correctly set the security settings.  Note that you will need the system administrator's password (belonging to the "root" account) to complete this operation.  If you do not have this password, it is best to ask the system administrator to install the files for you.  Alternately, you may simply use the SoundFont file from your a sub-folder in your home folder.
@@ -129,7 +129,7 @@
 			   <step><para>The output should resemble this: <programlisting><![CDATA[-rw-r--r--. 1 root root 9 2010-06-23 02:28 myFont.sf2]]></programlisting> but with a different date, time, and filename.</para></step>
 			   </substeps></step>
 			<!-- They'll have no idea what SELinux is, so I should explain that, or not mention it at all -->
-			<step><para>Highly-observant users may notice that the SELinux<!-- CRA: Is SELinux a <systemcomponent?> --> context of the new file is different from that of any Fedora-installed SoundFont file.  As long as the type is <literal>usr_t</literal>, which it should be by default, then there is no practical difference (no difference in enforcement) between this and a Fedora-installed SoundFont file.  If you don't know what this means, or if you hadn't noticed it, then it means that this additional SoundFont file should not create a new potential security problem.</para></step>
+			<step><para>Highly-observant users may notice that the SELinux<!-- CRA: Is SELinux a <systemcomponent?> --> context of the new file is different from that of any &O_S;-installed SoundFont file.  As long as the type is <literal>usr_t</literal>, which it should be by default, then there is no practical difference (no difference in enforcement) between this and a &O_S;-installed SoundFont file.  If you don't know what this means, or if you hadn't noticed it, then it means that this additional SoundFont file should not create a new potential security problem.</para></step>
 			</procedure>
 		</section>
 	</section> <!-- Ends "Requirements and Installation" Section --> <!--    <application>FluidSynth</application>-Req_and_Inst-    -->
diff --git a/en-US/Planet_CCRMA_at_Home.xml b/en-US/Planet_CCRMA_at_Home.xml
index d64377b..ec78a82 100644
--- a/en-US/Planet_CCRMA_at_Home.xml
+++ b/en-US/Planet_CCRMA_at_Home.xml
@@ -10,7 +10,7 @@
 	<section id="sect-Musicians_Guide-What_Is_Planet_CCRMA">
 		<title>About Planet CCRMA at Home</title>
 		<para>
-			As stated on the project's home page, it is the goal of Planet CCRMA at Home to provide packages which will transform a Fedora Linux-based computer into an audio workstation.  What this means is that, while the Fedora Project does an excellent job of providing a general-purpose operating system, a general purpose operating system is insufficient for audio work of the highest quality.  The contributors to Planet CCRMA at Home provide software packages which can tune your system specifically for audio work.
+			As stated on the project's home page, it is the goal of Planet CCRMA at Home to provide packages which will transform a &OPERATING_SYSTEM;-based computer into an audio workstation.  What this means is that, while the &O_S; Project does an excellent job of providing a general-purpose operating system, a general purpose operating system is insufficient for audio work of the highest quality.  The contributors to Planet CCRMA at Home provide software packages which can tune your system specifically for audio work.
 		</para>
 		<para>
 			Users of GNU Solfege and LilyPond should not concern themselves with Planet CCRMA at Home, unless they also user other audio software.  Neither Solfege nor LilyPond would benefit from a computer optimzed for audio production.
@@ -35,13 +35,13 @@
 		<section id="sect-Musicians_Guide-CCRMA_Need_Exclusive_Software">
 			<title>Exclusive Software</title>
 			<para>
-				The only useful reason to install an additional repository is if you intend to install and use its software.  The only software application covered in this guide, which is available exclusively from the Planet CCRMA at Home repository, is "SuperCollider".  The Planet CCRMA repository also offers many other audio-related software applications, many of which are available from the default Fedora Project repositories.
+				The only useful reason to install an additional repository is if you intend to install and use its software.  The only software application covered in this guide, which is available exclusively from the Planet CCRMA at Home repository, is "SuperCollider".  The Planet CCRMA repository also offers many other audio-related software applications, many of which are available from the default &O_S; Project repositories.
 			</para>
 		<!-- </section>
 		<section id="sect-Musicians_Guide-CCRMA_Updated_Versions">
 			<title>Do You Need Updated Versions?</title> -->
 			<para>
-				Most of the audio software currently available in the default Fedora repositories was initially available in Fedora from the Planet CCRMA at Home repository.  Sometimes, an updated version of an application is available from the Planet CCRMA repository before it is available from the Fedora Updates repository.  If you need the newer software version, then you should install the Planet CCRMA repository.
+				Most of the audio software currently available in the default &O_S; repositories was initially available in &O_S; from the Planet CCRMA at Home repository.  Sometimes, an updated version of an application is available from the Planet CCRMA repository before it is available from the &O_S; Updates repository.  If you need the newer software version, then you should install the Planet CCRMA repository.
 			</para>
 			<para>
 				This is also a potential security weakness, for users who install the Planet CCRMA repository, but do not install any of its software.  When "yum" finds a newer version of an installed application, it will be installed, regardless of the repository.  This may happen to you without you noticing, so that you begin using Planet CCRMA software without knowing it.
@@ -60,16 +60,16 @@
 		<section id="sect-Musicians_Guide-CCRMA_Best_Practices">
 			<title>A Possible "Best Practices" Solution</title>
 			<para>
-				All Fedora Linux users should be grateful to the people working at CCRMA, who help to provide the Planet CCRMA at Home repository.  Their work has been instrumental in allowing Fedora to provide the amount of high-quality audio software that it does.  Furthermore, the availability of many of CCRMA's highly-specialized software applications through the Planet CCRMA at Home repository is an invaluable resource to audio and music enthusiasts.
+				All &OPERATING_SYSTEM; users should be grateful to the people working at CCRMA, who help to provide the Planet CCRMA at Home repository.  Their work has been instrumental in allowing &O_S; to provide the amount of high-quality audio software that it does.  Furthermore, the availability of many of CCRMA's highly-specialized software applications through the Planet CCRMA at Home repository is an invaluable resource to audio and music enthusiasts.
 			</para>
 			<para>
-				On the other hand, Fedora users cannot expect that Planet CCRMA software is going to meet the same standards as Fedora software.  While the Fedora Project's primary goal is to provide Linux software, CCRMA's main goal is to advance the state of knowledge of computer-based music and audio research and art.
+				On the other hand, &O_S; users cannot expect that Planet CCRMA software is going to meet the same standards as &O_S; software.  While the Fedora Project's primary goal is to provide Linux software, CCRMA's main goal is to advance the state of knowledge of computer-based music and audio research and art.
 			</para>
 			<para>
 				Where do these two goals meet?
 			</para>
 			<para>
-				If you want to use your computer for both day-to-day desktop tasks and high-quality audio production, one good solution is to "dual-boot" your computer.  This involves installing Fedora Linux twice on the same physical computer, but it will allow you to keep an entirely separate operating system environment for the Planet CCRMA at Home software.  Not only will this allow you to safely and securely run Planet CCRMA applications in their most-optimized state, but you can help to further optimize your system by turning off and even removing some system services that you do not need for audio work.  For example, a GNOME or KDE user might choose to install only "Openbox" for their audio-optimized installation.
+				If you want to use your computer for both day-to-day desktop tasks and high-quality audio production, one good solution is to "dual-boot" your computer.  This involves installing &OPERATING_SYSTEM; twice on the same physical computer, but it will allow you to keep an entirely separate operating system environment for the Planet CCRMA at Home software.  Not only will this allow you to safely and securely run Planet CCRMA applications in their most-optimized state, but you can help to further optimize your system by turning off and even removing some system services that you do not need for audio work.  For example, a GNOME or KDE user might choose to install only "Openbox" for their audio-optimized installation.
 			</para>
 			<para>
 				Alternatively, there is the possibility of going half-way: installing only some Planet CCRMA applications, but not the fully-optimized kernel and system components.  This would be more suitable for a computer used most often for typical day-to-day operations (email, word processing, web browsing, etc.)  If you wanted to use SuperCollider, but did not require other audio software, for example, then this might be the best solution for you.
@@ -83,13 +83,13 @@
 	<section id="sect-Musicians_Guide-Using_Planet_CCRMA_Software">
 		<title>Using Software from Planet CCRMA at Home</title>
 		<para>
-			The Planet CCRMA at Home software is hosted (stored) on a server at Stanford University.  It is separate from the Fedora Linux servers, so <command>yum</command> (the command line utility used by PackageKit and KPackageKit) must be made aware that you wish to use it.  After installing the repository, Planet CCRMA at Home software can be installed through yum, PackageKit, or KPackageKit just as easily as any other software.
+			The Planet CCRMA at Home software is hosted (stored) on a server at Stanford University.  It is separate from the &OPERATING_SYSTEM; servers, so <command>yum</command> (the command line utility used by PackageKit and KPackageKit) must be made aware that you wish to use it.  After installing the repository, Planet CCRMA at Home software can be installed through yum, PackageKit, or KPackageKit just as easily as any other software.
 		</para>
 		<section id="sect-Musicians_Guide-CCRMA_Installing_Repository">
 			<title>Installing the Planet CCRMA at Home Repositories</title>
 			<procedure>
 				<para>
-					The following steps will install the Planet CCRMA at Home repository, intended only for Fedora Linux-based computers.
+					The following steps will install the Planet CCRMA at Home repository, intended only for &OPERATING_SYSTEM;-based computers.
 				</para>
 				<step><para>Update your computer with PackageKit, KPackageKit.</para></step>
 				<step><para>Run the following command in a terminal window:</para>
@@ -99,7 +99,7 @@
 				<step><para>Update your computer again.</para></step>
 				<step><para>You may receive a warning that the RPM database was altered outside of "yum".  This is normal.</para></step>
 				<step><para>Your repository definition will automatically be updated.</para></step>
-				<step><para>Some packages are available from Fedora repositories in addition to other repositories (like Planet CCRMA at Home).  If the Planet CCRMA repository has a newer version of something than the other repositories that you have installed, then the Planet CCRMA version will be installed at this point.</para></step>
+				<step><para>Some packages are available from &O_S; repositories in addition to other repositories (like Planet CCRMA at Home).  If the Planet CCRMA repository has a newer version of something than the other repositories that you have installed, then the Planet CCRMA version will be installed at this point.</para></step>
 			</procedure>
 			<para>
 				Although it is necessary to use the <command>rpm</command> program directly, all other Planet CCRMA software can be installed through <command>yum</command>, like all other applications.  Here is an explanation of the command-line options used above:
diff --git a/en-US/Qtractor.xml b/en-US/Qtractor.xml
index 276c256..06ae8c6 100644
--- a/en-US/Qtractor.xml
+++ b/en-US/Qtractor.xml
@@ -46,7 +46,7 @@
 		<section id="sect-Musicians_Guide-Qtractor-Installation">
 			<title>Installation</title>
 			<para>
-				Qtractor is not available from the Fedora software repositories.  Qtractor is available from the "Planet CCRMA at Home" and "RPM Fusion" repositories.  If you have already enabled one of those repositories, you should install Qtractor from that repository.  If you have not already enabled one of those repositories, we recommend that you install Qtractor from the "Planet CCRMA at Home" repository.  See <xref linkend="sect-Musicians_Guide-CCRMA_Installing_Repository" /> for instructions to enable the "Planet CCRMA at Home" repository.  The "Planet CCRMA at Home" repository contains a wide variety of music and audio applications.
+				Qtractor is not available from the &O_S; software repositories.  Qtractor is available from the "Planet CCRMA at Home" and "RPM Fusion" repositories.  If you have already enabled one of those repositories, you should install Qtractor from that repository.  If you have not already enabled one of those repositories, we recommend that you install Qtractor from the "Planet CCRMA at Home" repository.  See <xref linkend="sect-Musicians_Guide-CCRMA_Installing_Repository" /> for instructions to enable the "Planet CCRMA at Home" repository.  The "Planet CCRMA at Home" repository contains a wide variety of music and audio applications.
 			</para>
 			<para>
 				After you enable the "RPM Fusion" or "Planet CCRMA at Home" repository, use PackageKit or KPackageKit to install the "qtractor" packge.  Other required software is installed automatically.
diff --git a/en-US/Real_Time_and_Low_Latency.xml b/en-US/Real_Time_and_Low_Latency.xml
index c9e1c27..2ee8657 100644
--- a/en-US/Real_Time_and_Low_Latency.xml
+++ b/en-US/Real_Time_and_Low_Latency.xml
@@ -32,7 +32,7 @@
 			If you've ever opened the "System Monitor" application, you will probably have noticed that there are a lot of "processes" running all the time.  Some of these processes need the processor, and some of them are just waiting around for something to happen.  To help increase the number of processes that can run at the same time, many modern CPUs have more than one "core," which allows for more processes to be evaluated at the same time.  Even with these improvements, there are usually more processes than available cores: my computer right now has 196 processes and only three cores.  There has to be a way of decided which process gets to run and when, and this task is left to the operating system.
 		</para>
 		<para>
-			In Linux systems like Fedora Linux, the core of the operating system (called the <firstterm>kernel</firstterm>) is responsible for deciding which process gets to execute at what time.  This responsibility is called "scheduling."  Scheduling access to the processor is called, <firstterm>processor scheduling</firstterm>.  The kernel also manages scheduling for a number of other things, like memory access, video hardware access, audio hardware access, hard drive access, and so on.  The algorithm (procedure) used for each of these scheduling tasks is different for each, and can be changed depending on the user's needs and the specific hardware being used.  In a hard drive, for example, it makes sense to consider the physical location of data on a disk before deciding which process gets to read first.  For a processor this is irrelevant, but there are many other things to consider.
+			In Linux systems like &O_S;, the core of the operating system (called the <firstterm>kernel</firstterm>) is responsible for deciding which process gets to execute at what time.  This responsibility is called "scheduling."  Scheduling access to the processor is called, <firstterm>processor scheduling</firstterm>.  The kernel also manages scheduling for a number of other things, like memory access, video hardware access, audio hardware access, hard drive access, and so on.  The algorithm (procedure) used for each of these scheduling tasks is different for each, and can be changed depending on the user's needs and the specific hardware being used.  In a hard drive, for example, it makes sense to consider the physical location of data on a disk before deciding which process gets to read first.  For a processor this is irrelevant, but there are many other things to consider.
 		</para>
 		<para>
 			There are a number of scheduling algorithms that are available with the standard Linux kernel, and for most uses, a "fair queueing" system is appropriate.  This helps to ensure that all processes get an equal amount of time with the processor, and it's unacceptable for audio work.  If you're recording a live concert, and the "PackageKit" update manager starts, you don't care if PackageKit gets a fair share of processing time - it's more important that the audio is recorded as accurately as possible.  For that matter, if you're recording a live concert, and your computer isn't fast enough to update the monitor, keyboard, and mouse position while providing uninterrupted, high-quality audio, you want the audio instead of the monitor, keyboard, and mouse.  After all, once you've missed even the smallest portion of audio, it's gone for good!
@@ -63,9 +63,9 @@
 	</section>
 	
 	<section id="sect-Musicians_Guide-Getting_Real_Time_Kernel_in_Fedora">
-		<title>Getting a Real-Time Kernel in Fedora Linux</title>
+		<title>Getting a Real-Time Kernel in &OPERATING_SYSTEM;</title>
 		<para>
-			In Fedora Linux, the real-time kernel is provided by the Planet CCRMA at Home software repositories.  Along with the warnings in the Planet CCRMA at Home chapter (see <xref linkend="sect-Musicians_Guide-CCRMA_Security_and_Stability" />), here is one more to consider: the real-time kernel is used by fewer people than the standard kernel, so it is less well-tested.  The chances of something going wrong are relatively low, but be aware that using a real-time kernel increases the level of risk.  Always leave a non-real-time option available, in case the real-time kernel stops working.
+			In &OPERATING_SYSTEM;, the real-time kernel is provided by the Planet CCRMA at Home software repositories.  Along with the warnings in the Planet CCRMA at Home chapter (see <xref linkend="sect-Musicians_Guide-CCRMA_Security_and_Stability" />), here is one more to consider: the real-time kernel is used by fewer people than the standard kernel, so it is less well-tested.  The chances of something going wrong are relatively low, but be aware that using a real-time kernel increases the level of risk.  Always leave a non-real-time option available, in case the real-time kernel stops working.
 		</para>
 		<para>
 			You can install the real-time kernel, along with other system optimizations, by following these instructions:
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 910710e..fd2cdb5 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -352,7 +352,7 @@
 			
 			<revision>
 				<revnumber>15.9.4</revnumber>
-				<date>???????????????????????????????</date>
+				<date>9 July 2011</date>
 				<author>
 					<firstname>Christopher</firstname>
 					<surname>Antila</surname>
@@ -365,32 +365,23 @@
 					  <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>
+					  <member>Removed "pulse-rt" from the groups required for JACK access.</member>
+					  <member>Updated all files, as appropriate, to replace "Fedora" and "Fedora Linux" with XML entities, to aid adoption by other groups.</member>
 					</simplelist>
 				</revdescription>
 			</revision>
 			
 			<!-- NOTE: When adding a revision above, be sure to update the <edition> tag in "Book_Info.xml" -->
 			
-			<!--
-				-Frescobaldi: Will be integrated with the "LilyPond" file for Fedora 16.
-				-LilyPond-piano: Will be completely new for Fedora 16 (available for translation by September 1st)
-				-LilyPond-orchestra: Will be completely new for Fedora 17 or 18
-				-SuperCollider: All files need revised grammar, but with the same meaning; probably for Fedora 18
-				-Rosegarden: Tutorial will be completely new, or chapter will be removed, for Fedora 20.
-				-Qtractor: If Rosegarden is removed in Fedora 20, Qtractor will have an additional tutorial.
-			-->
-			
 			<!-- Fedora 16 (General) -->
 			<!-- 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: Update all files to use the &OPERATING_SYSTEM; and &O_S; entities for "Fedora Linux" and "Fedora"
-						Progress:
-						-Ardour.xml -->
+			<!-- DONE: Update all files to use the &OPERATING_SYSTEM; and &O_S; entities for "Fedora Linux" and "Fedora" -->
 			<!-- 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 -->
+			<!-- DONE: ensure correct permissions for JACK; I think I have the user group wrong -->
 			
 			<!-- Fedora 16 (LilyPond) -->
 			<!-- TODO: Bug 710334 ("Section 12.7 Needs to Be Rewritten") -->
diff --git a/en-US/Solfege.xml b/en-US/Solfege.xml
index f350977..ef0a7be 100644
--- a/en-US/Solfege.xml
+++ b/en-US/Solfege.xml
@@ -46,7 +46,7 @@
 		<section id="sect-Musicians_Guide-Solfege-Install_MMA">
 			<title>Optional Installation: MMA</title>
 			<para>
-				MMA stands for "Musical MIDI Accompaniment," and it is not available for Fedora in a prepackaged format.  The software can be found on the <citetitle>MMA Homepage</citetitle> at <ulink url="http://www.mellowood.ca/mma/" />, where you can download the source code and compile it if desired.  MMA is only used by some of the harmonic dictation questions, so its installation is not required.
+				MMA stands for "Musical MIDI Accompaniment," and it is not available for &O_S; in a prepackaged format.  The software can be found on the <citetitle>MMA Homepage</citetitle> at <ulink url="http://www.mellowood.ca/mma/" />, where you can download the source code and compile it if desired.  MMA is only used by some of the harmonic dictation questions, so its installation is not required.
 			</para>
 		</section>
 	</section> <!-- Ends "Requirements and Installation" Section -->
@@ -123,7 +123,7 @@
 				Miscellaneous:
 				<itemizedlist>
 				<listitem><para>CSound: Solfege uses CSound for intonation exercises.  It is an optional component.  See the "Optional Installation" section above.</para></listitem>
-				<listitem><para>MMA: Solfege uses MMA for certain harmonic dictation exercises.  It is an optional component, and not available in Fedora through standard means.  See <xref linkend="sect-Musicians_Guide-Solfege-Install_MMA" /></para></listitem>
+				<listitem><para>MMA: Solfege uses MMA for certain harmonic dictation exercises.  It is an optional component, and not available in &O_S; through standard means.  See <xref linkend="sect-Musicians_Guide-Solfege-Install_MMA" /></para></listitem>
 				<listitem><para>Lilypond-book: Solfege uses this for generating print-outs of ear training exercise progress.  See the "Optional Installation" section above.</para></listitem>
 				<listitem><para>Latex: Solfege uses this for generating *.dvi format progress reports, rather than the default HTML format.</para></listitem>
 				<listitem><para>Latex: Solfege uses this for generating *.dvi format progress reports, rather than the default HTML format.</para></listitem>
diff --git a/en-US/Sound_Cards.xml b/en-US/Sound_Cards.xml
index f1ba4e1..5a98cc3 100644
--- a/en-US/Sound_Cards.xml
+++ b/en-US/Sound_Cards.xml
@@ -68,7 +68,7 @@
 				FireWire-connected sound cards are not as popular as USB-connected sound cards, but they are generally higher quality.  This is partly because FireWire-connected sound cards use FireWire's "guaranteed bandwidth" and "bus-mastering" capabilities, which both reduce latency.  High-speed FireWire connections are also available on older computers without a high-speed USB connection.
 			</para>
 			<para>
-				FireWire devices are sometimes incompatible with the standard Fedora Linux kernel.  If you have a FireWire-connected sound card, you should use the kernel from Planet CCRMA at Home.  Refer to <xref linkend="sect-Musicians_Guide-Getting_Real_Time_Kernel_in_Fedora" /> for instructions to install the Planet CCRMA at Home kernel.
+				FireWire devices are sometimes incompatible with the standard &OPERATING_SYSTEM; kernel.  If you have a FireWire-connected sound card, you should use the kernel from Planet CCRMA at Home.  Refer to <xref linkend="sect-Musicians_Guide-Getting_Real_Time_Kernel_in_Fedora" /> for instructions to install the Planet CCRMA at Home kernel.
 			</para>
 		</section>
 		<section id="sect-Musicians_Guide-USB_Sound_Cards">
diff --git a/en-US/Sound_Servers.xml b/en-US/Sound_Servers.xml
index af59a1b..25ab834 100644
--- a/en-US/Sound_Servers.xml
+++ b/en-US/Sound_Servers.xml
@@ -45,13 +45,13 @@
 		<section id="sect-Musicians_Guide-Sound_Servers-Phonon">
 			<title>Phonon</title>
 			<para>
-				Phonon is a sound server built into the KDE Software Compilation, and is one of the core components of KDE.  By default on Fedora Linux, Phonon feeds output to <systemitem>PulseAudio</systemitem>, but on other platforms (like Mac OS X, Windows, other versions of Linux, FreeBSD, and any other system that supports KDE), Phonon can be configured to feed its output anywhere.  This is its greatest strength - that KDE applications like Amarok and Dragon Player need only be programmed to use Phonon, and they can rely on Phonon to take care of everything else.  As KDE applications increasingly find their place in Windows and especially Mac OS X, this cross-platform capability is turning out to be very useful.
+				Phonon is a sound server built into the KDE Software Compilation, and is one of the core components of KDE.  By default on &OPERATING_SYSTEM;, Phonon feeds output to <systemitem>PulseAudio</systemitem>, but on other platforms (like Mac OS X, Windows, other versions of Linux, FreeBSD, and any other system that supports KDE), Phonon can be configured to feed its output anywhere.  This is its greatest strength - that KDE applications like Amarok and Dragon Player need only be programmed to use Phonon, and they can rely on Phonon to take care of everything else.  As KDE applications increasingly find their place in Windows and especially Mac OS X, this cross-platform capability is turning out to be very useful.
 			</para>
 		</section>
 	</section>
 		
 	<section id="sect-Musicians_Guide-Using_JACK">
-		<title>Using the <systemitem>JACK</systemitem> Audio Connection Kit</title>
+		<title>Use the <systemitem>JACK</systemitem> Audio Connection Kit</title>
 		<section id="sect-Musicians_Guide-Install_and_Configure_JACK">
 			<title>Install and Configure <systemitem>JACK</systemitem></title>
 			<procedure>
@@ -65,7 +65,7 @@
 			</procedure>
 			<important>
 				<para>
-					<systemitem>JACK</systemitem> operates with special real-time privileges.  You must add all users to the <systemitem>jackuser</systemitem> and <systemitem>pulse-rt</systemitem> groups so they can use <systemitem>JACK</systemitem>.  For instructions to add users to groups, see Chapter 22, <citetitle>Users and Groups</citetitle> of the <citetitle>Fedora Deployment Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org" />.  Do not add users to these groups if they will not use <systemitem>JACK</systemitem>.
+					<systemitem>JACK</systemitem> operates with special real-time privileges.  You must add all JACK users to the <systemitem>jackuser</systemitem> group. Learn how to add users to groups in Chapter 22, <citetitle>Users and Groups</citetitle> of the <citetitle>Fedora Deployment Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org" />. Do not add a user to the <systemitem>jackuser</systemitem> group if they will not use <systemitem>JACK</systemitem>.
 				</para>
 			</important>
 			<para>
diff --git a/en-US/SuperCollider/SuperCollider-Basic_Programming.xml b/en-US/SuperCollider/SuperCollider-Basic_Programming.xml
index fcccf05..b61059c 100644
--- a/en-US/SuperCollider/SuperCollider-Basic_Programming.xml
+++ b/en-US/SuperCollider/SuperCollider-Basic_Programming.xml
@@ -2922,7 +2922,7 @@ t = nil;
 				<application>SuperCollider</application> comes with an extensive collection of help files, which contain the answers to most of your problems.  The difficulty will be in finding the solution - it's not always located where you think it is, because it often isn't the solution you think it will be.
 			</para>
 			<para>
-				On Fedora Linux systems, the main help file is located at [file:///usr/share/SuperCollider/Help/Help.html this URL], and it can be viewed in any web browser.  It may also be helpful to browse the directory structure of the help files, located at [file:///usr/share/SuperCollider/Help this URL], which can also be viewed in your web browser.
+				On &OPERATING_SYSTEM; systems, the main help file is located at [file:///usr/share/SuperCollider/Help/Help.html this URL], and it can be viewed in any web browser.  It may also be helpful to browse the directory structure of the help files, located at [file:///usr/share/SuperCollider/Help this URL], which can also be viewed in your web browser.
 			</para>
 			<para>
 				If you're looking for further explanations of material in this tutorial, you could start by reviewing the [file:///usr/share/SuperCollider/Help/Tutorials/Getting-Started/Getting%20Started%20With%20SC.html Getting Started With <application>SuperCollider</application>] tutorial, on which this document is based.  The sections in that tutorial roughly correspond to the sections in this guide.
@@ -2951,7 +2951,7 @@ t = nil;
 	<section id="sect-Musicians_Guide-SC-Basic_Programming-Legal_Attribution">
 		<title>Legal Attribution</title>
 		<para>
-			This portion of the Fedora Musicians' Guide, called "Basic Programming with <application>SuperCollider</application>," is a derivative work of the, <citetitle>Getting Started With <application>SuperCollider</application></citetitle> tutorial.  The original work was created by Scott Wilson, James Harkins, and the <application>SuperCollider</application> development team.  It is available on the internet from <ulink url="http://supercollider.svn.sourceforge.net/viewvc/supercollider/trunk/common/build/Help/Tutorials/Getting-Started/Getting%20Started%20With%20SC.html" />.
+			This portion of the &O_S; Musicians' Guide, called "Basic Programming with <application>SuperCollider</application>," is a derivative work of the, <citetitle>Getting Started With <application>SuperCollider</application></citetitle> tutorial.  The original work was created by Scott Wilson, James Harkins, and the <application>SuperCollider</application> development team.  It is available on the internet from <ulink url="http://supercollider.svn.sourceforge.net/viewvc/supercollider/trunk/common/build/Help/Tutorials/Getting-Started/Getting%20Started%20With%20SC.html" />.
 		</para>
 		<para>
 			The original document, like all <application>SuperCollider</application> documentation, is licenced under the Creative Commons' <citetitle>Attribution Share-Alike 3.0 Unported Licence</citetitle>, accessible on the internet at <ulink url="http://creativecommons.org/licenses/by-sa/3.0/" />.
diff --git a/en-US/SuperCollider/SuperCollider-Exporting.xml b/en-US/SuperCollider/SuperCollider-Exporting.xml
index cce4af5..0fa2eb2 100644
--- a/en-US/SuperCollider/SuperCollider-Exporting.xml
+++ b/en-US/SuperCollider/SuperCollider-Exporting.xml
@@ -13,7 +13,7 @@
 	<section id="sect-Musicians_Guide-SC-Non_Real_Time_Synthesis">
 		<title>Non-Real-Time Synthesis</title>
 		<para>
-			SuperCollider allows you to synthesze audio output to an audio file.  Doing this requires using OSC commands on the server, the <classname>DiskOut</classname> UGen, the <classname>Buffer</classname> UGen, and other relatively advanced concepts.  The built-in <citetitle>DiskOut</citetitle> help file, available from  <ulink url="file:///usr/share/SuperCollider/Help/UGens/Playback%20and%20Recording/DiskOut.html" /> on Fedora Linux systems, contains some help with the <classname>DiskOut</classname> UGen, and links to other useful help files.  This method is not further discussed here.
+			SuperCollider allows you to synthesze audio output to an audio file.  Doing this requires using OSC commands on the server, the <classname>DiskOut</classname> UGen, the <classname>Buffer</classname> UGen, and other relatively advanced concepts.  The built-in <citetitle>DiskOut</citetitle> help file, available from  <ulink url="file:///usr/share/SuperCollider/Help/UGens/Playback%20and%20Recording/DiskOut.html" /> on &OPERATING_SYSTEM; systems, contains some help with the <classname>DiskOut</classname> UGen, and links to other useful help files.  This method is not further discussed here.
 		</para>
 	</section>
 	


More information about the docs-commits mailing list