Skip to content

Commit 9988e90

Browse files
committed
Wordsmithing, spelling corrections, grammar, etc.
1 parent a83b8f2 commit 9988e90

File tree

10 files changed

+61
-63
lines changed

10 files changed

+61
-63
lines changed

source/chapters/appendix.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ language settings the defaults may be different.
129129
+----------------------------------------+---------------------+---------------------+--------------+
130130

131131
.. seealso:: Mixxx allows you to customize the keyboard shortcuts. For more
132-
informations, and to download a a keyboard mapping image, go to
132+
information, and to download a a keyboard mapping image, go to
133133
:ref:`control-keyboard`.
134134

135135
.. _appendix-shortcuts:

source/chapters/configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ in- and outputs to be used.
2222
that Mixxx uses to deliver audio to your audio device. Your choice can
2323
drastically affect how smooth Mixxx performs on your computer.
2424

25-
* **Sample Rate**: Allows to manually select the sample rate for the audio input.
25+
* **Sample Rate**: Allows you to manually select the sample rate for the audio input.
2626
The sample rate value should be set to the sample rate of your audio interface.
27-
By default, Mixxx try's the system default first, which is most likely 44.1
27+
By default, Mixxx tries the system default first, which is most likely 44.1
2828
kHz. Otherwise, Mixxx will pick a different default.
2929

3030
* **Latency**: Latency is the lag time in milliseconds that it takes for Mixxx

source/chapters/controlling_mixxx.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ can perform actions by pointing and clicking with your mouse.
3737
a two-finger click gesture is often treated as a right click.
3838

3939
.. seealso:: Using the Mouse drag/wheel on the waveforms you can adjust zoom and
40-
playback rate of the tracks. For more informations, go to
40+
playback rate of the tracks. For more information, go to
4141
:ref:`interface-waveform`.
4242

4343
.. _control-keyboard:
@@ -78,7 +78,7 @@ enable/disable the keyboard mappings at runtime. You can do so by clicking
7878
Customizing the keyboard mapping
7979
--------------------------------
8080

81-
Mixxx allows you to customize the keyboard control. For more informations, go to:
81+
Mixxx allows you to customize the keyboard control. For more information, go to:
8282

8383
* :ref:`advanced-keyboard`
8484

@@ -158,7 +158,7 @@ There is no mapping available for your controller or you want to change an
158158
existing mapping? You can map your controller by using the Controller Wizard or
159159
take full control with the MIDI Scripting support in Mixxx.
160160

161-
.. seealso:: Go to :ref:`advanced-controller` for detailed informations.
161+
.. seealso:: Go to :ref:`advanced-controller` for detailed information.
162162

163163
.. _control-timecode:
164164

@@ -171,5 +171,5 @@ the sound and feel of having your digital music collection on vinyl. Many DJs
171171
prefer the tactile feel of vinyl, and vinyl control allows that feel to be
172172
preserved while retaining the benefits of using digital audio.
173173

174-
.. seealso:: Go to :ref:`vinyl-control` for detailed informations.
174+
.. seealso:: Go to :ref:`vinyl-control` for detailed information.
175175

source/chapters/djing_with_mixxx.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ you music collection and playing your tracks.
1212

1313
Opening Mixxx
1414
=============
15-
|logo| Once you've :ref:`installed Mixxx <installing-mixxx>` , start by opening
15+
|logo| Once you've :ref:`installed Mixxx <installing-mixxx>`, start by opening
1616
Mixxx and import your music to the Mixxx library.
1717

1818
**Windows**
@@ -63,7 +63,7 @@ Importing your audio files
6363
:menuselection:`Preferences --> Library --> Rescan on startup`.
6464

6565
.. warning :: On Windows 7 and 8 the import dialog points to your Windows
66-
“Music“ Library , a special-purpose virtual folder. You can
66+
“Music“ Library, a special-purpose virtual folder. You can
6767
**not** use these virtual folders. Select a regular folder
6868
instead, usually “My Music“, like pictured above.
6969
@@ -472,7 +472,7 @@ Burn your recorded mix to a CD/DVD
472472
.. note:: Due to licensing restrictions, :term:`MP3` recording is not enabled
473473
per default. In order to enable MP3 streaming you must install the
474474
:term:`LAME` MP3 :term:`codec` yourself. Go to the chapter
475-
:ref:`MP3 Streaming` for more informations.
475+
:ref:`MP3 Streaming` for more information.
476476

477477
.. _djing-auto-dj:
478478

source/chapters/installation.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ software on Ubuntu.
138138
The Software Center version of Mixxx is under some circumstances out of date,
139139
therefore using `Method A: Personal Package Archive (ppa)`_ is preferable.
140140

141-
.. todo:: Proof-read Ubuntu install instructions.
142-
143141
Installation on Other Distributions
144142
-----------------------------------
145143

@@ -162,7 +160,7 @@ Where to go from here?
162160
======================
163161

164162
* :doc:`Set up your audio devices and controllers <setup>`
165-
* :doc:`Open Mixxx and start importing your audio file <djing_with_mixxx>`
163+
* :doc:`Open Mixxx and start importing your audio files <djing_with_mixxx>`
166164
* :doc:`Get familiar with the Mixxx user interface <user_interface>`
167165

168166

source/chapters/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Through the manual you'll find text formatted like this:
126126

127127
Links to external websites are marked like this.
128128

129-
Important informations in this manual are highlighted like this:
129+
Important information in this manual are highlighted like this:
130130

131131
* .. note:: For anything that should receive a bit more attention.
132132

source/chapters/library.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,23 @@ music library.
9898
Mixxx reads :term:`metadata` from the tracks to fill the columns of the
9999
library. To edit this data, double-click on a field. If the field is editable
100100
it will become an editable text box. When you are done, hit :kbd:`Enter`. The
101-
data will be saved to the Mixxx library, but **not** to the tracks metadata
101+
data will be saved to the Mixxx library, but **not** to the track's metadata
102102
itself.
103103

104104
**Loading tracks**
105105
To load a track into a :ref:`deck <interface-decks>`, you can either drag it
106106
to the waveform display or use the context menu. Go to the chapter
107-
:ref:`djing-loading-tracks` for detailed informations.
107+
:ref:`djing-loading-tracks` for detailed information.
108108

109109
**Importing tracks**
110110
Mixxx imports your music library automatically when it is run for the first
111111
time, and automatically detects newly added tracks on each subsequent
112-
run. Go to the chapter :ref:`djing-import` for detailed informations.
112+
run. Go to the chapter :ref:`djing-import` for detailed information.
113113

114114
**Previewing Tracks**
115115
To pre-listen to tracks in your headphones without loading them to a regular
116116
deck, click the |ic_lib_preview_play| icon in the :guilabel:`Preview` column.
117-
Go to the chapter :ref:`djing-previewing-tracks` for detailed informations.
117+
Go to the chapter :ref:`djing-previewing-tracks` for detailed information.
118118

119119
**Rescan Library**
120120
If you want to manually refresh your library without exiting (for example
@@ -140,7 +140,7 @@ Right-clicking on selected tracks in the track list reveals the context menu:
140140
playlist or crate in the sidebar.
141141
* **Lock/Unlock BPM**: Locks/Unlocks the :term:`BPM` of selected tracks so you
142142
can't edit them in the track properties. If a BPM is locked, a “lock” icon
143-
appears next to the tracks BPM.
143+
appears next to the track's BPM.
144144
* **Clear BPM and Beatgrid**: Removes :term:`BPM` and :term:`beatgrid` data of
145145
selected tracks from the Mixxx libary. After doing this we recommended you
146146
:ref:`analyze <library-analyze>` the tracks again.
@@ -243,7 +243,7 @@ Requeue` option in :menuselection:`Preferences --> Interface`.
243243
.. hint:: Put a pause between tracks that are automatically mixed by using a
244244
negative value in the :guilabel:`Transition time` spin-box.
245245

246-
.. seealso:: For more informations , go to the chapter :ref:`djing-auto-dj`.
246+
.. seealso:: For more information, go to the chapter :ref:`djing-auto-dj`.
247247

248248
.. _library-playlists:
249249

@@ -285,7 +285,7 @@ the context menu:
285285
* **Remove**: Removes an unlocked playlist. Tracks in the playlist are still
286286
available in the library for later use.
287287
* **Import playlist**: Import tracks from external playlists to a playlist in
288-
various file formats. For more informations, go to :ref:`library-3rd-party`.
288+
various file formats. For more information, go to :ref:`library-3rd-party`.
289289
* **Export playlist**: Export a playlist in various file formats, such as
290290
:file:`m3u`, :file:`pls`, or :file:`csv`. Ideal for processing the data in
291291
other applications.
@@ -308,7 +308,7 @@ playlists. Think of it like a DJ case to organize your favorite vinyls into.
308308
in the sidebar. Alternatively use the context menu in the library's
309309
:ref:`track list<library-root>`.
310310

311-
Right-click on a existing crate's name to access the different features in the
311+
Right-click on an existing crate's name to access the different features in the
312312
context menu:
313313

314314
* **Rename**: To rename a crate, enter the new crate name and click
@@ -341,7 +341,7 @@ Playlists serve a limited purpose of keeping an ordered list of tracks.
341341
You can right-click a playlist to queue it to :ref:`Auto DJ <library-auto-dj>`,
342342
so in a sense you can “play” it.
343343

344-
Often DJ's keep a playlist of favorites or plan a list of tracks they want to
344+
Often DJs keep a playlist of favorites or plan a list of tracks they want to
345345
play at a party. In these cases they rarely care about the order since they will
346346
likely choose the order at the party based on the dance floor and mood and they
347347
certainly don't want duplicates. This is where crates come in. You can think of
@@ -389,7 +389,7 @@ Recordings
389389
|ic_lib_recordings| In this section of the library you can start and stop
390390
recordings well as view previous recordings and the dates they were made.
391391

392-
.. seealso:: For more informations, go to :ref:`djing-recording-your-mix`.
392+
.. seealso:: For more information, go to :ref:`djing-recording-your-mix`.
393393

394394
.. _library-history:
395395

@@ -451,7 +451,7 @@ The Analyze features in detail:
451451
* **Select All**: Selects all tracks in the current view.
452452
* **Analyze**: Starts the detection on the selected tracks.
453453

454-
.. seealso:: For more informations, go to :ref:`djing-bpm-detection`.
454+
.. seealso:: For more information, go to :ref:`djing-bpm-detection`.
455455

456456
.. _library-3rd-party:
457457

source/chapters/livebroadcasting.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Live Broadcasting Preferences
155155
* **Title**: Insert your custom title metadata here.
156156

157157
.. note:: Due to licensing restrictions, MP3 streaming is not enabled by
158-
default. For informations on how to enable MP3 streaming, go to
158+
default. For information on how to enable MP3 streaming, go to
159159
the chapter :ref:`MP3 streaming`.
160160

161161
Icecast vs. Shoutcast
@@ -209,7 +209,7 @@ In order to enable MP3 streaming you must install the :term:`LAME` MP3
209209

210210
.. hint:: If you have activated MP3 streaming support, you'll be also able to
211211
record your mixes in MP3 format. Go to the chapter
212-
:ref:`djing-recording-your-mix` for more informations.
212+
:ref:`djing-recording-your-mix` for more information.
213213

214214
Activate MP3 streaming support on Windows
215215
-----------------------------------------

source/chapters/setup.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ out**.
5454

5555
#. Open :menuselection:`Preferences --> Sound Hardware`
5656
#. Select the :guilabel:`Output` tab
57-
#. From the :guilabel:`Master` drop-down menus, select your build-in soundcard,
57+
#. From the :guilabel:`Master` drop-down menus, select your built-in soundcard,
5858
then :guilabel:`Channels 1-2`
5959
#. Depending on your soundcard, you can specify a
6060
:ref:`microphone <interface-mic>`
6161

62-
a. Use your build-in microphone or connect a microphone to your computer
63-
b. Is it detected by your :term:`OS <operating system>`, open the
64-
:guilabel:`Input` tab
65-
c. From the :guilabel:`Microphone` drop-down menu, select the input your
62+
a. Use your built-in microphone or connect a microphone to your computer
63+
b. Check that your microphone is detected by your :term:`OS <operating system>`
64+
c. Open the :guilabel:`Input` tab
65+
d. From the :guilabel:`Microphone` drop-down menu, select the input your
6666
microphone is connected to
6767
#. Click :guilabel:`Apply` to save the changes.
6868

@@ -95,7 +95,7 @@ The depicted configuration above uses two soundcards. This setup is the bare
9595
minimum for serious DJing. Without any extra gear, the DJ can control Mixxx via
9696
mouse and keyboard. For more information see :ref:`controlling mixxx`.
9797

98-
**Using external multi-channel soundcard**
98+
**Using an external multi-channel soundcard**
9999

100100
#. Open :menuselection:`Preferences --> Sound Hardware`
101101
#. Select the :guilabel:`Output` tab
@@ -105,13 +105,13 @@ mouse and keyboard. For more information see :ref:`controlling mixxx`.
105105
soundcard, then :guilabel:`Channels 3-4`
106106
#. Click :guilabel:`Apply` to save the changes.
107107

108-
**Using two soundcards (build-in + external)**
108+
**Using two soundcards (built-in + external)**
109109

110110
#. Open :menuselection:`Preferences --> Sound Hardware`
111111
#. Select the :guilabel:`Output` tab
112112
#. From the :guilabel:`Master` drop-down menus, select the external soundcard,
113113
then :guilabel:`Channels 1-2`
114-
#. From the :guilabel:`Headphones` drop-down menus, select the build-in
114+
#. From the :guilabel:`Headphones` drop-down menus, select the built-in
115115
soundcard, then :guilabel:`Channels 1-2`
116116
#. Click :guilabel:`Apply` to save the changes.
117117

@@ -134,13 +134,13 @@ presets. To see the full list, see :ref:`control-midi`.
134134

135135
Using Mixxx together with a MIDI controller and external soundcard
136136

137-
**Using a controller without integrated multi-channel soundcard**
137+
**Using a controller without an integrated multi-channel soundcard**
138138

139139
#. Open :menuselection:`Preferences --> Sound Hardware`
140140
#. Select the :guilabel:`Output` tab
141141
#. From the :guilabel:`Master` drop-down menus, select the external soundcard,
142142
then :guilabel:`Channels 1-2`
143-
#. From the :guilabel:`Headphones` drop-down menus, select the build-in
143+
#. From the :guilabel:`Headphones` drop-down menus, select the built-in
144144
soundcard, then :guilabel:`Channels 1-2`
145145
#. Click :guilabel:`Apply` to save the changes.
146146

@@ -157,7 +157,7 @@ alternative sound setup may look like the figure below:
157157

158158
Using Mixxx together with a MIDI controller and integrated soundcard
159159

160-
**Using a controller with integrated multi-channel soundcard**
160+
**Using a controller with an integrated multi-channel soundcard**
161161

162162
#. Open :menuselection:`Preferences --> Sound Hardware`
163163
#. Select the :guilabel:`Output` tab
@@ -189,4 +189,4 @@ For best results, when using this setup you should ensure your system is capable
189189
of latencies under 10ms. Otherwise scratching may sound distorted. For more
190190
information about latency and how to improve it, see :ref:`configuration-latency`.
191191

192-
.. seealso:: Go to the chapter :ref:`vinyl-control` for detailed informations.
192+
.. seealso:: Go to the chapter :ref:`vinyl-control` for detailed information.

0 commit comments

Comments
 (0)