[musicians-guide] Significant revision to Audacity and some to JACK configuration

crantila crantila at fedoraproject.org
Thu Aug 5 07:18:38 UTC 2010


commit 5099548df6f80d96099a3a96177036246b0c497e
Author: Christopher Antila <crantila at fedoraproject.org>
Date:   Thu Aug 5 03:17:24 2010 -0400

    Significant revision to Audacity and some to JACK configuration

 en-US/Audacity.xml                                 |  436 +-
 en-US/Revision_History.xml                         |    3 +-
 ...ft_Documentation-0.1-Musicians_Guide-en-US.epub |  Bin 393731 -> 0 bytes
 .../Musicians_Guide/Common_Content/css/common.css  | 1467 -----
 .../Musicians_Guide/Common_Content/css/default.css |    3 -
 .../Musicians_Guide/Common_Content/css/lang.css    |    2 -
 .../Common_Content/css/overrides.css               |   51 -
 .../Musicians_Guide/Common_Content/css/print.css   |   16 -
 .../Musicians_Guide/Common_Content/images/1.png    |  Bin 690 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/1.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/10.png   |  Bin 982 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/10.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/11.png   |  Bin 806 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/11.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/12.png   |  Bin 953 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/12.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/13.png   |  Bin 1015 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/13.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/14.png   |  Bin 933 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/14.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/15.png   |  Bin 996 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/15.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/16.png   |  Bin 1030 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/16.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/17.png   |  Bin 870 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/17.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/18.png   |  Bin 1001 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/18.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/19.png   |  Bin 1013 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/19.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/2.png    |  Bin 808 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/2.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/20.png   |  Bin 1121 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/20.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/21.png   |  Bin 981 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/21.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/22.png   |  Bin 1057 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/22.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/23.png   |  Bin 1120 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/23.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/3.png    |  Bin 868 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/3.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/4.png    |  Bin 794 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/4.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/5.png    |  Bin 853 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/5.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/6.png    |  Bin 865 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/6.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/7.png    |  Bin 742 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/7.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/8.png    |  Bin 862 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/8.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/9.png    |  Bin 860 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/9.svg    |   22 -
 .../Common_Content/images/bkgrnd_greydots.png      |  Bin 157 -> 0 bytes
 .../Common_Content/images/bullet_arrowblue.png     |  Bin 177 -> 0 bytes
 .../Common_Content/images/documentation.png        |  Bin 623 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/dot.png  |  Bin 98 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/dot2.png |  Bin 98 -> 0 bytes
 .../Common_Content/images/h1-bg.png                |  Bin 565 -> 0 bytes
 .../Common_Content/images/image_left.png           |  Bin 1114 -> 0 bytes
 .../Common_Content/images/image_right.png          |  Bin 2260 -> 0 bytes
 .../Common_Content/images/important.png            |  Bin 2080 -> 0 bytes
 .../Common_Content/images/important.svg            |  106 -
 .../Musicians_Guide/Common_Content/images/logo.png |  Bin 1114 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/note.png |  Bin 1241 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/note.svg |  111 -
 .../Common_Content/images/shade.png                |  Bin 101 -> 0 bytes
 .../Common_Content/images/shine.png                |  Bin 146 -> 0 bytes
 .../Common_Content/images/stock-go-back.png        |  Bin 828 -> 0 bytes
 .../Common_Content/images/stock-go-forward.png     |  Bin 828 -> 0 bytes
 .../Common_Content/images/stock-go-up.png          |  Bin 760 -> 0 bytes
 .../Common_Content/images/stock-home.png           |  Bin 808 -> 0 bytes
 .../Common_Content/images/title_logo.png           |  Bin 13399 -> 0 bytes
 .../Common_Content/images/title_logo.svg           |   61 -
 .../Common_Content/images/warning.png              |  Bin 1340 -> 0 bytes
 .../Common_Content/images/warning.svg              |   89 -
 .../Common_Content/images/watermark-draft.png      |  Bin 25365 -> 0 bytes
 .../0.1/html-single/Musicians_Guide/index.html     | 5813 --------------------
 .../Musicians_Guide/Common_Content/css/common.css  | 1467 -----
 .../Musicians_Guide/Common_Content/css/default.css |    3 -
 .../Musicians_Guide/Common_Content/css/lang.css    |    2 -
 .../Common_Content/css/overrides.css               |   51 -
 .../Musicians_Guide/Common_Content/css/print.css   |   16 -
 .../Musicians_Guide/Common_Content/images/1.png    |  Bin 690 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/1.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/10.png   |  Bin 982 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/10.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/11.png   |  Bin 806 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/11.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/12.png   |  Bin 953 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/12.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/13.png   |  Bin 1015 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/13.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/14.png   |  Bin 933 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/14.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/15.png   |  Bin 996 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/15.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/16.png   |  Bin 1030 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/16.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/17.png   |  Bin 870 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/17.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/18.png   |  Bin 1001 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/18.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/19.png   |  Bin 1013 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/19.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/2.png    |  Bin 808 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/2.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/20.png   |  Bin 1121 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/20.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/21.png   |  Bin 981 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/21.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/22.png   |  Bin 1057 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/22.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/23.png   |  Bin 1120 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/23.svg   |   22 -
 .../Musicians_Guide/Common_Content/images/3.png    |  Bin 868 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/3.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/4.png    |  Bin 794 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/4.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/5.png    |  Bin 853 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/5.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/6.png    |  Bin 865 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/6.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/7.png    |  Bin 742 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/7.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/8.png    |  Bin 862 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/8.svg    |   22 -
 .../Musicians_Guide/Common_Content/images/9.png    |  Bin 860 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/9.svg    |   22 -
 .../Common_Content/images/bkgrnd_greydots.png      |  Bin 157 -> 0 bytes
 .../Common_Content/images/bullet_arrowblue.png     |  Bin 177 -> 0 bytes
 .../Common_Content/images/documentation.png        |  Bin 623 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/dot.png  |  Bin 98 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/dot2.png |  Bin 98 -> 0 bytes
 .../Common_Content/images/h1-bg.png                |  Bin 565 -> 0 bytes
 .../Common_Content/images/image_left.png           |  Bin 1114 -> 0 bytes
 .../Common_Content/images/image_right.png          |  Bin 2260 -> 0 bytes
 .../Common_Content/images/important.png            |  Bin 2080 -> 0 bytes
 .../Common_Content/images/important.svg            |  106 -
 .../Musicians_Guide/Common_Content/images/logo.png |  Bin 1114 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/note.png |  Bin 1241 -> 0 bytes
 .../Musicians_Guide/Common_Content/images/note.svg |  111 -
 .../Common_Content/images/shade.png                |  Bin 101 -> 0 bytes
 .../Common_Content/images/shine.png                |  Bin 146 -> 0 bytes
 .../Common_Content/images/stock-go-back.png        |  Bin 828 -> 0 bytes
 .../Common_Content/images/stock-go-forward.png     |  Bin 828 -> 0 bytes
 .../Common_Content/images/stock-go-up.png          |  Bin 760 -> 0 bytes
 .../Common_Content/images/stock-home.png           |  Bin 808 -> 0 bytes
 .../Common_Content/images/title_logo.png           |  Bin 13399 -> 0 bytes
 .../Common_Content/images/title_logo.svg           |   61 -
 .../Common_Content/images/warning.png              |  Bin 1340 -> 0 bytes
 .../Common_Content/images/warning.svg              |   89 -
 .../Common_Content/images/watermark-draft.png      |  Bin 25365 -> 0 bytes
 .../appe-Musicians_Guide-Revision_History.html     |   12 -
 .../chap-Musicians_Guide-Ardour.html               |   13 -
 .../chap-Musicians_Guide-Audacity.html             |   11 -
 ...Musicians_Guide-Digital_Audio_Workstations.html |   27 -
 .../chap-Musicians_Guide-FluidSynth.html           |   37 -
 .../chap-Musicians_Guide-Frescobaldi.html          |   29 -
 ...ans_Guide-How_Computers_Deal_with_Hardware.html |    7 -
 .../chap-Musicians_Guide-LilyPond.html             |   29 -
 .../chap-Musicians_Guide-Planet_CCRMA_at_Home.html |   11 -
 .../chap-Musicians_Guide-Qtractor.html             |   21 -
 ...-Musicians_Guide-Real_Time_and_Low_Latency.html |   11 -
 .../chap-Musicians_Guide-Rosegarden.html           |   15 -
 .../chap-Musicians_Guide-Solfege.html              |   19 -
 .../chap-Musicians_Guide-Sound_Cards.html          |   19 -
 .../chap-Musicians_Guide-SuperCollider.html        |   23 -
 .../chap-Musicians_Guide-Vocabulary.html           |    7 -
 .../0.1/html/Musicians_Guide/index.html            |   26 -
 .../0.1/html/Musicians_Guide/ix01.html             |    3 -
 .../0.1/html/Musicians_Guide/pr01s02.html          |    9 -
 .../pref-Musicians_Guide-Preface.html              |   88 -
 .../0.1/html/Musicians_Guide/pt01.html             |    5 -
 .../0.1/html/Musicians_Guide/pt02.html             |    5 -
 ...Guide-Ardour-Editing-Add_Regions_to_Tracks.html |   33 -
 ...ians_Guide-Ardour-Editing-Arrange-Clarinet.html |   11 -
 ...uide-Ardour-Editing-Arrange-Marimba_at_End.html |   19 -
 ...cians_Guide-Ardour-Editing-Arrange-Strings.html |   12 -
 ...sicians_Guide-Ardour-Editing-Arrange-Voice.html |   27 -
 ...ect-Musicians_Guide-Ardour-Editing-Arrange.html |   76 -
 ...mpare_Multiple_Recordings-Clarinet_3_and_4.html |   33 -
 ...ltiple_Recordings-Create_the_Inconceivable.html |   15 -
 ...ng-Compare_Multiple_Recordings-Here_Is_How.html |   12 -
 ...diting-Compare_Multiple_Recordings-Marimba.html |    5 -
 ...diting-Compare_Multiple_Recordings-Strings.html |   23 -
 ...ting-Compare_Multiple_Recordings-Strings_1.html |   20 -
 ...-Editing-Compare_Multiple_Recordings-Voice.html |   53 -
 ...Ardour-Editing-Compare_Multiple_Recordings.html |   34 -
 ...e-Ardour-Editing-Connect_Tracks_and_Busses.html |   86 -
 ...de-Ardour-Editing-Cut_Regions_Down_to_Size.html |   77 -
 ...Musicians_Guide-Ardour-Editing-Edit_Groups.html |    5 -
 ...sect-Musicians_Guide-Ardour-Editing-Listen.html |    5 -
 .../sect-Musicians_Guide-Ardour-Editing.html       |  107 -
 ...de-Ardour-Mastering-Choosing_Export_Format.html |   31 -
 ...Guide-Ardour-Mastering-Using_Export_Window.html |    7 -
 .../sect-Musicians_Guide-Ardour-Mastering.html     |   47 -
 ...ians_Guide-Ardour-Mixing-Automation_Tracks.html |   35 -
 .../sect-Musicians_Guide-Ardour-Mixing-Listen.html |    5 -
 ...Musicians_Guide-Ardour-Mixing-Other_Things.html |   19 -
 ...ans_Guide-Ardour-Mixing-Set_Initial_Levels.html |   31 -
 ...ns_Guide-Ardour-Mixing-Set_Initial_Panning.html |   55 -
 .../sect-Musicians_Guide-Ardour-Mixing.html        |   37 -
 ...Ardour-Recording-Adjusting_Recording_Level.html |   73 -
 ...-Ardour-Recording-Capture_Additional_Parts.html |   29 -
 ...-Ardour-Recording-Connecting_Audio_Sources.html |    5 -
 ...-Ardour-Recording-Importing_Existing_Audio.html |   51 -
 ...Musicians_Guide-Ardour-Recording-Interface.html |   11 -
 ...ians_Guide-Ardour-Recording-Recording_More.html |   19 -
 ..._Guide-Ardour-Recording-Recording_a_Region.html |   43 -
 ...sicians_Guide-Ardour-Recording-Redo_a_Take.html |   21 -
 ...cians_Guide-Ardour-Recording-Routing_Audio.html |   33 -
 ...our-Recording-Setting_up_Busses_and_Tracks.html |   37 -
 ...e-Ardour-Recording-Setting_up_the_Timeline.html |   62 -
 ...Musicians_Guide-Ardour-Recording_a_Session.html |    9 -
 ...sect-Musicians_Guide-Ardour-Tutorial_Files.html |    9 -
 ...de-Audacity-Configure_to_Use_Your_Hardware.html |   25 -
 ...ians_Guide-Audacity-Exporting_a_Whole_File.html |   12 -
 ...cians_Guide-Audacity-Hardware_Requirements.html |    5 -
 ...sect-Musicians_Guide-Audacity-Installation.html |   13 -
 ...uide-Audacity-Installation_with_RPM_Fusion.html |   15 -
 .../sect-Musicians_Guide-Audacity-Interface.html   |    5 -
 ...ide-Audacity-Requirements_and_Installation.html |    9 -
 ...icians_Guide-Audacity-Saving_and_Exporting.html |   18 -
 ...de-Audacity-Setting_Sample_Rate_and_Format.html |   22 -
 ...-Musicians_Guide-Audacity-Testing_Playback.html |   17 -
 ...Musicians_Guide-Audacity-Testing_Recording.html |   27 -
 ...torial-Adjusting_Volume_and_Removing_Noise.html |   39 -
 ...ns_Guide-Audacity-Tutorial-Aligning_Tracks.html |   25 -
 ...ide-Audacity-Tutorial-Continuing_to_Record.html |   35 -
 ...s_Guide-Audacity-Tutorial-Further_Comments.html |   13 -
 ...icians_Guide-Audacity-Tutorial-Inspiration.html |    5 -
 ...ans_Guide-Audacity-Tutorial-Removing_Audio.html |   14 -
 ...uide-Audacity-Tutorial-Repeating_a_Segment.html |   15 -
 ...usicians_Guide-Audacity-Tutorial-Scenrario.html |    5 -
 ...cians_Guide-Audacity-Tutorial-Starting_Out.html |   16 -
 ..._Guide-Audacity-Tutorial-Stretching_Tracks.html |   31 -
 ...s_Guide-Audacity-Tutorial-Using_the_Phaser.html |   13 -
 .../sect-Musicians_Guide-Audacity-Tutorial.html    |   15 -
 ...ect-Musicians_Guide-Audacity_Configuration.html |    7 -
 .../sect-Musicians_Guide-Automation.html           |    7 -
 .../sect-Musicians_Guide-Bit_Rate.html             |    7 -
 ...ians_Guide-Bit_and_Sample_Rate_Conclusions.html |   19 -
 ...ring_and_Other_Features-Changing_the_Order.html |    9 -
 ...er_Features-Pausing_and_Restarting_a_Synth.html |    9 -
 ...and_Other_Features-Replace_a_Running_Synth.html |    7 -
 .../sect-Musicians_Guide-CCRMA_Best_Practices.html |   15 -
 ...ans_Guide-CCRMA_Preventing_Package_Updates.html |   13 -
 ...usicians_Guide-CCRMA_Repository_Priorities.html |   13 -
 ...sicians_Guide-CCRMA_Security_and_Stability.html |   11 -
 ...sicians_Guide-Choose_Sound_Card_Connection.html |    5 -
 ...sicians_Guide-Configure_Yourself_Exericses.html |   15 -
 .../sect-Musicians_Guide-DAW_Clock.html            |    7 -
 ...t-Musicians_Guide-DAW_Interface_Vocabulary.html |    9 -
 ...ect-Musicians_Guide-DAW_Transport_Controls.html |   15 -
 .../sect-Musicians_Guide-DAW_User_Interface.html   |    7 -
 .../sect-Musicians_Guide-FireWire_Sound_Cards.html |    7 -
 ...-FluidSynth-Assigning_Programs_to_Channels.html |   29 -
 ...s_Guide-FluidSynth-Configuring-JACK_Output.html |   29 -
 ...ns_Guide-FluidSynth-Configuring-MIDI_Input.html |   19 -
 ...ans_Guide-FluidSynth-Configuring-SoundFont.html |   13 -
 ...luidSynth-Configuring-Viewing_all_Settings.html |   11 -
 ...ect-Musicians_Guide-FluidSynth-Configuring.html |   13 -
 ...t-Musicians_Guide-FluidSynth-In_a_Terminal.html |    9 -
 ...icians_Guide-FluidSynth-Multiple_Instances.html |   19 -
 ...t-Musicians_Guide-FluidSynth-Req_and_Inst-.html |   29 -
 ...Guide-FluidSynth-Req_and_Inst-Installation.html |    7 -
 ...ynth-Req_and_Inst-Installation_with_Qsynth.html |   17 -
 ...h-Req_and_Inst-Installation_without_Qsynth.html |    5 -
 ...e-FluidSynth-Requirements_and_Installation.html |    5 -
 ...sicians_Guide-FluidSynth-Reverb_and_Chorus.html |   31 -
 ...nth-Saving_and_Reusing_Channel_Assignments.html |   21 -
 ...-Musicians_Guide-Frescobaldi-Configuration.html |   42 -
 ...t-Musicians_Guide-Frescobaldi-Installation.html |   11 -
 .../sect-Musicians_Guide-Frescobaldi-Using.html    |    5 -
 ...s_Guide-Getting_Real_Time_Kernel_in_Fedora.html |   15 -
 ...ct-Musicians_Guide-Hard_and_Soft_Real_Time.html |    7 -
 ...ans_Guide-Integrating_PulseAudio_with_JACK.html |   32 -
 ..._Guide-Knowing_Whether_to_Use_Planet_CCRMA.html |    9 -
 ...Counterpoint-Adjusting_Frescobaldis_Output.html |    5 -
 ...LilyPond-Counterpoint-Formatting_the_Score.html |   17 -
 ...ians_Guide-LilyPond-Counterpoint-Inputting.html |   39 -
 ...ounterpoint-Make_some_Elements_Transparent.html |   32 -
 ...ilyPond-Counterpoint-Remove_the_Word_Piano.html |    7 -
 ...e-LilyPond-Counterpoint-Starting_the_Score.html |   25 -
 ...sect-Musicians_Guide-LilyPond-Counterpoint.html |    7 -
 ...sect-Musicians_Guide-LilyPond-Installation.html |   11 -
 ...nd-Orchestra-Adjusting_Frescobaldis_Output.html |   53 -
 ...-LilyPond-Orchestra-Inputting-Fast_Section.html |   17 -
 ...LilyPond-Orchestra-Inputting-Oboe_and_Horn.html |   31 -
 ...Guide-LilyPond-Orchestra-Inputting-Strings.html |   49 -
 ...yPond-Orchestra-Inputting-Wind_and_Timpani.html |   55 -
 ...sicians_Guide-LilyPond-Orchestra-Inputting.html |   23 -
 ...uide-LilyPond-Orchestra-Starting_the_Score.html |   41 -
 .../sect-Musicians_Guide-LilyPond-Orchestra.html   |   11 -
 ...lyPond-Piano-Adjusting_Frescobaldis_Output.html |   23 -
 ...nd-Piano-Formatting-Inputting_the_Dynamics.html |    9 -
 ...-Musicians_Guide-LilyPond-Piano-Formatting.html |   19 -
 ...ond-Piano-Inputting-Cautionary_Accidentals.html |    7 -
 ...-Inputting-Changing_the_Style_of_Crescendo.html |    9 -
 ...ians_Guide-LilyPond-Piano-Inputting-Chords.html |    9 -
 ...s_Guide-LilyPond-Piano-Inputting-Fingering.html |    9 -
 ...ond-Piano-Inputting-Octave_Change_Spanners.html |   19 -
 ...ng-Polyphonic_Sections_of_Homophonic_Music.html |    7 -
 ...t-Musicians_Guide-LilyPond-Piano-Inputting.html |   25 -
 ...ns_Guide-LilyPond-Piano-Starting_the_Score.html |   41 -
 ...uide-LilyPond-Piano-Troubleshooting_Errors.html |   15 -
 .../sect-Musicians_Guide-LilyPond-Piano.html       |   11 -
 ...icians_Guide-LilyPond-Syntax-Articulations.html |   37 -
 ...nd-Syntax-Avoiding_Errors-Bar_Check_Symbol.html |   13 -
 ...ians_Guide-LilyPond-Syntax-Avoiding_Errors.html |   15 -
 ...ect-Musicians_Guide-LilyPond-Syntax-Chords.html |    9 -
 ...ns_Guide-LilyPond-Syntax-Commands-Contexts.html |   81 -
 ...t-Musicians_Guide-LilyPond-Syntax-Commands.html |   21 -
 ...uide-LilyPond-Syntax-Numbers_Are_Durations.html |   11 -
 ...sicians_Guide-LilyPond-Syntax-Simultaneity.html |    7 -
 ...sicians_Guide-LilyPond-Syntax-Source_Files.html |   33 -
 .../sect-Musicians_Guide-LilyPond-Syntax.html      |   21 -
 ...cians_Guide-LilyPond-The_LilyPond_Approach.html |    9 -
 .../sect-Musicians_Guide-Mastering.html            |    7 -
 .../sect-Musicians_Guide-Mixing.html               |   23 -
 .../sect-Musicians_Guide-Multichannel_Audio.html   |    9 -
 .../sect-Musicians_Guide-PCI_Sound_Cards.html      |    5 -
 .../sect-Musicians_Guide-Processor_Scheduling.html |    9 -
 ...-Qtractor-Configuration-MIDI_Channel_Names.html |   17 -
 ...ians_Guide-Qtractor-Configuration-MIDI_Tab.html |   19 -
 ...ect-Musicians_Guide-Qtractor-Configuration.html |   21 -
 ...de-Qtractor-Tutorial-Compose_the_Next_Part.html |   34 -
 ...Guide-Qtractor-Tutorial-Creating_our_Theme.html |   78 -
 ...e-Qtractor-Tutorial-Getting_Qtractor_Ready.html |   26 -
 ...de-Qtractor-Tutorial-Import_the_Audio_File.html |   14 -
 ...tor-Tutorial-Marking_the_First_Formal_Area.html |   20 -
 ...sicians_Guide-Qtractor-Tutorial-Measure_97.html |    5 -
 ...uide-Qtractor-Tutorial-Measures_119_to_139.html |   15 -
 ...uide-Qtractor-Tutorial-Measures_139_to_158.html |    9 -
 ...uide-Qtractor-Tutorial-Measures_158_to_176.html |   11 -
 ...-Qtractor-Tutorial-Measures_177_to_the_End.html |    7 -
 ..._Guide-Qtractor-Tutorial-Measures_52_to_75.html |    7 -
 ..._Guide-Qtractor-Tutorial-Measures_75_to_97.html |   11 -
 ...Guide-Qtractor-Tutorial-Measures_98_to_119.html |    9 -
 ...s_Guide-Qtractor-Tutorial-Repeat_the_Theme.html |   35 -
 ...cians_Guide-Qtractor-Tutorial-Requirements.html |   18 -
 .../sect-Musicians_Guide-Qtractor-Tutorial.html    |   13 -
 ...or-Using-Exporting_Audio_and_MIDI_Together.html |   27 -
 .../sect-Musicians_Guide-Qtractor-Using-JACK.html  |    9 -
 ...-Musicians_Guide-Qtractor-Using-MIDI_Tools.html |   69 -
 ...t-Musicians_Guide-Qtractor-Using-Tips-MIDI.html |    9 -
 .../sect-Musicians_Guide-Qtractor-Using-Tips.html  |   11 -
 .../sect-Musicians_Guide-Qtractor-Using.html       |   53 -
 ...ect-Musicians_Guide-Real_Time_Linux_Kernel.html |    9 -
 ...usicians_Guide-Record_Mix_Master_More_Info.html |   13 -
 .../sect-Musicians_Guide-Region_Clip_Segment.html  |   15 -
 ..._Guide-Rosegarden-Configuration-Rosegarden.html |   32 -
 ...t-Musicians_Guide-Rosegarden-Configuration.html |   56 -
 ...Musicians_Guide-Rosegarden-Tutorial-Melody.html |   32 -
 ...Guide-Rosegarden-Tutorial-Percussion_Track.html |   32 -
 ...osegarden-Tutorial-Spice_up_the_Percussion.html |   30 -
 ...Guide-Rosegarden-Tutorial-Ways_to_Continue.html |   16 -
 .../sect-Musicians_Guide-Rosegarden-Tutorial.html  |   58 -
 ...ct-Musicians_Guide-Rosegarden_and_LilyPond.html |    7 -
 ..._Programming-Busses-Audio_Rate_Bus_Example.html |    7 -
 ...de-SC-Basic_Programming-Busses-Bus_Objects.html |   15 -
 ...rogramming-Busses-Control_Rate_Bus_Example.html |   21 -
 ...g-Busses-Control_Rate_Example-Special_Note.html |    9 -
 ...-Basic_Programming-Busses-Out_and_In_UGens.html |   11 -
 ...usicians_Guide-SC-Basic_Programming-Busses.html |   21 -
 ...Collections-LinkedList-Efficient_Functions.html |   15 -
 ...Programming-Collections-LinkedList-Example.html |    5 -
 ...C-Basic_Programming-Collections-LinkedList.html |   33 -
 ...sic_Programming-Collections-List-Accessing.html |   15 -
 ...ollections-List-Adding_to_an_Existing_List.html |   13 -
 ...asic_Programming-Collections-List-Examples.html |   19 -
 ...asic_Programming-Collections-List-Removing.html |   11 -
 ...uide-SC-Basic_Programming-Collections-List.html |   17 -
 ..._Programming-Collections-Other_Collections.html |   15 -
 ...ans_Guide-SC-Basic_Programming-Collections.html |   19 -
 ...sic_Programming-Combining_and_Mix-Addition.html |    7 -
 ...ramming-Combining_and_Mix-Arrays_of_Arrays.html |    9 -
 ...ide-SC-Basic_Programming-Combining_and_Mix.html |   13 -
 ..._Execution-Assignment_and_Equality_Mistake.html |    5 -
 ...-Conditional_Execution-Boolean_Expressions.html |    7 -
 ...ming-Conditional_Execution-Case_Statements.html |   13 -
 ...itional_Execution-Equality_versus_Identity.html |    5 -
 ...amming-Conditional_Execution-If_Statements.html |   15 -
 ...g-Conditional_Execution-Logical_And_and_Or.html |   13 -
 ...-Conditional_Execution-Order_of_Precedence.html |    7 -
 ...ng-Conditional_Execution-Switch_Statements.html |   13 -
 ...SC-Basic_Programming-Conditional_Execution.html |   13 -
 ...de-SC-Basic_Programming-Getting_Help-Email.html |    5 -
 ...uide-SC-Basic_Programming-Getting_Help-IRC.html |    5 -
 ...ramming-Getting_Help-SuperCollider_Website.html |    5 -
 ...ns_Guide-SC-Basic_Programming-Getting_Help.html |   11 -
 ...ide-SC-Basic_Programming-Legal_Attribution.html |    9 -
 ..._Programming-Multichannel_Audio-Method_One.html |    5 -
 ...-Multichannel_Audio-Multichannel_Expansion.html |    7 -
 ...de-SC-Basic_Programming-Multichannel_Audio.html |   11 -
 ...amming-Object_Oriented-Choosing_a_Paradigm.html |   29 -
 ...ing-Object_Oriented-Functional_Programming.html |   21 -
 ...bject_Oriented-Object-Oriented_Programming.html |   19 -
 ...Guide-SC-Basic_Programming-Object_Oriented.html |    7 -
 ...ic_Programming-Ordering_and_Other_Features.html |   13 -
 ...ians_Guide-SC-Basic_Programming-Repeating-.html |    5 -
 ...SC-Basic_Programming-Repeating-Do_Examples.html |   11 -
 ...e-SC-Basic_Programming-Repeating-Number_Do.html |    5 -
 ...Guide-SC-Basic_Programming-Repeating-While.html |   13 -
 ...cians_Guide-SC-Basic_Programming-Repeating.html |    9 -
 ...asic_Programming-Scheduling-Default_Clocks.html |   11 -
 ...amming-Scheduling-Finding_the_Current_Time.html |    7 -
 ...Programming-Scheduling-Relative_Scheduling.html |   13 -
 ...Programming-Scheduling-Repeated_Scheduling.html |    9 -
 ...ic_Programming-Scheduling-TempoClock_Class.html |   19 -
 ...ians_Guide-SC-Basic_Programming-Scheduling.html |   17 -
 ...g-Sound_Making_Functions-The_play_Function.html |   21 -
 ...C-Basic_Programming-Sound_Making_Functions.html |   17 -
 ...-SynthDef_and_Synth-Creating_Change_Anyway.html |    9 -
 ...-Basic_Programming-SynthDef_and_Synth-Load.html |    7 -
 ...rogramming-SynthDef_and_Synth-Set_and_Free.html |   15 -
 ...thDef_and_Synth-Shortcomings_of_a_SynthDef.html |    9 -
 ...sic_Programming-SynthDef_and_Synth-Symbols.html |   11 -
 ...ic_Programming-SynthDef_and_Synth-SynthDef.html |   23 -
 ...-SynthDef_and_Synth-SynthDef_Becomes_Synth.html |   13 -
 ...SynthDef_and_Synth-SynthDef_with_Arguments.html |    7 -
 ...ramming-SynthDef_and_Synth-Writing_Symbols.html |   11 -
 ...de-SC-Basic_Programming-SynthDef_and_Synth.html |   19 -
 ...Basic_Programming-Variables_and_Functions-.html |   21 -
 ...Variables_and_Functions-Function_Arguments.html |   27 -
 ...ables_and_Functions-Function_Return_Values.html |   21 -
 ...gramming-Variables_and_Functions-Functions.html |    9 -
 ...ng-Variables_and_Functions-Using_Variables.html |   27 -
 ...-Basic_Programming-Variables_and_Functions.html |   17 -
 ...Composing-Creating_Ten_Pseudo-Random-Tones.html |   33 -
 ...uide-SC-Composing-Designing_the_First_Part.html |   45 -
 ...ide-SC-Composing-Designing_the_Second_Part.html |   15 -
 ...t-Musicians_Guide-SC-Composing-Inspiration.html |    7 -
 ...s_Guide-SC-Composing-Joining_the_Two_Parts.html |   53 -
 ...g_a_Useful_Function_Out_of_the_Second_Part.html |   43 -
 ...ans_Guide-SC-Composing-Optimizing_the_Code.html |   67 -
 ...ns_Guide-SC-Composing-Scheduling_the_Tones.html |   21 -
 ...s_Guide-SC-Recording_SuperColliders_Output.html |   35 -
 ...uide-SC-Req_and_Inst-Hardware_Requirements.html |    5 -
 ...e-SC-Req_and_Inst-Recommended_Installation.html |   15 -
 ...uide-SC-Req_and_Inst-Software_Requirements.html |    7 -
 ...ans_Guide-SC-Requirements_and_Installation.html |   21 -
 ...uide-SC-SC-Req_and_Inst-Available_Packages.html |   81 -
 ...icians_Guide-SC-Using_GEdit-Executing_Code.html |   15 -
 ...-Musicians_Guide-SC-Using_GEdit-Other_Tips.html |   24 -
 ...icians_Guide-SC-Using_GEdit-Start_a_Server.html |   19 -
 .../sect-Musicians_Guide-SC-Using_GEdit.html       |   15 -
 .../sect-Musicians_Guide-Sample_Format.html        |    5 -
 .../sect-Musicians_Guide-Sample_Rate.html          |    5 -
 ...icians_Guide-Sample_Rate_and_Sample_Format.html |   11 -
 .../sect-Musicians_Guide-Session_Track_Region.html |    5 -
 .../sect-Musicians_Guide-Singing_Exercises.html    |   71 -
 ...de-Solfege-Configuration-External_Programs.html |   45 -
 ...ns_Guide-Solfege-Configuration-Instruments.html |   26 -
 ...ians_Guide-Solfege-Configuration-Interface.html |   12 -
 ...cians_Guide-Solfege-Configuration-Practise.html |   13 -
 ...ns_Guide-Solfege-Configuration-Sound_Setup.html |   14 -
 ...sect-Musicians_Guide-Solfege-Configuration.html |   19 -
 ...usicians_Guide-Solfege-Dictation_Exercises.html |   35 -
 ...icians_Guide-Solfege-Harmonic_Progressions.html |   35 -
 .../sect-Musicians_Guide-Solfege-Intonation.html   |   21 -
 ...t-Musicians_Guide-Solfege-Rhythm_Exercises.html |   37 -
 ...ians_Guide-Solfege-Training-Exercise_Types.html |   39 -
 ...ge-Training-Making_an_Aural_Skills_Program.html |   45 -
 ...-Solfege-Training-Supplementary_References.html |   21 -
 .../sect-Musicians_Guide-Solfege-Training.html     |   25 -
 ...usicians_Guide-Solfege-Using_the_Exercises.html |   27 -
 ...ect-Musicians_Guide-Sound_Card_Connections.html |    9 -
 .../sect-Musicians_Guide-Sound_Servers-JACK.html   |    5 -
 .../sect-Musicians_Guide-Sound_Servers-Phonon.html |    5 -
 ...sect-Musicians_Guide-Sound_Servers_Section.html |    9 -
 .../sect-Musicians_Guide-Stages_of_Recording.html  |    7 -
 ...ians_Guide-SuperCollider-Basic_Programming.html |  101 -
 ...ct-Musicians_Guide-SuperCollider-Composing.html |   25 -
 ...ct-Musicians_Guide-SuperCollider-Exporting.html |    7 -
 .../sect-Musicians_Guide-Track_Info_Pane.html      |    9 -
 .../sect-Musicians_Guide-Track_Pane.html           |    7 -
 .../sect-Musicians_Guide-Track_and_Multitrack.html |    5 -
 ...ect-Musicians_Guide-Transport_and_Playhead.html |    5 -
 .../sect-Musicians_Guide-USB_Sound_Cards.html      |    5 -
 .../sect-Musicians_Guide-Using_JACK.html           |   55 -
 ...usicians_Guide-Using_Planet_CCRMA_Software.html |   33 -
 .../sect-Musicians_Guide-Using_QjackCtl.html       |    7 -
 .../sect-Musicians_Guide-Vocabulary-Bus.html       |   13 -
 .../sect-Musicians_Guide-Vocabulary-Level.html     |   28 -
 ...cians_Guide-Vocabulary-Panning_and_Balance.html |   13 -
 ..._Guide-Vocabulary-Routing_and_Multiplexing.html |    9 -
 ...Musicians_Guide-Vocabulary-Synchronization.html |    5 -
 .../sect-Musicians_Guide-Vocabulary-Time.html      |   19 -
 ...-Busses-Control_Rate_Example-Why_Use_a_Bus.html |    9 -
 ...aft_Documentation-0.1-Musicians_Guide-en-US.pdf |  Bin 1127577 -> 0 bytes
 493 files changed, 233 insertions(+), 17667 deletions(-)
