Merge lp:~littlergirl/kubuntu-docs/audio into lp:kubuntu-docs/precise

Proposed by Little Girl
Status: Merged
Merged at revision: 266
Proposed branch: lp:~littlergirl/kubuntu-docs/audio
Merge into: lp:kubuntu-docs/precise
Diff against target: 197 lines (+47/-45)
1 file modified
docs/audio/C/audio.xml (+47/-45)
To merge this branch: bzr merge lp:~littlergirl/kubuntu-docs/audio
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+98779@code.launchpad.net

Description of the change

* Fixed some grammar.
* Fixed some punctuation.
* Replaced some text with an entity (thanks, Darkwing!).
* Rewrapped some lines.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/audio/C/audio.xml'
2--- docs/audio/C/audio.xml 2011-12-30 16:40:04 +0000
3+++ docs/audio/C/audio.xml 2012-03-22 05:11:17 +0000
4@@ -22,20 +22,20 @@
5 <title>Playing CDs</title>
6 <para>
7 <application>Amarok</application> is the default application for playing audio
8-<acronym>CDs</acronym> in &kubuntu;. When a <acronym>CD</acronym> is inserted,
9+<acronym>CD</acronym>s in &kubuntu;. When a <acronym>CD</acronym> is inserted,
10 &kubuntu; will recognize it and display default options. To hear the content
11 with <application>Amarok</application>, select <guilabel>Play Audio CD with
12 Amarok</guilabel> and then press the <guibutton>OK</guibutton> button.
13 &kubuntu; can be configured to remember this choice every time
14 a <acronym>CD</acronym> is inserted by selecting <guilabel>Always do
15 this for this type of media</guilabel>, and pressing <guibutton>OK</guibutton>.
16-<application>Amarok</application> also offers other useful features. If connected to
17-the Internet, <application>Amarok</application> will retrieve
18+<application>Amarok</application> also offers other useful features. If
19+connected to the Internet, <application>Amarok</application> will retrieve
20 <acronym>CD</acronym> artist, title, and track data from <ulink
21 url="http://freedb.org">freedb.org</ulink>. It will also download the lyrics
22-for the current selection if they are available by choosing the
23-<guilabel>Lyrics</guilabel> tab. Other Artist information can be found on <ulink
24-url="http://www.wikipedia.org">Wikipedia</ulink> by selecting the
25+for the current selection &mdash; if they are available &mdash; by choosing the
26+<guilabel>Lyrics</guilabel> tab. Other artist information can be found on
27+<ulink url="http://www.wikipedia.org">Wikipedia</ulink> by selecting the
28 <guilabel>Artist</guilabel> tab.
29 </para>
30 </sect1>
31@@ -44,19 +44,21 @@
32 <title>Editing Audio </title>
33
34 <para>
35-For editing audio files, &kubuntu; provides <application>Sound Editor (Audacity)</application>,
36-a full-featured, free and open source software application. To use
37-<application>Sound Editor (Audacity)</application>:
38+For editing audio files, &kubuntu; provides <application>Sound Editor
39+(Audacity)</application>, a full-featured, free, and open source software
40+application. To use <application>Sound Editor (Audacity)</application>:
41 </para>
42 <procedure>
43 <step>
44 <para>
45-Install <application>Sound Editor (Audacity)</application> from the package manager (Muon)
46+Install <application>Sound Editor (Audacity)</application> from the package
47+manager (Muon).
48 </para>
49 </step>
50 <step>
51 <para>
52-Run <application>Sound Editor (Audacity)</application> by going to &menuaudacity;.
53+Run <application>Sound Editor (Audacity)</application> by going to
54+&menuaudacity;.
55 </para>
56 </step>
57 <step>
58@@ -64,8 +66,7 @@
59 Detailed instructions (including tutorials and weblinks) on using
60 <application>Sound Editor (Audacity)</application> can be found by going to
61 <menuchoice>
62-<guimenu>Help</guimenu>
63-<guisubmenu>Contents</guisubmenu>
64+<guimenu>Help</guimenu> <guisubmenu>Contents</guisubmenu>
65 </menuchoice> from within <application>Sound Editor (Audacity)</application>.
66 </para>
67 </step>
68@@ -78,7 +79,7 @@
69 <para>
70 In addition to being the default music player in &kubuntu;,
71 <application>Amarok</application> is also helpful for managing music
72-collections. Start <application>Amarok</application> by going to &menuamarok;.
73+collections. Start <application>Amarok</application> by going to &menuamarok;.
74 </para>
75 <para>
76 Another useful <application>Amarok</application> feature is the built-in ID3
77@@ -93,10 +94,11 @@
78
79 <para>
80 Another exciting <application>Amarok</application> feature is the ability to
81-play music directly from an iPod or other portable device. <application>Amarok</application> can also be
82-used to transfer music files to and from an iPod. Please refer to the <ulink
83-type="help" url="help:/amarok">Amarok Handbook</ulink> for more information on
84-transferring and managing iPod media files.
85+play music directly from an iPod or other portable device.
86+<application>Amarok</application> can also be used to transfer music files to
87+and from an iPod. Please refer to the <ulink type="help"
88+url="help:/amarok">Amarok Handbook</ulink> for more information on transferring
89+and managing iPod media files.
90 </para>
91 </sect1>
92
93@@ -105,30 +107,29 @@
94 <procedure>
95 <step>
96 <para>
97-When a blank <acronym>CD</acronym> is inserted, &kubuntu; will
98-recognize it, mount it, and then ask what to do with the <acronym>CD</acronym>.
99-Choose <guilabel>Create an audio CD with K3B</guilabel> and press
100-<guibutton>OK</guibutton>. This will open
101-<application>K3b</application>, the <acronym>CD</acronym> and
102-<acronym>DVD</acronym> Kreator, and provide various options.
103+When a blank <acronym>CD</acronym> is inserted, &kubuntu; will recognize it,
104+mount it, and then ask what to do with the <acronym>CD</acronym>. Choose
105+<guilabel>Create an audio CD with K3B</guilabel> and press
106+<guibutton>OK</guibutton>. This will open the <application>K3b</application>
107+<acronym>CD</acronym> and <acronym>DVD</acronym> creator, and provide various
108+options.
109 </para>
110 </step>
111 <step>
112 <para>
113-To start <application>K3b</application> manually, go to <guilabel>Kickoff Application
114-> Applications > Multimedia > </guilabel><application>Disk Burning (K3b)</application>.
115+To start <application>K3b</application> manually, go to &menuk3b;.
116 </para>
117 </step>
118 <step>
119 <para>
120 Select <guilabel>New Audio CD Project</guilabel> in the <guilabel>New
121-Project</guilabel> dropdown menu.
122+Project</guilabel> drop-down menu.
123 </para>
124 </step>
125 <step>
126 <para>
127 Inside <application>K3b</application>, browse and select the tracks to be
128-ripped. Then drag and drop the tracks in the white area at the bottom of the
129+ripped. Then drag and drop the tracks into the white area at the bottom of the
130 <application>K3b</application> window.
131 <mediaobject>
132 <imageobject>
133@@ -154,9 +155,10 @@
134 <itemizedlist>
135 <listitem>
136 <para>
137-<guilabel>Writing</guilabel> - provides choices related to burning an image from
138-the files selected in the previous step.
139-<note><title>No MP3 Support by Default</title>
140+<guilabel>Writing</guilabel> - provides choices related to burning an image
141+from the files selected in the previous step.
142+<note>
143+<title>No MP3 Support by Default</title>
144 <para>
145 <acronym>MP3</acronym> is a protocol restricted by patents. In order to use it
146 with <application>K3b</application>, please refer to the information at the end
147@@ -194,36 +196,36 @@
148 </step>
149 </procedure>
150 <para>
151-<application>K3b</application> can extract audio files to the following formats:
152+<application>K3b</application> can extract audio files to the following
153+formats:
154 <itemizedlist>
155 <listitem>
156 <para>
157-<emphasis role="strong">Ogg Vorbis</emphasis> - Ogg
158-Vorbis is a patent-free lossy audio compression format which usually produces
159-higher quality and greater compression than MP3. See the <ulink
160-url="http://www.vorbis.com/faq/">Vorbis website</ulink> for more information.
161+<emphasis role="strong">Ogg Vorbis</emphasis> - Ogg Vorbis is a patent-free
162+lossy audio compression format which usually produces higher quality and
163+greater compression than MP3. See the <ulink url="http://www.vorbis.com/faq/">
164+Vorbis website</ulink> for more information.
165 </para>
166 </listitem>
167 <listitem>
168 <para><emphasis role="strong">FLAC</emphasis> - The Free Lossless Audio
169-Codec, <acronym>FLAC</acronym>, can compress audio files up to 50% without removing
170-any information from the audio stream. For more information on this format, see
171-the <ulink url="http://flac.sourceforge.net/">FLAC homepage</ulink> on
172-sourceforge.net.
173+Codec, <acronym>FLAC</acronym>, can compress audio files up to 50% without
174+removing any information from the audio stream. For more information on this
175+format, see the <ulink url="http://flac.sourceforge.net/">FLAC
176+homepage</ulink> on <trademark>Sourceforge</trademark>.
177 </para>
178 </listitem>
179 <listitem>
180-<para><emphasis role="strong">WAV</emphasis> - Wav is an
181-uncompressed audio format that can be compressed into OGG Vorbis or a codec of
182-your choice. It is often edited in applications such as Audacity before being
183-compressed.
184+<para><emphasis role="strong">WAV</emphasis> - Wav is an uncompressed audio
185+format that can be compressed into OGG Vorbis or a codec of your choice. It is
186+often edited in applications such as Audacity before being compressed.
187 </para>
188 </listitem>
189 </itemizedlist>
190 </para>
191 <para>
192 CD audio files can be extracted to the proprietary, non-free
193-<emphasis role="strong">MP3</emphasis> lossy format by using the
194+<emphasis role="strong">MP3</emphasis> lossy format by using the
195 <application>lame</application> encoder. Please refer to the <ulink type="help"
196 url="help:/kubuntu/add-applications/">Adding Applications</ulink> documentation
197 for help with installing applications such as <application>lame</application>.

Subscribers

People subscribed via source and target branches

to all changes: