commit 94d0e95cbc81f9bb4787538f5940823e4f1d9dba
Author: Christopher Antila <crantila(a)fedoraproject.org>
Date: Sat Dec 31 00:35:42 2011 -0500
changed KPackageKit to Apper; updated revision history
en-US/Ardour.xml | 2 +-
en-US/Audacity.xml | 4 ++--
en-US/Book_Info.xml | 4 ++--
en-US/FluidSynth.xml | 8 ++++----
en-US/Frescobaldi.xml | 2 +-
en-US/LilyPond/LilyPond.xml | 4 ++--
en-US/Qtractor.xml | 2 +-
en-US/Revision_History.xml | 34 ++++++++++++++++++----------------
en-US/Rosegarden.xml | 2 +-
en-US/Solfege.xml | 4 ++--
en-US/Sound_Servers.xml | 4 ++--
11 files changed, 36 insertions(+), 34 deletions(-)
---
diff --git a/en-US/Ardour.xml b/en-US/Ardour.xml
index 24c3e86..b6b7bcb 100644
--- a/en-US/Ardour.xml
+++ b/en-US/Ardour.xml
@@ -35,7 +35,7 @@
<section id="sect-Musicians_Guide-Ardour-Installation">
<title>Installation</title>
<para>
- Use <application>PackageKit</application> or <application>KPackageKit</application> to install the <package>ardour</package> package. Other required software is installed automatically.
+ Use <application>PackageKit</application> or <application>Apper</application> to install the <package>ardour</package> package. Other required software is installed automatically.
</para>
</section>
</section>
diff --git a/en-US/Audacity.xml b/en-US/Audacity.xml
index 73f073b..dea301d 100644
--- a/en-US/Audacity.xml
+++ b/en-US/Audacity.xml
@@ -52,7 +52,7 @@
<para>
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>Use PackageKit or Apper 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>
<step><para>Audacity configures itself automatically, but it may not use the configuration you want. You need to test Audacity before recording, so that you know that it works. Follow the instructions in <xref linkend="sect-Musicians_Guide-Audacity-Testing_Playback" /> and <xref linkend="sect-Musicians_Guide-Audacity-Testing_Recording" /> to test Audacity.</para></step>
</procedure>
@@ -71,7 +71,7 @@
<para>
Note that this a single command, broken into three lines here for presentation reasons.
</para></step>
- <step><para>Use PackageKit or KPackageKit to install the <code>audacity-freeworld</code> package.</para></step>
+ <step><para>Use PackageKit or Apper to install the <code>audacity-freeworld</code> 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>
<step><para>Audacity configures itself automatically, but it may not use the configuration you want. You need to test Audacity before recording, so that you know that it works. Follow the instructions in <xref linkend="sect-Musicians_Guide-Audacity-Testing_Playback" /> and <xref linkend="sect-Musicians_Guide-Audacity-Testing_Recording" /> to test Audacity.</para></step>
</procedure>
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 037b0ea..f6c5efe 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -9,11 +9,11 @@
<!-- 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.5</edition>
+ <edition>16.9</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 that show their typical usage.
+ This document explores some audio creation and music activities possible with &OPERATING_SYSTEM;. Computer audio concepts are explained, and a selection of programs are demonstrated with tutorials that show their typical usage.
</para>
</abstract>
diff --git a/en-US/FluidSynth.xml b/en-US/FluidSynth.xml
index b673eaf..9059b62 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>
- &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".
+ &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, Apper, 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>
@@ -87,7 +87,7 @@
We recommend this installation method for most users. Follow these instructions to install everything you need for <application>FluidSynth</application>.
</para>
<procedure>
- <step><para>Use <application>PackageKit</application> or <application>KPackageKit</application> to install the <package>qsynth</package> package.</para></step>
+ <step><para>Use <application>PackageKit</application> or <application>Apper</application> to install the <package>qsynth</package> package.</para></step>
<step><para>Review and approve the proposed installation. If you did not previously install the <package>fluid-soundfont-gm</package> packge, <application>PackageKit</application> will install it now. The <package>fluid-soundfont-gm</package> package is approximately 142 MB.</para></step>
</procedure>
<para>
@@ -100,13 +100,13 @@
We only recommend this installation method for advanced users. Follow these instructions to install <application>FluidSynth</application> without a graphical interface or SoundFont file. You must install a SoundFont file before you can use <application>FluidSynth</application> (see <xref linkend="sect-Musicians_Guide-FluidSynth-Req_and_Inst-Install_SoundFont_Files" />).
</para>
<para>
- Use <application>PackageKit</application> or <application>KPackageKit</application> to install the <package>fluidsynth</package> package.
+ Use <application>PackageKit</application> or <application>Apper</application> to install the <package>fluidsynth</package> package.
</para>
</section>
<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 &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—and with the same security settings—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.
+ <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>Apper</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 &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 po
tential 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.
diff --git a/en-US/Frescobaldi.xml b/en-US/Frescobaldi.xml
index 64fefda..05b88e5 100644
--- a/en-US/Frescobaldi.xml
+++ b/en-US/Frescobaldi.xml
@@ -40,7 +40,7 @@
<section id="sect-Musicians_Guide-Frescobaldi-Installation">
<title>Requirements and Installation</title>
<procedure>
- <step><para>Install the <package>frescobaldi</package> package with <application>PackageKit</application> or <application>KPackageKit</application>.</para></step>
+ <step><para>Install the <package>frescobaldi</package> package with <application>PackageKit</application> or <application>Apper</application>.</para></step>
<step><para>There are a lot of dependencies, including <package>perl-<replaceable>*</replaceable></package> packages, <package>kde-<replaceable>*</replaceable></package> packages, and <application>timidity++</application> including <package>fluid-soundfont-gm</package> (which is 114 MB)</para></step>
<step><para>Review and approve the list of dependencies.</para></step>
<step><para>The application can be found in the K Menu under 'Multimedia' or somewhere in the GNOME 'Applications' menu (probably under 'Multimedia'... for some reason)</para></step>
diff --git a/en-US/LilyPond/LilyPond.xml b/en-US/LilyPond/LilyPond.xml
index 9d886e2..b346fe5 100644
--- a/en-US/LilyPond/LilyPond.xml
+++ b/en-US/LilyPond/LilyPond.xml
@@ -55,7 +55,7 @@
<section id="sect-Musicians_Guide-LilyPond-Installation">
<title>Requirements and Installation</title>
<para>
- Use <application>PackageKit</application> or <application>KPackageKit</application> to install the <package>lilypond</package> package. Review the dependencies carefully. You will see many packages called <package>lilypond-*-fonts</package>.
+ Use <application>PackageKit</application> or <application>Apper</application> to install the <package>lilypond</package> package. Review the dependencies carefully. You will see many packages called <package>lilypond-*-fonts</package>.
</para>
<para>
You can use <application>LilyPond</application> from the command line. Run <command>lilypond <replaceable>input_file.ly</replaceable></command> in a terminal emulator.
@@ -80,7 +80,7 @@
<section id="sect-Musicians_Guide-LilyPond-Installation-Frescobaldi-Installation">
<title>Requirements and Installation (for <application>Frescobaldi</application>)</title>
<para>
- Use <application>PackageKit</application> or <application>KPackageKit</application> to install the <package>frescobaldi</package> package. Review dependencies carefully before you approve the installation. <application>Frescobaldi</application> depends on many other packages, including:
+ Use <application>PackageKit</application> or <application>Apper</application> to install the <package>frescobaldi</package> package. Review dependencies carefully before you approve the installation. <application>Frescobaldi</application> depends on many other packages, including:
<itemizedlist>
<listitem><para><package>perl-<replaceable>*</replaceable></package> packages,</para></listitem>
<listitem><para><package>kde-<replaceable>*</replaceable></package> packages,</para></listitem>
diff --git a/en-US/Qtractor.xml b/en-US/Qtractor.xml
index 06ae8c6..b46b6f5 100644
--- a/en-US/Qtractor.xml
+++ b/en-US/Qtractor.xml
@@ -49,7 +49,7 @@
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.
+ After you enable the "RPM Fusion" or "Planet CCRMA at Home" repository, use PackageKit or Apper to install the "qtractor" packge. Other required software is installed automatically.
</para>
</section>
</section>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index fa6e3b1..9bd84f4 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -389,28 +389,30 @@
</revdescription>
</revision>
+ <revision>
+ <revnumber>16.9</revnumber>
+ <date>30 December 2011</date>
+ <author>
+ <firstname>Christopher</firstname>
+ <surname>Antila</surname>
+ <email>crantila(a)fedoraproject.org</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Fixed Bug 751456 ("Update Binary Unit Notation for Docs Project Consistency")</member>
+ <member>Fixed Bug 769137 ("F16 Planet CCRMA Documentation links to F13 Repo")</member>
+ <member>Changed all "KPackageKit" references to "Apper."</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+
<!-- NOTE: When adding a revision above, be sure to update the <edition> tag in "Book_Info.xml" -->
- <!-- Fedora 16 (General) -->
+ <!-- Fedora 16 -->
<!-- TODO: standardize the paragraph about installing JACK -->
<!-- TODO: Bug 710330 ("Section 11.5.1 Broken Link to Local Help File") -->
- <!-- DONE: Add R. Landmann to Contributors appendix -->
- <!-- 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") -->
<!-- TODO: Revise the LilyPond introductory chapters -->
- <!-- DONE: Introduction: is "ooolilypond" gone or replaced? -->
- <!-- DONE: Bug 710336 ("Section 13 Integration with Section 12") -->
-
- <!-- Fedora 16 (Qthings) -->
- <!-- QA: Bug 670540 ("Qsynth's MIDI driver... ") -->
- <!-- QA: Bug 670533 ("Qtractor chapter needs step-by-step... ") -->
<!-- Fedora 17 (early 2012) -->
<!-- TODO: convert SuperCollider examples to <xi:include ... /> -->
diff --git a/en-US/Rosegarden.xml b/en-US/Rosegarden.xml
index 6ac9397..a92ebf6 100644
--- a/en-US/Rosegarden.xml
+++ b/en-US/Rosegarden.xml
@@ -37,7 +37,7 @@
<section id="sect-Musicians_Guide-Rosegarden-Installation">
<title>Installation</title>
<para>
- Use <application>PackageKit</application> or <application>KPackageKit</application> to install the <package>rosegarden4</package> packge. <application>PackageKit</application> automatically installs other required software.
+ Use <application>PackageKit</application> or <application>Apper</application> to install the <package>rosegarden4</package> packge. <application>PackageKit</application> automatically installs other required software.
</para>
</section>
</section> <!-- Ends "Requirements and Installation" Section -->
diff --git a/en-US/Solfege.xml b/en-US/Solfege.xml
index ef0a7be..83346d2 100644
--- a/en-US/Solfege.xml
+++ b/en-US/Solfege.xml
@@ -31,7 +31,7 @@
Please review the "Requirements" section above, before installation.
</para>
<para>
- Use PackageKit, KPackageKit to install the <package>solfege</package> package.
+ Use PackageKit, Apper to install the <package>solfege</package> package.
</para>
</section>
<section id="sect-Musicians_Guide-Solfege-Install_Csound">
@@ -40,7 +40,7 @@
Csound is a sound-synthesis program, similar to SuperCollider. It is older, quite well-developed, and has a broader range of features.
</para>
<para>
- To install Csound, first close Solfege, then use PackageKit or KPackageKit to install the <package>csound</package> package. When Solfege is restarted, you will be able to use the "Intonation" exercises.
+ To install Csound, first close Solfege, then use PackageKit or Apper to install the <package>csound</package> package. When Solfege is restarted, you will be able to use the "Intonation" exercises.
</para>
</section>
<section id="sect-Musicians_Guide-Solfege-Install_MMA">
diff --git a/en-US/Sound_Servers.xml b/en-US/Sound_Servers.xml
index 7c3b71d..0db8bb9 100644
--- a/en-US/Sound_Servers.xml
+++ b/en-US/Sound_Servers.xml
@@ -55,7 +55,7 @@
<section id="sect-Musicians_Guide-Install_and_Configure_JACK">
<title>Install and Configure <systemitem>JACK</systemitem></title>
<procedure>
- <step><para>Use <application>PackageKit</application> or <application>KPackageKit</application> to install the <package>jack-audio-connection-kit</package> and <package>qjackctl</package> packages.</para></step>
+ <step><para>Use <application>PackageKit</application> or <application>Apper</application> to install the <package>jack-audio-connection-kit</package> and <package>qjackctl</package> packages.</para></step>
<step><para>Review and approve the installation, making sure that it completes correctly.</para></step>
<step><para>Run <application>QjackCtl</application> from the KMenu or the Applications menu.</para></step>
<step><para>To start the <systemitem>JACK</systemitem> server click <guibutton>Start</guibutton>. To stop the <systemitem>JACK</systemitem> server click <guibutton>Stop</guibutton>.</para></step>
@@ -105,7 +105,7 @@
The default configuration of <systemitem>PulseAudio</systemitem> yields control of the audio equipment to <systemitem>JACK</systemitem> when the <systemitem>JACK</systemitem> server starts. <systemitem>PulseAudio</systemitem> will not be able to receive input or send output of any audio signals on the audio interface used by <systemitem>JACK</systemitem>. This is fine for occasional users of <systemitem>JACK</systemitem>, but many users will want to use <systemitem>JACK</systemitem> and <systemitem>PulseAudio</systemitem> simultaneously, or switch between the two frequently. The following instructions will configure <systemitem>PulseAudio</systemitem> so that its input and output is routed through <systemitem>JACK</systemitem>.
</para>
<procedure>
- <step><para>Use PackageKit or KPackageKit to install the <package>pulseaudio-module-jack</package> package.</para></step>
+ <step><para>Use PackageKit or Apper to install the <package>pulseaudio-module-jack</package> package.</para></step>
<step><para>Approve the installation and ensure that it is carried out properly.</para></step>
<step><para>You'll need to edit the <systemitem>PulseAudio</systemitem> configuration file to use the <systemitem>JACK</systemitem> module.</para>
<substeps>
commit 0a834b44938e4ceb2774c44192a25a8fbc652526
Author: Christopher Antila <crantila(a)fedoraproject.org>
Date: Fri Dec 30 23:00:39 2011 -0500
fixed minor XML errors
en-US/Planet_CCRMA_at_Home.xml | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/en-US/Planet_CCRMA_at_Home.xml b/en-US/Planet_CCRMA_at_Home.xml
index dea0055..bc155fd 100644
--- a/en-US/Planet_CCRMA_at_Home.xml
+++ b/en-US/Planet_CCRMA_at_Home.xml
@@ -81,9 +81,9 @@
</section>
<section id="sect-Musicians_Guide-Using_Planet_CCRMA_Software">
- <title>Using Software from Planet CCRMA at Home</title>
+ <title>Use Software from Planet CCRMA at Home</title>
<para>
- "Planet CCRMA at Home" is a project at Stanford University, not stored on the Fedora servers. You must tell <command>yum</command> (the command-line tool used by <application>PackageKit</application> and <application>Apper</appliation>) that you want to use Planet CCRMA at Home. After you install the "Planet CCRMA at Home" repository, you can install Planet CCRMA software the same way as Fedora software.
+ "Planet CCRMA at Home" is a project at Stanford University, not stored on the Fedora servers. You must tell <command>yum</command> (the command-line tool used by <application>PackageKit</application> and <application>Apper</application>) that you want to use Planet CCRMA at Home. After you install the "Planet CCRMA at Home" repository, you can install Planet CCRMA software the same way as Fedora software.
</para>
<section id="sect-Musicians_Guide-CCRMA_Installing_Repository">
<title>Install the "Planet CCRMA at Home" Software Repository</title>
@@ -93,7 +93,9 @@
</para>
<para>
<note>
- You can use this procedure for any version of Fedora on both x86 (32-bit) and x86-64 (64-bit) installations. <command>Yum</command> automatically installs the correct packages.
+ <para>
+ You can use this procedure for any version of Fedora on both x86 (32-bit) and x86-64 (64-bit) installations. <command>Yum</command> automatically installs the correct packages.
+ </para>
</note>
</para>
<step><para>Update your computer with <application>PackageKit</application>, <application>Apper</application>, or <command>yum</command>.</para></step>
@@ -112,9 +114,13 @@
</para>
<para>
By default, <command>yum</command> installs the package with the highest version number, regardless of the repository. You can change <command>yum</command> to install packages from a specific repository, even when another repository has a higher version number.
- <warning>
- Think about your repository priorities carefully. You may accidentally cause <command>yum</command> to not install security updates and accidentally leave your computer vulnerable to attack.
- </warning>
+ </para>
+ <warning>
+ <para>
+ Think about your repository priorities carefully. You may accidentally cause <command>yum</command> to not install security updates and accidentally leave your computer vulnerable to attack.
+ </para>
+ </warning>
+ <para>
If you want to prevent one or a few packages from being updated, see <xref linkend="sect-Musicians_Guide-CCRMA_Preventing_Package_Updates" /> for more appropriate instructions.
</para>
<procedure>
@@ -130,9 +136,13 @@
</para>
<para>
By default, <command>yum</command> installs the latest version of packages. You can change <command>yum</command> to not update certain packages, even when a newer version is available.
- <warning>
+ </para>
+ <warning>
+ <para>
Avoid using this plugin unless absolutely necessary. You may cause <command>yum</command> to not install an important security update, and leave your computer vulnerable to attack.
- </warning>
+ </para>
+ </warning>
+ <para>
If you want <command>yum</command> to install packages from a specific repository, even when they are available from another repository, see <xref linkend="sect-Musicians_Guide-CCRMA_Repository_Priorities" /> for more appropriate instructions.
<orderedlist>
<listitem><para>Install the <package>yum-plugin-versionlock</package> package.</para></listitem>
commit 49b538d6c3c80b526be06a09d9ac63b3b1275d0d
Author: Christopher Antila <crantila(a)fedoraproject.org>
Date: Fri Dec 30 22:37:31 2011 -0500
Fixed bug 769137 in Chapter about Planet CCRMA
en-US/Planet_CCRMA_at_Home.xml | 62 +++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 29 deletions(-)
---
diff --git a/en-US/Planet_CCRMA_at_Home.xml b/en-US/Planet_CCRMA_at_Home.xml
index ec78a82..dea0055 100644
--- a/en-US/Planet_CCRMA_at_Home.xml
+++ b/en-US/Planet_CCRMA_at_Home.xml
@@ -83,57 +83,61 @@
<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 &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.
+ "Planet CCRMA at Home" is a project at Stanford University, not stored on the Fedora servers. You must tell <command>yum</command> (the command-line tool used by <application>PackageKit</application> and <application>Apper</appliation>) that you want to use Planet CCRMA at Home. After you install the "Planet CCRMA at Home" repository, you can install Planet CCRMA software the same way as Fedora software.
</para>
<section id="sect-Musicians_Guide-CCRMA_Installing_Repository">
- <title>Installing the Planet CCRMA at Home Repositories</title>
+ <title>Install the "Planet CCRMA at Home" Software Repository</title>
<procedure>
+ <para> <!-- I didn't used &OPERATING_SYSTEM; here because it's Fedora-specific (CRA) -->
+ Follow this procedure to install the "Planet CCRMA at Home" repository, intended only for Fedora-based computers.
+ </para>
<para>
- The following steps will install the Planet CCRMA at Home repository, intended only for &OPERATING_SYSTEM;-based computers.
+ <note>
+ You can use this procedure for any version of Fedora on both x86 (32-bit) and x86-64 (64-bit) installations. <command>Yum</command> automatically installs the correct packages.
+ </note>
</para>
- <step><para>Update your computer with PackageKit, KPackageKit.</para></step>
+ <step><para>Update your computer with <application>PackageKit</application>, <application>Apper</application>, or <command>yum</command>.</para></step>
<step><para>Run the following command in a terminal window:</para>
-<screen><command>su -c 'rpm -Uvh http://ccrma.stanford.edu/planetccrma/mirror/fedora/linux/\</command>
-<command>planetccrma/13/i386/planetccrma-repo-1.1-2.fc13.ccrma.noarch.rpm</command></screen>
- <para>This works for all versions of Fedora, whether 32-bit and 64-bit. Note that the command is a single line, broken here for presentation purposes.</para></step>
+<screen><command>su -c 'yum localinstall http://ccrma.stanford.edu/planetccrma/mirror/fedora/linux/\</command>
+<command>planetccrma/16/i386/planetccrma-repo-1.1-3.fc16.ccrma.noarch.rpm</command></screen>
+ </step>
<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 &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>
+ <step><para>Some packages are available from &O_S; and Planet CCRMA. Your computer automatically installs the package with the highest version number.</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:
- <itemizedlist>
- <listitem><para><literal>-U</literal> means "upgrade," which will install the specified package, and remove any previously-installed version</para></listitem>
- <listitem><para><literal>-v</literal> means "verbose," which will print additional information meessages</para></listitem>
- <listitem><para><literal>-h</literal> means "hash," which will display hash marks (these: <literal>#</literal>) showing the progress of installation.</para></listitem>
- </itemizedlist>
- </para>
</section>
<section id="sect-Musicians_Guide-CCRMA_Repository_Priorities">
<title>Set Repository Priorities</title>
<para>
- This is optional, and recommended only for advanced users. <application>yum</application> normally installs the latest version of a package, regardless of which repository provides it. Using this plugin will change this behaviour, so that <application>yum</application> will choose package versions primarily based on which repository provides it. If a newer version is available at a repository with lower priority, <application>yum</application> does not upgrade the package. If you simply wish to prevent a particular package from being updated, the instructions in <xref linkend="sect-Musicians_Guide-CCRMA_Preventing_Package_Updates" /> are better-suited to your needs.
+ This is optional, and we recommend it for advanced users.
+ </para>
+ <para>
+ By default, <command>yum</command> installs the package with the highest version number, regardless of the repository. You can change <command>yum</command> to install packages from a specific repository, even when another repository has a higher version number.
+ <warning>
+ Think about your repository priorities carefully. You may accidentally cause <command>yum</command> to not install security updates and accidentally leave your computer vulnerable to attack.
+ </warning>
+ If you want to prevent one or a few packages from being updated, see <xref linkend="sect-Musicians_Guide-CCRMA_Preventing_Package_Updates" /> for more appropriate instructions.
</para>
<procedure>
<step><para>Install the <package>yum-plugin-priorities</package> package.</para></step>
- <step><para>Use a text editor or the <application>cat</application> or <application>less</application> command to verify that <filename>/etc/yum/pluginconf.d/priorities.conf</filename> exists, and contains the following text:
-<programlisting><![CDATA[
-[main]
-enabled = 1
-]]></programlisting>
- If you want to stop using the plugin, you can edit this file so that it contains <code>enabled = 0</code> This allows you to keep the priorities as set in the repository configuration files.</para></step>
+ <step><para>Use a text editor or the <application>cat</application> or <application>less</application> command to verify that <filename>/etc/yum/pluginconf.d/priorities.conf</filename> exists, and contains the following text: <code>enabled = 1</code>. If you want to stop using the plugin, you can edit this file so it contains <code>enabled = 0</code>. This does not affect the priorities set in the repository configuration files.</para></step>
<step><para>You can set priorities for some or all repositories. To add a priority to a repository, edit its respective file in the <filename>/etc/yum.repos.d/<replaceable>*</replaceable></filename> directory, adding a line like: <literal>priority = <replaceable>N</replaceable></literal> where <literal>N</literal> is a number between <literal>1</literal> and <literal>99</literal>, inclusive. A priority of <literal>1</literal> is the highest setting, and <literal>99</literal> is the lowest. You will need to set priorities of at least two repositories before this becomes useful.</para></step>
</procedure>
</section>
<section id="sect-Musicians_Guide-CCRMA_Preventing_Package_Updates">
<title>Prevent a Package from Being Updated</title>
<para>
- This is optional, and recommended only for advanced users. <command>yum</command> normally installs the latest version of packages. This plugin prevents certain packages from being updated. If you wish to prevent packages from a particular repository from being used, then <xref linkend="sect-Musicians_Guide-CCRMA_Repository_Priorities" /> is better-suited to your needs.
+ This is optional, and we recommend it for advanced users.
+ </para>
+ <para>
+ By default, <command>yum</command> installs the latest version of packages. You can change <command>yum</command> to not update certain packages, even when a newer version is available.
+ <warning>
+ Avoid using this plugin unless absolutely necessary. You may cause <command>yum</command> to not install an important security update, and leave your computer vulnerable to attack.
+ </warning>
+ If you want <command>yum</command> to install packages from a specific repository, even when they are available from another repository, see <xref linkend="sect-Musicians_Guide-CCRMA_Repository_Priorities" /> for more appropriate instructions.
<orderedlist>
- <listitem><para>Install the <literal>yum-plugin-versionlock</literal> package.</para></listitem>
- <listitem><para>Use a text editor or the <command>cat</command> or <command>less</command> command to verify that <filename>/etc/yum/pluginconf.d/versionlock.conf</filename> exists, and contains the following text: <code>enabled = 1</code></para></listitem>
- <listitem><para>Add the list of packages which you do not want to be updated to <filename>/etc/yum/pluginconf.d/versionlock.list</filename>. Each package should go on its own line. For example:
+ <listitem><para>Install the <package>yum-plugin-versionlock</package> package.</para></listitem>
+ <listitem><para>Use a text editor or the <command>cat</command> or <command>less</command> command to verify that <filename>/etc/yum/pluginconf.d/versionlock.conf</filename> exists, and contains the following text: <code>enabled = 1</code> If you want to stop using the plugin, you can edit this file so it contains <code>enabled = 0</code>.</para></listitem>
+ <listitem><para>Add the list of packages which you do not want to update to <filename>/etc/yum/pluginconf.d/versionlock.list</filename>. Each package should go on its own line. For example:
<programlisting><![CDATA[
jack-audio-connect-kit-1.9.4
qjackctl-0.3.6
commit 3c494810a29eb45d387527f37df8ac88eb9b13a4
Author: Christopher Antila <crantila(a)fedoraproject.org>
Date: Fri Dec 30 21:48:21 2011 -0500
Fixed bug 751456 in Chapter 1
en-US/Sound_Cards.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/en-US/Sound_Cards.xml b/en-US/Sound_Cards.xml
index cc9097c..c2785bf 100644
--- a/en-US/Sound_Cards.xml
+++ b/en-US/Sound_Cards.xml
@@ -13,15 +13,15 @@
<section id="sect-Musicians_Guide-What_Sound_Cards_Are">
<title>Types of Sound Cards</title>
<para>
- A sound card is a hardware device which allows a computer to process sound. Most sound cards are either audio interfaces or MIDI interfaces. These two kinds of interfaces are described below.
+ Sound cards are hardware devices that allow computers to process sound. Most sound cards are either audio interfaces or MIDI interfaces. This section describes the two types of audio interfaces.
</para>
<section id="sect-Musicians_Guide-Audio_Interfaces">
<title>Audio Interfaces</title>
<para>
- An audio interface is a hardware device that provides a connection between your computer and audio equipment, including microphones and speakers. Audio interfaces usually convert audio signals between analog and digital formats: signals entering the computer are passed through an analog-to-digital convertor, and signals leaving the computer are passed through a digital-to-analog convertor. Some audio interfaces have digital input and output ports, which means that other devices perform the conversion between analog and digital signal formats.
+ Audio interfaces are hardware deviced that connect your computer and audio equipment (like microphones and speakers). Audio interfaces convert signals between analog and digital formats: signals enter the computer and pass through an analog-to-digital convertor; signals leave the computer and pass through a digital-to-analog convertor. Some audio interfaces have digital input and output ports, so other devices perform the conversion between analog and digital signal formats.
</para>
<para>
- The conversion between analog and digital audio signal formats is the primary function of audio interfaces. Real sound has an infinite range of pitch, volume, and durational possibilities. Computers cannot process infinite information, and require sound to be converted to a digital format. Digital sound signals have a limited range of pitch, volume, and durational possibilities. High-quality analog-to-digital and digital-to-analog convertors change the signal format in a way that keeps the original, analog signal as closely as possible. The quality of the convertors is very important in determining the quality of an audio interface.
+ The conversion between analog and digital audio signal formats is the primary function of audio interfaces. Sound has an infinite range of pitch, volume, and durational possibilities. Computers cannot process infinite information, so sound is converted to a digital format. Digital sound signals have a limited range of pitch, volume, and durational possibilities. High-quality analog-to-digital and digital-to-analog convertors change the signal format in a way that keeps the original, analog signal as closely as possible. The quality of the convertors is what determines the quality of an audio interface.
</para>
<para>
Audio interfaces also provide connectors for external audio equipment, like microphones, speakers, headphones, and electric instruments like electric guitars.
@@ -128,7 +128,7 @@
<section id="sect-Musicians_Guide-Sample_Format">
<title>Sample Format</title>
<para>
- The sample format is the number of bits used to describe each sample. The greater the number of bits, the more data will be stored in each sample. Common sample formats are 16 bits and 24 bits. 8 bit samples are low-quality, and not used often. 20 bit samples are not commonly used on computers. 32 bit samples are possible, but not supported by most audio interfaces.
+ The sample format is the number of bits used to describe each sample. The greater the number of bits, the more data will be stored in each sample. Common sample formats are 16 bits and 24 bits. 8-bit samples are low-quality, and not used often. 20-bit samples are not commonly used on computers. 32-bit samples are possible, but not supported by most audio interfaces.
</para>
</section>
<section id="sect-Musicians_Guide-Sample_Rate">
@@ -140,10 +140,10 @@
<section id="sect-Musicians_Guide-Bit_Rate">
<title>Bit Rate</title>
<para>
- Bit rate is the number of bits in a given time period. Bit rate is usually measured in kilobits per second (abbreviated "kbps" or "kb/s"). This measurement is generally used to refer to amount of information stored in a lossy, compressed audio format.
+ Bit rate is the number of bits in a time period. Bit rate is usually measured in kilobits per second (abbreviated "kbps" or "kbit/s"). This measurement is generally used to refer to amount of information stored in a lossy, compressed audio format.
</para>
<para>
- In order to calculate the bit rate, multiply the sample rate and the sample format. For example, the bit rate of an audio CD (705.6 kb/s) is the sample rate (44.1 kHz) multiplied by the sample format (16 bits). MP3-format files are commonly encoded with a 128 kb/s bit rate.
+ To calculate the bit rate, multiply the sample rate and the sample format. For example, the bit rate of an audio CD (705.6 kbps) is the sample rate (44.1 kHz) multiplied by the sample format (16 bits). MP3-format files are commonly encoded with a 128 kbps bit rate.
</para>
</section>
<section id="sect-Musicians_Guide-Bit_and_Sample_Rate_Conclusions">
@@ -154,10 +154,10 @@
<para>
Here are some widely-used sample rates and sample formats. You can use these to help you decide which sample rate and sample format to use.
<itemizedlist>
- <listitem><para>16-bit samples, 44.1 kHz sample rate. Used for audio CDs. Widely compatible. Bit rate of 705.6 kb/s.</para></listitem>
- <listitem><para>24-bit samples, and 96 kHz sample rate. Audio CDs are recorded with these settings and "down-mixed" later. Bit rate of 2304 kb/s.</para></listitem>
- <listitem><para>24-bit samples, and 192 kHz sample rate. Maximum settings for DVD Audio, but not widely compatible. Bit rate of 4608 kb/s.</para></listitem>
- <listitem><para>1-bit samples, and 2822.4 kHz sample rate. Used for SuperAudio CDs. Very rare elsewhere. Bit rate of 2822.4 kb/s.</para></listitem>
+ <listitem><para>16-bit samples, 44.1 kHz sample rate. Used for audio CDs. Widely compatible. Bit rate of 705.6 kbps.</para></listitem>
+ <listitem><para>24-bit samples, and 96 kHz sample rate. Audio CDs are recorded with these settings and "down-mixed" later. Bit rate of 2304 kbps.</para></listitem>
+ <listitem><para>24-bit samples, and 192 kHz sample rate. Maximum settings for DVD Audio, but not widely compatible. Bit rate of 4608 kbps.</para></listitem>
+ <listitem><para>1-bit samples, and 2822.4 kHz sample rate. Used for SuperAudio CDs. Very rare elsewhere. Bit rate of 2822.4 kbps.</para></listitem>
</itemizedlist>
</para>
<para>
Summary of changes:
9819afb... Updates pot and po files (*)
b7b0891... adding .tx dir to f16 branch (*)
34b54f2... Fixed productname and productnumber in xml source (*)
157a743... updates pot/po's files after bookinfo fix (*)
92beebb... still in troubles with some tags (*)
97a74d9... another test (*)
d5e4a28... version overwrite removed (*)
e248f85... minor edits (*)
30e9eef... pubilcan config fixed (*)
4678ab2... Merge branch 'f16' of ssh://git.fedorahosted.org/git/docs/s (*)
7ea6f8c... Merge branch 'f16'
(*) This commit already existed in another branch; no separate mail sent