---
diff --git a/en-US/Audacity.xml b/en-US/Audacity.xml
index 6fbc009..0d9ba76 100644
--- a/en-US/Audacity.xml
+++ b/en-US/Audacity.xml
@@ -50,7 +50,7 @@
 			<para>
 				This method installs Audacity from the Fedora repository.  This version of Audacity does not use an MP3 library, and cannot process MP3 files.
 				<orderedlist>
-				<listitem><para>Use PackageKit or KPackageKit to install the <code>audacity</code> package.  Or in a terminal, run this command: [pre]su -c 'yum install audacity'[/pre].</para></listitem>
+				<listitem><para>Use PackageKit or KPackageKit to install the <code>audacity</code> package.</para></listitem>
 				<listitem><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></listitem>
 				<listitem><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 !!L!!here!!L!! to test Audacity.</para></listitem>
 				</orderedlist>
@@ -61,8 +61,8 @@
 			<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.
 				<orderedlist>
-				<listitem><para>Run this command in a terminal: [pre]su -c 'yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-stable.noarch.rpm'[/pre]</para></listitem>
-				<listitem><para>Use PackageKit or KPackageKit to install the <code>audacity-freeworld</code> package.  Or in a terminal, run this command: [pre]su -c 'yum install audacity-freeworld'[/pre].</para></listitem>
+				<listitem><para>Run this command in a terminal: <command>su -c 'yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-stable.noarch.rpm'</command></para></listitem>
+				<listitem><para>Use PackageKit or KPackageKit to install the <code>audacity-freeworld</code> package.</para></listitem>
 				<listitem><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></listitem>
 				<listitem><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 !!L!!here!!L!! to test Audacity.</para></listitem>
 				</orderedlist>
@@ -73,8 +73,8 @@
 			<procedure>
 				<step><para>Start Audacity.</para></step>
 				<step><para>Set the volume of your audio interface and speakers to a safe level.</para></step>
-				<step><para>Open the "Open File" window by clicking on 'File > Open'.</para></step>
-				<step><para>Open the <code>/usr/share/sounds/alsa/Noise.wav</code> file.  This file is designed for testing audio equipment.</para></step>
+				<step><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice> to open the Open File window.</para></step>
+				<step><para>Open the <literal>/usr/share/sounds/alsa/Noise.wav</literal> file.  This file is designed for testing audio equipment.</para></step>
 				<step><para>Play the file as many times as you need.  Adjust the volume of your audio interface and speakers while the file is playing.</para></step>
 				<step><para>If you cannot hear sound when the file is played, check that your audio interface and speakers are correctly connected and powered on.</para></step>
 				<step><para>If you still cannot hear sound when the file is played, see the !!L!!"Configuring Audacity to Use Your Hardware" section!!L!!.</para></step>
@@ -85,16 +85,16 @@
 			<procedure>
 				<step><para>Connect your microphones to your audio interface.</para></step>
 				<step><para>Start Audacity.  Do not open a file.</para></step>
-				<step><para>Locate the volume level meters on the toolbar, to the right of the transport controls.  If you do not see the meters, you can show them by clicking 'View > Toolbars > Meter Toolbar', which should have a check mark next to it.</para></step>
-				<step><para>Click the small, down-pointing arrow next to the microphone icon on the level meters.  Then click "Start Monitoring".</para></step>
+				<step><para>Locate the volume level meters on the toolbar, to the right of the transport controls.  If you do not see the meters, choose <menuchoice><guimenu>View</guimenu><guisubmenu>Toolbars</guisubmenu><guimenuitem>Meter Toolbar</guimenuitem></menuchoice>, which should have a check mark next to it.</para></step>
+				<step><para>Click on the arrow next to the microphone to open the input meter's pop-up menu.  Choose <menuchoice><guimenuitem>Start Monitoring</guimenuitem></menuchoice>.</para></step>
 				<step><para>Sing, talk, or make noise into the microphone.  The volume level meter should show moving red bars.</para></step>
 				<step><para>Adjust the volume of the recording inputs on your audio interface.  When there is no noise, the moving red bars should be very small.</para></step>
 				<step><para>If you do not see moving red bars in the volume level meter, check that your audio interface and microphone are correctly connected and powered on.  If your equipment was not properly connected, adjust the volume of the recording inputs on your audio interface now.</para></step>
 				<step><para>If you still do not see moving red bars, see the !!L!!"Configuring Audacity to Use Your Hardware" section!!L!!.</para></step>
-				<step><para>Press the "Record" button to start a test recording.  Sing, talk, or make noise into the microphone.</para></step>
-				<step><para>After a few seconds, press the "Stop" button to stop the test recording.</para></step>
-				<step><para>Press the "Play" button to hear the recorded audio.</para></step>
-				<step><para>If the recording sounds bad, you might need to reconfigure Audacity.  See the !!L!!"Configuring Audacity to Use Your Hardware" section!!L!!.</para></step>
+				<step><para>Click the <guibutton>Record</guibutton> button to start a test recording.  Sing, talk, or make noise into the microphone.</para></step>
+				<step><para>After a few seconds, click the <guibutton>Stop</guibutton> button to stop the test recording.</para></step>
+				<step><para>Click the <guibutton>Play</guibutton> button to hear the recorded audio.</para></step>
+				<step><para>If the recording sounds bad, you configure Audacity manually.  See the !!L!!"Configuring Audacity to Use Your Hardware" section!!L!!.</para></step>
 			</procedure>
 		</section>
 		
@@ -123,71 +123,122 @@
 			<procedure>
 				<step><para>You need to know the Linux name of your sound card.</para>
 					<substeps>
-						<step><para>Open a terminal.  In GNOME, click on 'Applications > System > Terminal'.  In KDE, click on the application launcher, then 'System > Konsole'.</para></step>
-						<step><para>Execute this command: "cat /proc/asound/cards".</para></step>
+						<step><para>Open a terminal.  In GNOME, choose <menuchoice><guimenu>Applications</guimenu> <guisubmenu>System</guisubmenu> <guimenuitem>Terminal</guimenuitem></menuchoice>.  In KDE, open the application launcher, then choose <menuchoice><guimenu>System</guimenu><guimenuitem>Konsole</guimenuitem></menuchoice>.</para></step>
+						<step><para>Run this command: <command>cat /proc/asound/cards</command>.</para></step>
 						<step><para>The <code>cat</code> program outputs a list of sound cards in your computer, which looks similar to this list:
-[pre]
-0 [SB             ]: HDA-Intel - HDA ATI SB
+<literallayout>0 [SB             ]: HDA-Intel - HDA ATI SB
                   HDA ATI SB at 0xf7ff4000 irq 16
 1 [MobilePre      ]: USB-Audio - MobilePre
-                  M Audio MobilePre at usb-0000:00:13.0-2
-[/pre]
-						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 <code>SB</code> and <code>MobilePre</code>.</para></step>
+                  M Audio MobilePre at usb-0000:00:13.0-2</literallayout>
+						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>
 					</substeps>
 				</step>
 				<step><para>Start Audacity.</para></step>
-				<step><para>Open the "Preferences" window by clicking 'File > Preferences'.</para></step>
-				<step><para>Set the "Host" to "ALSA".</para></step>
-				<step><para>Set the recording and playback devices to the name of the sound card that you want to use.  If there are many choices for your sound card, choose the one that ends with <code>(hw:0)</code>, where <code>0</code> is replaced by the number of the sound card that you want to use.</para></step>
+				<step><para>Open the "Preferences" window.  Choose <guimenu>File</guimenu> > <guimenuitem>Preferences</guimenuitem>.</para></step>
+				<step><para>Set the "Host" to <literal>ALSA</literal>.</para></step>
+				<step><para>Set the recording and playback devices to the name of the sound card that you want to use.  If there are many choices for your sound card, choose the one that ends with <literal>(hw:0)</literal>, where <literal>0</literal> is replaced by the number of the sound card that you want to use.</para></step>
 				<step><para>Follow the post-installation test procedures to confirm that the configuration is correct.</para></step>
 			</procedure>
 			<para>
-				You will see many choices in the list of playback and recording devices.  When configured with the <code>default</code> device, Audacity lets ALSA determine which sound card to use.  When configured with the <code>pulse</code> device, Audacity lets PulseAudio determine which sound card to use.  Audacity works most efficiently when configured with a specific sound card, so you should not use the <code>default</code> or <code>pulse</code> devices unless the other choices do not work.
+				You will see many choices in the list of playback and recording devices.  When configured with the <code>default</code> device, Audacity lets ALSA determine which sound card to use.  When configured with the <literal>pulse</literal> device, Audacity lets PulseAudio determine which sound card to use.  Audacity works most efficiently when configured with a specific sound card, so you should not use the <literal>default</literal> or <literal>pulse</literal> devices unless the other choices do not work.
 			</para>
 		</section>
 		<section id="sect-Musicians_Guide-Audacity-Setting_Sample_Rate_and_Format">
 			<title>Setting the Project's Sample Rate and Format</title>
 			<para>
-				The related concepts of ''sample rate,'' and ''bit rate,'' are explained IN THIS CHAPTER (Sound Cards).  Audacity refers to ''Bit Rate'' as ''Sample Format.''
-			</para>
-			<para>
-				<orderedlist>
-				<listitem><para>After starting Audacity, select ''File > Preferences'' to open the ''Preferences'' menu.</para></listitem>
-				<listitem><para>Select ''Quality'' from the left tab-list.</para></listitem>
-				<listitem><para>Select the settings that you wish to use.
-					<itemizedlist>
-					<listitem><para>CDs hold audio with a sample rate of 44&nbsp;100&nbsp;Hz, and a sample format of 16 bits.  This is sufficient for most uses.</para></listitem>
-					<listitem><para>Setting 96&nbsp;000&nbsp;Hz and 24 bits should be enough for almost any use.</para></listitem>
-					<listitem><para>You should not provide settings that are greater than your audio interface can provide.  It is probably not dangerous to do so, but it may decrease sound quality.  If nothing else, it will use extra space on your hard drive, with no added audio quality.</para></listitem>
-					</itemizedlist>
-					</para></listitem>
-				</orderedlist>
+				You can change the sample rate and sample format (see !!L!!here!!L!! for definitions).  You should set the sample rate and sample format when you begin working on a project.  You should not change the sample rate or sample format after you record audio.  If you will use audio files that already exist, you should use the sample rate and sample format of the existing files.
 			</para>
+			<procedure>
+				<step><para>Choose <menuchoice><guimenu>File</guimenu> <guimenuitem>Preferences</guimenuitem></menuchoice> to open the "Preferences" window.</para></step>
+				<step><para>Click <guibutton>Quality</guibutton> in the list on the left of the window.</para></step>
+				<step><para>Change the settings as you need.  We recommend a sample rate of 44&nbsp;100&nbsp;Hz and a sample format of 16&nbsp;bits for most projects.</para></step>
+			</procedure>
 		</section>
-		
 	</section>
 	
 	<section id="sect-Musicians_Guide-Audacity-Interface">
 		<title>The Interface</title>
+		<!-- [[File:FMG-Audacity-Interface.xcf]] -->
+		<para>
+			!!P!! [[File:FMG-Audacity-Interface.png]] !!P!!
+		</para>
+		<para>
+			Refer to !!F!! example !!F!! as you read about the user interface of Audacity.
+			<itemizedlist>
+			<listitem><para>The "transport controls" play, stop, or pause playback of audio.  The buttons to record and move quickly through a file are also located here.</para></listitem>
+			<listitem><para>The "tool-selection box" changes the cursor's function.</para></listitem>
+			<listitem><para>The two "volume level meters" display the volume level of stereo audio.  The left meter displays the volume level of the output signal.  The right meter displays the volume level of the input signal.</para></listitem>
+			<listitem><para>The "ruler" displays the time since the start of the file, in minutes and seconds.</para></listitem>
+			<listitem><para>The "timeline" is the main area of the main window of Audacity.  The leftmost point is the beginning of the audio file.</para></listitem>
+			<listitem><para>Each "track" contains two channels of audio signal data.  Audacity stacks tracks vertically in the main window.  Audacity plays back all tracks simultaneously.</para></listitem>
+			<listitem><para>Each track has a "track info area," which holds settings like the fader, panner, and <guibutton>mute</guibutton> and <guibutton>solo</guibutton> buttons.</para></listitem>
+			</itemizedlist>
+		</para>
 		<para>
-			This tutorial could use a picture of the interface, with an explanation of what the buttons do.  Now that I've written the "DAW" chapter about the interface, I wonder if it wouldn't be just as useful to "hijack" that section.  I don't think the differences would be alarming, and it would be a good way to save time - we'll see.
+			The !!L!! DAW chapter !!L!! contains more information about the Audacity user interface.  That chapter defines the purpose and use of many user interface components.
 		</para>
 	</section>
 	
-	<section id="sect-Musicians_Guide-Audacity-Tutorial">
-		<title>Creating a New Login Sound (Tutorial)</title>
+	<section id="sect-Musicians_Guide-Audacity-Recording">
+		<title>Recording</title>
 		<para>
-			To follow this portion of the tutorial, it is strongly recommended that you download the Audacity working-file, and begin doing the actions described, as instructed in the tutorial.
+			This section explains possible ways to use Audacity to record.
 		</para>
 		
+		<section id="sect-Musicians_Guide-Audacity-Recording-Start_to_Record">
+			<title>Start to Record</title>
+			<para>
+				This procedure can be used whether you want to record from microphones or from another application on your computer.
+			</para>
+			<procedure>
+				<step><para>Prepare your computer to record.  Connect the microphones you want to use, and test them.  See !!L!! here !!L!! for instructions to test your equipment.</para></step>
+				<step><para>Check the sample rate and sample format.  See !!L!! this section !!L!! for instructions to change the sample rate and sample format.</para></step>
+				<step><para>The <guibutton>Record</guibutton> button shows a red circle.  When you are ready to record, click the <guibutton>Record</guibutton> button.</para></step>
+				<step><para>The <guibutton>Stop</guibutton> button shows an orange square.  Click the <guibutton>Stop</guibutton> button to stop the recorder.</para></step>
+				<step><para>* Audacity displays the recorded audio in the timeline of a track, as a blue, sound-wave-like shape that represents the volume level.  Audacity sometimes displays the blue shape immediately, and sometimes only after you click <guibutton>Stop</guibutton>.  When Audacity does not show the blue shape immediately, it does not have enough processor power, and decides to process the audio instead of the blue shape.</para></step>
+			</procedure>
+		</section>
+		<section id="sect-Musicians_Guide-Audacity-Recording-Continuing_to_Record">
+			<title>Continue to Record</title>
+			<para>
+				You can record more audio after the first recording in one of these ways:
+				<orderedlist>
+					<listitem><para>You can continue to record from the end of the already-recorded audio.</para>
+						<procedure>
+							<step><para>Press <keycombo><keycap>Shift</keycap></keycombo> then click <guibutton>Record</guibutton>.</para></step>
+							<step><para>Audacity starts to record from the end of the already-recorded audio.  The new audio is put in the previously-selected track.</para></step>
+						</procedure>
+						</listitem>
+					<listitem><para>You can record new audio that will play at the same time as the already-recorded audio.</para>
+						<procedure>
+							<step><para>Choose <menuchoice><guimenu>Transport</guimenu> <guimenuitem>Skip to Start</guimenuitem></menuchoice> or press <keycombo><keycap>Home</keycap></keycombo> to move the transport head to the start of the file.</para></step>
+							<step><para>Click <guibutton>Record</guibutton>.</para></step>
+							<step><para>Audacity starts to record from the beginning.  The new audio is put in a new track, and does not erase existing audio.</para></step>
+						</procedure>
+						</listitem>
+					<listitem><para>You can record new audio that will play at the same time as the already-recorded audio, but start after the beginning.</para>
+						<procedure>
+							<step><para>Find the timeline position when you want to record new audio.  Click on an existing track at that time.</para></step>
+							<step><para>Click <guibutton>Record</guibutton>.</para></step>
+							<step><para>Audacity starts to record from the position of the transport head.  The new audio is put in a new track, and does not erase existing audio.</para></step>
+						</procedure>
+						</listitem>
+				</orderedlist>
+			</para>
+		</section>
+	</section>
+	
+	<section id="sect-Musicians_Guide-Audacity-Tutorial">
+		<title>Creating a New Login Sound (Tutorial)</title>
+		
 		<section id="sect-Musicians_Guide-Audacity-Tutorial-Files">
 			<title>Files for the Tutorial</title>
 			<para>
-				The following files will be useful, if you choose to follow along with the tutorial.  Only the ''Starting State'' file is necessary; the other two are provided as possible completed forms.
+				Use the <literal>Tutorial Start</literal> file if you want to do the tutorial.  The <literal>Tutorial Finish</literal> file and <literal>Exported FLAC</literal> file are completed examples.  When you finish the tutorial, your project will probably not be the same as ours.
 				<itemizedlist>
-				<listitem><para>[[File:FMG-audacity_start.tar.lzma|Tutorial Starting State]]</para></listitem> <!-- (audacity-1) -->
-				<listitem><para>[[File:FMG-audacity_end.tar.lzma|Tutorial Finishing State]]</para></listitem> <!-- (audacity-6) -->
+				<listitem><para>[[File:FMG-audacity_start.tar.lzma|Tutorial Start]]</para></listitem> <!-- (audacity-1) -->
+				<listitem><para>[[File:FMG-audacity_end.tar.lzma|Tutorial Finish]]</para></listitem> <!-- (audacity-6) -->
 				<listitem><para>[[File:FMG-audacity_final.flac|Exported FLAC]]</para></listitem>
 				</itemizedlist>
 			</para>
@@ -200,222 +251,197 @@
 			* "audacity-5.aup" has a part echoed
 			* "audacity-6.aup" is phased -->
 		</section>
-		<section id="sect-Musicians_Guide-Audacity-Tutorial-Scenrario">
+		<section id="sect-Musicians_Guide-Audacity-Tutorial-Scenario">
 			<title>Scenario</title>
 			<para>
-				You were telling a friend about Fedora Linux's open-source audio programs, and you mentioned that Audacity makes it easy to create and edit audio files.  The friend reminds you of their long-standing desire to create a new sound to be played whenever they log in to their computer, and suggests that Audacity can be used to make just a sound.  You decide to work on it together.
-			</para>
-		</section>
-		<section id="sect-Musicians_Guide-Audacity-Tutorial-Inspiration">
-			<title>Inspiration</title>
-			<para>
-				You choose a starting-point for your new login sound.  After thinking about it for a while, you decide to record some clips from a CD that you own, and mix them together.
-			</para>
-		</section>
-		<section id="sect-Musicians_Guide-Audacity-Tutorial-Starting_Out">
-			<title>Starting Out</title>
-			<para>
-				<orderedlist>
-				<listitem><para>Make sure that your system is set up to record (with hardware and sample/bit rates properly selected).</para></listitem>
-				<listitem><para>You can use the level meter to monitor the input level.  Before recording, you should test the input level, adjusting the audio interface as required.</para></listitem>
-				<listitem><para>To begin the recording, hit the circular red ''Record'' button.</para></listitem>
-				<listitem><para>When you have finished recording, hit the square orange ''Stop'' button.</para></listitem>
-				<listitem><para>After recording a portion of audio, it should show up in the main portion of the window, with a blue, sound-wave-like shape representing the volume level of the recording.</para></listitem>
-				</orderedlist>
-			</para>
-		</section>
-		<section id="sect-Musicians_Guide-Audacity-Tutorial-Continuing_to_Record">
-			<title>Continuing to Record</title>
-			<para>
-				There are three main ways to record something additional:
-				<orderedlist>
-				<listitem><para>You want to continue recording from the end of the already-recorded material.
-					<itemizedlist>
-					<listitem><para>Hold the '''[Shift]''' key as you click ''Record''  </para></listitem>
-					<listitem><para>Audacity will continue recording in the last-selected track, from the end of all already-recorded audio.</para></listitem>
-					</itemizedlist>
-					</para></listitem>
-				<listitem><para>You want to record something new to go along with what you already have, starting at the beginning.
-					<itemizedlist>
-					<listitem><para>Move the transport to the start: press '''[Home]''' on the keyboard or select ''Transport > Skip to Start.''</para></listitem>
-					<listitem><para>The transport is the vertical line, which represents the place where Audacity will begin playback or recording if the ''Play'' or ''Record'' buttons are pressed.</para></listitem>
-					<listitem><para>When you click ''Record'', Audacity will record onto a new track, and not erase what you have already recorded.</para></listitem>
-					</itemizedlist>
-					</para></listitem>
-				<listitem><para>You want to record something new to go along with what you already have, starting somewhere else.
-					<itemizedlist>
-					<listitem><para>Locate the place from where you want to continue recording.</para></listitem>
-					<listitem><para>Use the cursor to left-click on that place in an already-recorded segment.</para></listitem>
-					<listitem><para>When you click ''Record'', Audacity will record onto a new track, and not erase what you have already recorded.</para></listitem>
-					</itemizedlist>
-					</para></listitem>
-				</orderedlist>
+				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.
 			</para>
 		</section>
+		
 		<section id="sect-Musicians_Guide-Audacity-Tutorial-Aligning_Tracks">
-			<title>Aligning Tracks</title>
+			<title>Align Tracks</title>
 			<!-- Audacity-1 -->
 			<para>
-				At this point in the tutorial, you can begin to follow along by modifying the Audacity working-file.
+				You adjust the starting time of the segments.
 			</para>
+			<procedure>
+				<step><para>Click the <guibutton>Time Shift</guibutton> button in the tool-selection toolbar.</para></step>
+				<step><para>Select the track with the segment you want to move.  Drag the segment to the left or right to change the time when it starts to play.</para></step>
+				<step><para>You can align the start of one segment with end of another segment.  Drag the segment so that the beginning is near the end of the other segment.  Drag the track back and forth slowly so a yellow line appears.  The yellow line means that there is no silence between the segments, and that the segments do not overlap.</para></step>
+				<step><para>You can move a segment to start at the selection cursor.  Click the <guibutton>Selection Tool</guibutton> button, then click on the track where you want the segment to start to play.  Choose <menuchoice><guimenu>Tracks</guimenu> <guisubmenu>Align Tracks</guisubmenu> <guimenuitem>Align with Cursor</guimenuitem></menuchoice> to move the track.</para></step>
+				<step><para>You can move tracks in other ways by using the <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Align Tracks</guisubmenu></menuchoice> menu choices.</para></step>
+				<step><para>You can select multiple tracks at the same time.  Press <keycombo><keycap>Shift</keycap></keycombo> while you click on each track.</para></step>
+				<step><para>You should listen to each adjustment to confirm that it is correct.  Click <guibutton>Selection Tool</guibutton> in the tool-selection toolbar, then click on a track where you want to begin to listen.  Press <guibutton>Play</guibutton> to hear the audio.</para></step>
+			</procedure>
 			<para>
-				If you accidentally record something at the wrong time, or if you change your mind about when a track should be playing, you can easily move it.
-				<orderedlist>
-				<listitem><para>Select the ''time shift tool'' from the toolbar.</para></listitem>
-				<listitem><para>Click on the track you want to move, then slide it left or right to adjust it as desired.
-					<itemizedlist>
-					<listitem><para>To align the start of one segment to the end of another, drag the later track so that its start is near the end of the earlier one; move it slowly around that area until a yellow line appears, showing that the segments are aligned.</para></listitem>
-					<listitem><para>To align a segment so that it begins at an arbitrary point, use the ''selection tool'' to move the transport to that point.  Then, from the menu select ''Tracks > Align Tracks > Align with Cursor.''</para></listitem>
-					<listitem><para>There are other alignment options in the ''Tracks > Align Tracks'' menu, and they apply only to the currently-selected tracks.  To select multiple tracks, click on the portion of the track at the left, which has information about it.  Then, hold down '''[Shift]''' on your keyboard, and select the others.</para></listitem>
-					</itemizedlist>
-					</para></listitem>
-				<listitem><para>Select the selection tool from the toolbar. </para></listitem>
-				<listitem><para>Click to place the transport just before the splice, then press ''Play'' to hear it.  Adjust again if necessary.</para></listitem>
-				</orderedlist>
+				We aligned the tracks so that they sound nice to us.  We tried to make the sound short, and interesting but not confusing.  We changed the positions of the tracks many times after this step.
 			</para>
 		</section>
+		
 		<section id="sect-Musicians_Guide-Audacity-Tutorial-Stretching_Tracks">
 			<title>Stretching Tracks</title>
 			<!-- Audacity-2 -->
 			<para>
-				You can stretch or compress tracks, so that they take up more or less time.  There are two tools which do this:
+				You can stretch or compress tracks, so that they take up more or less time.
 				<itemizedlist>
-				<listitem><para>The ''Change Tempo'' tool, which adjusts speed but not pitch.  This degrades sound quality quite a bit.</para></listitem>
-				<listitem><para>The ''Change Speed'' tool, which adjusts both speed and pitch.  This does not degrade sound quality as much.</para></listitem>
+				<listitem><para>The "Change Tempo" tool adjusts speed but not pitch.  Sound quality is lowered significantly.</para></listitem>
+				<listitem><para>The "Change Speed" tool adjusts speed and pitch.  Sound quality is less affected.</para></listitem>
 				</itemizedlist>
 			</para>
+			<procedure>
+				<step><para>Click on the track info portion of the track that you want to adjust.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Effect</guimenu> <guimenuitem>Change Tempo</guimenuitem></menuchoice> or <menuchoice><guimenu>Effect</guimenu> <guimenuitem>Change Speed</guimenuitem></menuchoice>.  If you input a positive number, the speed increases and the audio takes less time.  If you input a negative number, the speed decreases and the audio takes more time.</para></step>
+				<step><para>Click <guibutton>Preview</guibutton> to hear some of the audio with the adjusted speed.  Audacity does not change the audio when you preview the change.</para></step>
+				<step><para>Click <guibutton>OK</guibutton> to apply the change.  Audacity processes the audio.  Your change does not appear immediately.</para></step>
+			</procedure>
 			<para>
-				To stretch or compress a track,
-				<orderedlist>
-				<listitem><para>Select that track by clicking on the portion at the left, which has information about that track.</para></listitem>
-				<listitem><para>Select ''Effect > Change Tempo'' or ''Effect > Change Speed''.</para></listitem>
-				<listitem><para>Use the window to adjust the degree of stretching/compression:
-					<itemizedlist>
-					<listitem><para>Positive values increase speed and compress the audio.</para></listitem>
-					<listitem><para>Negative values decrease speed and stretch the audio.</para></listitem>
-					</itemizedlist>
-					</para></listitem>
-				<listitem><para>You can use the ''Preview'' button to get an idea of the speed change that will happen with your selected settings.</para></listitem>
-				<listitem><para>After clicking ''OK'', it may take a few seconds for Audacity to process and apply the changes you requested.</para></listitem>
-				</orderedlist>
+				We changed the speed of one of our tracks.  We are not concerned about the sound quality, because this is a start-up sound for us.  When you edit audio to which other people will listen, you should be careful to preserve the sound quality.
 			</para>
 		</section>
-		<section id="sect-Musicians_Guide-Audacity-Tutorial-Adjusting_Volume_and_Removing_Noise">
-			<title>Adjusting a Track's Volume, and Removing Noise</title>
+		
+		<section id="sect-Musicians_Guide-Audacity-Tutorial-Adjust_Volume_Level">
+			<title>Adjust the Volume Level</title>
 			<!-- Audacity-3 -->
 			<para>
-				If you want to make a track louder or quieter, you can adjust the volume of individual tracks, or portions of tracks.
-				<orderedlist>
-				<listitem><para>The bottom-most track in the tutorial file is hardly audible.  You press the ''solo'' button on that track to hear it alone, and realize that it's mostly very quiet humming.</para></listitem>
-				<listitem><para>You use the ''selection tool'' to select part of the track.</para></listitem>
-				<listitem><para>Select ''Effect > Amplify'', which is a tool that, in effect, adjusts the volume level of an audio segment.  If you enable clipping, then you will be able to adjust the level much higher than if you don't.  However, you may lose part of the audio signal, and the sound quality may deteriorate.  You may have to experiment to find an acceptable balance.</para></listitem>
-				<listitem><para>This track still has a lot of ''noise,'' which was created by the recording tools, rather than what was supposed to be recorded.
-					<orderedlist>
-					<listitem><para>Select about a second of audio, which is going to serve as a the model of ''noise'' that should be removed.  Ideally this portion of audio will contain only noise, and no signal that you wish to save.</para></listitem>
-					<listitem><para>Select ''Effect > Noise Removal'' to open the ''Noise Removal'' tool. </para></listitem>
-					<listitem><para>In the ''Noise Removal'' window, click ''Get Profile'', so that the tool will take the selected portion of audio.</para></listitem>
-					<listitem><para>Now select the whole track, which is the portion of audio from which you wish to remove the ''noise.''</para></listitem>
-					<listitem><para>Return to the ''Noise Removal'' tool's window, and select ''OK''.</para></listitem>
-					</orderedlist>
-					</para></listitem>
-				<listitem><para>Now you realize that the end of the upper-most track is too loud, so it interferes with the other.
-					<orderedlist>
-					<listitem><para>Select the last two seconds of that track.</para></listitem>
-					<listitem><para>Select ''Effect > Fade Out'' to use the ''Fade Out'' tool.</para></listitem>
-					</orderedlist>
-					</para></listitem>
-				<listitem><para>You think that the third track's entrance is too quiet, so you select the first portion, then 'Effect > Fade In' (huh?)</para></listitem>
-				<listitem><para>there's a bit of noise in the fourth track at about 13:00 that you want to bring out, so you amplify it (double-huh?)</para></listitem>
-				</orderedlist>
+				You can adjust the volume level of tracks by adjusting the fader in the track info box.  The fader is a horizontal line with a <literal>-</literal> sign on the left and a <literal>+</literal> sign on the right.  The fader does not change the audio signal itself.
+			</para>
+			<para>
+				You can also adjust the volume level of a portion of audio, which does modify the audio signal itself.  Follow these instructions to adjust the volume level of a portion of audio.
+			</para>
+			<procedure>
+				<step><para>The tutorial's lowest track is very quiet.  Click the track's <guibutton>solo</guibutton> button, then listen to the track alone.  Most of the track is quiet humming.</para></step>
+				<step><para>Click <guibutton>Selection Tool</guibutton>, then hold down the mouse button to select some audio in one track.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Effect</guimenu> <guimenuitem>Amplify</guimenuitem></menuchoice>.  When the "Amplify" window opens, it is set for the greatest volume level increase that will not decrease sound quality.  You can enable "clipping," which allows you to increase the volume level even more, but will decrease the sound quality.</para></step>
+				<step><para>Use the Amplify tool to adjust the volume level as you wish.</para></step>
+			</procedure>
+		</section>
+		
+		<section id="sect-Musicians_Guide-Audacity-Tutorial-Remove_Noise">
+			<title>Remove Noise</title>
+			<para>
+				"Noise" is part of an audio signal that is not the intended signal.  When you listen to music on the radio, you can hear the music, and usually also some noise.  When computers record or play audio, the electronic components sometimes create extra noise.  The lowest track of the tutorial file has noise created by electronic components in the old notebook computer used to play the CD.  Follow these steps to use the "Noise Removal" tool.
 			</para>
+			<procedure>
+				<step><para>Click <guibutton>Selection Tool</guibutton>, then select a small portion of the lowest track.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Effect</guimenu> <guimenuitem>Noise Removal</guimenuitem></menuchoice>.  The "Noise Removal" window appears.  Click <guibutton>Get Profile</guibutton>.  The Noise Removal tool uses the selected audio as an example of the noise to remove.</para></step>
+				<step><para>Select the whole track.</para></step>
+				<step><para>Open the "Noise Removal" window.  Click <guibutton>OK</guibutton>.  The Noise Removal tool processes the audio.  The Noise Removal tool is not effective in this example because most of the signal is noise.</para></step>
+			</procedure>
 		</section>
+		
+		<section id="sect-Musicians_Guide-Audacity-Tutorial-Fade_Out">
+			<title>Fade In or Out</title>
+			<para>
+				Audacity has tools to fade in and out.  When you "fade in," it means to gradually increase the volume level from silence to the original level.  When you "fade out," it means to gradually decreased the volume level from the original level to silence.  Professional recordings of concerts often fade out after a song, while the audience applauds.  Fading out avoids an abrupt stop at the end of the recording, because the volume level is decreased gradually to silence.
+			</para>
+			<para>
+				You generally fade in at the beginning of an audio segment, and fade out at the end of an audio segment.  You can use Audacity to create special effects if you fade in or fade out in the middle of an audio segment.  You can make a surprising effect by setting Audacity to fade in or out over a few second, then adding the opposite fade inside the first fade.
+			</para>
+			<procedure>
+				<step><para>Click <guibutton>Selection Tool</guibutton>, then select a portion of audio to fade in or out.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Effect</guimenu> <guimenuitem>Fade In</guimenuitem></menuchoice> or <menuchoice><guimenu>Effect</guimenu> <guimenuitem>Fade Out</guimenuitem></menuchoice>.</para></step>
+			</procedure>
+			<para>
+				We created a long fade out in one of our tracks, so that the track is quieter.  We then adjusted the spacing of the other tracks, moving them closer.
+			</para>
+		</section>
+		
 		<section id="sect-Musicians_Guide-Audacity-Tutorial-Removing_Audio">
-			<title>Removing a Portion of Audio</title>
+			<title>Remove Some Audio</title>
 			<!-- Audacity-4 -->
 			<para>
-				<orderedlist>
-				<listitem><para>The fourth track, after the noise-bump that we just amplified, is just noise.  We don't need it, and it sounds strange, so let's take it out.</para></listitem>
-				<listitem><para>Place the transport at the start of the segment that you wish to remove, by left-clicking in the existing audio track.</para></listitem>
-				<listitem><para>Select ''Edit > Select > Cursor to Track End,'' which will select the portion of audio in the currently-selected track between the transport and the end of the track.  There are many other options for selecting audio available in that menu.</para></listitem>
-				<listitem><para>On your keyboard, press '''[Delete]'''.</para></listitem>
-				</orderedlist>
+				You can remove portions of a track.  This procedure removes audio at the end of a track.  You can use a similar method to remove audio in other ways.
+			</para>
+			<procedure>
+				<step><para>Click <guibutton>Selection Tool</guibutton>, then place the editing cursor at the point where you want the track to end.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Edit</guimenu> <guisubmenu>Select</guisubmenu> <guimenuitem>Cursor to Track End</guimenuitem></menuchoice>.  There are many other choices in the <menuchoice><guimenu>Edit</guimenu> <guisubmenu>Select</guisubmenu></menuchoice> menu.</para></step>
+				<step><para>Press <keycombo><keycap>Delete</keycap></keycombo>.  The selected audio is deleted.</para></step>
+				<step><para>If you make a mistake, you can undo the previous action.  Choose <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem></menuchoice>.</para></step>
+			</procedure>
+			<para>
+				We removed the end of the lowest track.
 			</para>
 		</section>
+		
 		<section id="sect-Musicians_Guide-Audacity-Tutorial-Repeating_a_Segment">
-			<title>Repeating an Already-Recorded Segment</title>
+			<title>Repeat an Already-Recorded Segment</title>
 			<!-- Audacity-5 -->
 			<para>
-				While you like the beginning of the sound, the end doesn't seem ''busy'' enough.  You decide to repeat a portion of the second track, to make it seem as though it "just won't leave."
-				<orderedlist>
-				<listitem><para>Use the cursor to select the last second of the second track from the top, then select ''Edit > Copy.''</para></listitem>
-				<listitem><para>Place the transport arbitrarily, later in the track, and select ''Edit > Paste'' from the menu. Repeat this, so there are two copies.</para></listitem>
-				<listitem><para>Select the ''Time Shift tool'' from the toolbar, and adjust the time of the two copied segments as desired.</para></listitem>
-				<listitem><para>You might also wish to adjust the volume of a segment, depending on whether it sounds too loud for you.</para></listitem>
-				</orderedlist>
+				You can repeat a segment of audio that is already recorded.
+			</para>
+			<procedure>
+				<step><para>Click <guibutton>Selection Tool</guibutton>, then select a portion of audio.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem></menuchoice> or press <keycombo><keycap>Control</keycap> <keycap>c</keycap></keycombo>.</para></step>
+				<step><para>Click in a track near where you want the copy to start playing.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem></menuchoice> or press <keycombo><keycap>Control</keycap> <keycap>v</keycap></keycombo>.</para></step>
+				<step><para>Click <guibutton>Time Shift Tool</guibutton>, then adjust the timeline position of the new audio clip.</para></step>
+			</procedure>
+			<para>
+				We repeated the end of a segment twice, to make the end of the startup sound more interesting.
 			</para>
 		</section>
+		
 		<section id="sect-Musicians_Guide-Audacity-Tutorial-Using_the_Phaser">
-			<title>Add a Silly Effect: Using the Phaser</title>
+			<title>Add a Special Effect (the Phaser)</title>
 			<!-- Audacity-6 -->
 			<para>
-				The third track ends after the other tracks.  Audacity has a wide variety of effects plugins, and you decide to experiment with one called "Phaser."  The phaser adjusts reverberation, panning, and frequency to create a spinning-like sound.
-				<orderedlist>
-				<listitem><para>Select the portion of the third track which begins after the last occurrence of the second track, and goes to the end.  There are a few different ways to do this.</para></listitem>
-				<listitem><para>Select ''Effect > Phaser'' and experiment with the settings.  Use the ''Preview'' button to sample the outcome of your currently selected settings.</para></listitem>
-				<listitem><para>You can use whatever settings seem appropriate.  The tutorial file uses these settings:
-				[pre]Stages: 2
-				Dry/Wet: 128
-				LFO Frequency: 0.4
-				LFO Start Phase: 0
-				Depth: 128
-				Feedback: 90[/pre]</para></listitem>
-				</orderedlist>
+				Audacity has many effect plugins, and you can add more.  The Phaser adjusts reverberation, panning, and frequency to create a spinning-like sound.
 			</para>
+			<procedure>
+				<step><para>Select a portion of any track when only one track is playing.</para></step>
+				<step><para>Choose <menuchoice><guimenu>Effect</guimenu> <guimenuitem>Phaser</guimenuitem></menuchoice>, then experiment with the settings.  Click <guibutton>Preview</guibutton> to hear the effect of your settings.  Audacity does not modify the audio file when you preview your settings.</para></step>
+				<step><para>The tutorial uses the phaser at the end, with these settings:
+					<itemizedlist>
+						<listitem><para>Stages: 2</para></listitem>
+						<listitem><para>Dry/Wet: 128</para></listitem>
+						<listitem><para>LFO Frequency: 0.4</para></listitem>
+						<listitem><para>LFO Start Phase: 0</para></listitem>
+						<listitem><para>Depth: 128</para></listitem>
+						<listitem><para>Feedback: 90</para></listitem>
+					</itemizedlist>
+					</para></step>
+			</procedure>
 		</section>
-		<section id="sect-Musicians_Guide-Audacity-Tutorial-Further_Comments">
-			<title>Further Comments</title>
+		
+		<section id="sect-Musicians_Guide-Audacity-Tutorial-Conclusion">
+			<title>Conclusion</title>
 			<para>
-				If you followed along with the Audacity working-file, the chances are that your result is different from the completed model available above.  There are a few reasons for this:
-				<itemizedlist>
-				<listitem><para>The tutorial's instructions are intentionally vague.  This allows you to easily see how they apply to different uses.</para></listitem>
-				<listitem><para>The tutorial's instructions allow room for creative experimentation.  This allows you to create a different result from the same starting material, by harnessing your own creative power.</para></listitem>
-				<listitem><para>While the model completion was being created, some extra steps were used to modify the sound.  While the result was reached with all of the same tools and techniques described in the tutorial, they were used many more times than the tutorial explains.  In particular, the tracks were time-shifted between most steps.</para></listitem>
-				</itemizedlist>
+				Your startup file sounds different than the one that we completed.  The tutorial instructions are intentionally vague.  You used your own creativity to complete the tutorial.  You also learned how to use these tools for many different purposes.
 			</para>
 		</section>
 				
 	</section>
 	
-	<section id="sect-Musicians_Guide-Audacity-Saving_and_Exporting">
-		<title>Saving and Exporting</title>
+	<section id="sect-Musicians_Guide-Audacity-Save_and_Export">
+		<title>Save and Export</title>
 		<para>
-			When you save a file in Audacity with the ''Save'' or ''Save As'' commands, it is saved in an Audacity-only format.  This is good, because it allows Audacity to save extra information about the audio, which is impossible to store in conventional formats like ''OGG'', ''FLAC'', or even ''AIFF'' and ''WAV.''
+			Audacity saves its data in a format that only Audacity can use.  Audacity saves more information than just the audio files, and this information cannot be stored in conventional audio files like OGG, FLAC, or AIFF.
 		</para>
 		<para>
-			If you want to share your audio work, or use it with another application, you will need to ''export'' it.  This means that all of your tracks will be reduced to one track, and all of your channels will be reduced to stereo audio (with two channels).  When you export, Audacity may warn you that your audio is being mixed into two channels.  This will only affect the exported audio file, not the Audacity-format file.
+			When you want to share your work, or use it in another application, you must export it.  When you "export" audio, Audacity converts the Audacity-only file into a conventional audio file.  Audacity does not delete the original Audacity-only file, but the exported file cannot be converted into the Audacity-only format.
 		</para>
 		
 		<section id="sect-Musicians_Guide-Audacity-Exporting_Part_of_a_File">
-			<title>Exporting Part of a File</title>
-			<para>
-				<orderedlist>
-				<listitem><para>Use any means to select a portion of audio.  You can click-and-drag with the cursor, or place the transport and select ''Edit > Select,'' or use another means.</para></listitem>
-				<listitem><para>Select ''File > Export Selection.''</para></listitem>
-				<listitem><para># Use the ''Export File'' window to choose the format of your exported audio, and to configure advanced options of the format.  Not all formats have advanced options.</para></listitem>
-				<listitem><para>After clicking ''Save'' in the ''Export File'' window, some formats will provide a window where you can configure ''metadata'' about the file.  ''Metadata'' is information about information - in this case, it describes qualities about the audio in the exported file, like Artist, Title, Genre, and so on.  You can leave the fields blank, or complete as many as you prefer.</para></listitem>
-				</orderedlist>
-			</para>
+			<title>Export Part of a File</title>
+			<procedure>
+				<step><para>Select the portion of audio that you want to export.</para></step>
+				<step><para>Choose <menuchoice><guimenu>File</guimenu> <guimenuitem>Export Selection</guimenuitem></menuchoice>.</para></step>
+				<step><para>Select the format, filename, and directory of the audio that will be exported.  Click <guibutton>Save</guibutton> when you are finished.</para></step>
+				<step><para>Depending on which format you choose, the "Metadata" window appears.  You can input this information if you wish.</para></step>
+				<step><para>Audacity processes the audio to export.  This may take some time, depending on the audio.</para></step>
+			</procedure>
 		</section>
+		
 		<section id="sect-Musicians_Guide-Audacity-Exporting_a_Whole_File">
-			<title>Exporting a Whole File</title>
-			<para>
-				<orderedlist>
-				<listitem><para>Select ''File > Export.''</para></listitem>
-				<listitem><para>Use the ''Export File'' window to choose the format of your exported audio, and to configure advanced options of the format.  Not all formats have advanced options.</para></listitem>
-				<listitem><para>After clicking ''Save'' in the ''Export File'' window, some formats will provide a window where you can configure ''metadata'' about the file.  ''Metadata'' is information about information - in this case, it describes qualities about the audio in the exported file, like Artist, Title, Genre, and so on.  You can leave the fields blank or complete as many as you prefer.</para></listitem>
-				</orderedlist>
-			</para>
+			<title>Export a Whole File</title>
+			<procedure>
+				<step><para>Choose <menuchoice><guimenu>File</guimenu> <guimenuitem>Export</guimenuitem></menuchoice>.</para></step>
+				<step><para>Select the format, filename, and directory of the audio that will be exported.  Click <guibutton>Save</guibutton> when you are finished.</para></step>
+				<step><para>Depending on which format you choose, the "Metadata" window appears.  You can input this information if you wish.</para></step>
+				<step><para>Audacity processes the audio to export.  This may take some time, depending on the audio.</para></step>
+			</procedure>
 		</section>
+		
 	</section>
 	
 </chapter>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 0126bef..6923da0 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -63,7 +63,8 @@
 				</author>
 				<revdescription>
 					<simplelist>
-						<member></member>
+						<member>Significantly revised Audacity chapter.</member>
+						<member>Updated JACK installation slightly.</member>
 					</simplelist>
 				</revdescription>
 			</revision>


More information about the docs-commits mailing list