Merge from lp:~mixxxdevelopers/mixxx/manual-1.11.x

Author: esbrandt

source/chapters/advanced_topics.rst

@@ -176,7 +176,7 @@ for effects. This gives Mixxx access to the extensive collection of LADSPA
 plugins.
 
 Make sure the correct multichannel sound card has been selected in Jack
-(Jack settings visible bottom left). Note that Mixxx possibly labels it's Jack
+(Jack settings visible bottom left). Note that Mixxx possibly labels its Jack
 ports as “Portaudio”.
 
 Deleting Your Library

source/chapters/appendix.rst

@@ -129,7 +129,7 @@ language settings the defaults may be different.
 +----------------------------------------+---------------------+---------------------+--------------+
 
 .. seealso:: Mixxx allows you to customize the keyboard shortcuts. For more
-             information, and to download a a keyboard mapping image, go to
+             information, and to download a keyboard mapping image, go to
              :ref:`control-keyboard`.
 
 .. _appendix-shortcuts:

source/chapters/installation.rst

@@ -143,7 +143,7 @@ Installation on Other Distributions
 
 Your distribution may maintain a non-official build that you may use.
 Alternatively, you can build Mixxx from source. This should be a pretty
-straight forward process, and it's certainly easiest on GNU/Linux. For more
+straightforward process, and it's certainly easiest on GNU/Linux. For more
 information, go to:
 
 * `<http://mixxx.org/wiki/doku.php/compiling_on_linux>`_

source/chapters/library.rst

@@ -22,7 +22,7 @@ Overview of the Library features
 
 The library manages all of your music files. This is where you can find the
 tracks you want to play and load them into a :ref:`deck <interface-decks>` or
-:ref:`sampler <interface-sampler>`, see :ref:`djing-loading-tracks`.  Mixxx
+:ref:`sampler <interface-sampler>`; see :ref:`djing-loading-tracks`.  Mixxx
 imports your music library automatically when it is run for the first time, and
 automatically detects newly added tracks on each subsequent run, see
 :ref:`djing-import`.
@@ -66,7 +66,7 @@ Search - Find your tracks
 
 The Search box above the sidebar filters the current library view for tracks
 that match your search query. The library search include some nice search
-features, go to the chapter :ref:`djing-finding-tracks` for details.
+features; go to the chapter :ref:`djing-finding-tracks` for details.
 
 .. _library-root:
 
@@ -154,7 +154,7 @@ Right-clicking on selected tracks in the track list reveals the context menu:
   session and set their play counter to zero. The icon in the :guilabel:`Played`
   column changes.
 * **Open in File Browser**: Browse for the selected files in your file manager.
-* **Properties**: Similar to inline editing explained above the properties
+* **Properties**: Similar to inline editing explained above, the properties
   dialog allows you to view and edit metadata such as title, artist, album, and
   view the full file name and path. Note that you can not edit multiple files at
   once.
@@ -196,7 +196,7 @@ Hidden Tracks
 
 The Hidden Tracks view is also accessible by expanding the Library tree item in
 the sidebar. Any tracks that were previously loaded into your library, but were
-later set to be hidden from the library will appear here. Use the
+later set to be hidden from the library, will appear here. Use the
 :guilabel:`Hide from Library` context menu item in the
 :ref:`library <library-root>` view to temporarily hide selected tracks.
 
@@ -224,7 +224,7 @@ controls for automatic mixing. This is useful for taking a break from live
 mixing or for using Mixxx as media player.
 
 .. versionadded:: 1.11
-   Shuffle, Skip track, Fade now, Transition time, and Auto DJ Requeue
+   Shuffle, Skip track, Fade now, Transition time, and Auto DJ Requeue.
 
 The Auto DJ features in detail:
 
@@ -265,8 +265,8 @@ intended for live, attended performance use. However, you can use the
   and select :guilabel:`New playlist`. Name the playlist and click
   :guilabel:`OK`.
 * **Add Tracks**: Add tracks to a previously created playlist by
-  drag-and-dropping a selection of tracks from the library or playlists onto the
-  name of a playlist in the sidebar. Alternatively use the right-click context
+  dragging-and-dropping a selection of tracks from the library or playlists onto the
+  name of a playlist in the sidebar. Alternately, use the right-click context
   menu in the library`s :ref:`track list<library-root>`.
 
 Right-click on an existing playlist's name to access the different features in
@@ -435,8 +435,8 @@ Analyze - Preparing your tracks
 |ic_lib_prepare| Mixxx automatically analyzes tracks the first time you load
 them in a deck, nevertheless it is recommended that you analyze them before
 playing live with them to ensure the beatgrids are correct. Furthermore, track
-analysis takes considerable CPU power and might cause skips in the audio; things
-you surely don't need while performing.
+analysis takes considerable CPU power and might cause skips in the audio ---
+things you surely don't need while performing.
 
 The Analyze view allows you to run :term:`BPM` and :term:`beatgrid` detection on
 tracks in advance. Waveforms are generated as part of the analysis as well.

source/chapters/livebroadcasting.rst

@@ -40,7 +40,7 @@ Streaming Servers
      StreamingServer -> Listener3 [ dir=left, label = "Internet" ];
 
 **Local streaming server**
-  For experienced users, it may be interesting to set up an own local streaming
+  For experienced users, it may be interesting to set up your own local streaming
   server. This turns your personal computer into a radio station and listeners
   connect directly to your server. Mixxx as a streaming source does not need to
   run on the same computer as your streaming server. However, professional

source/chapters/user_interface.rst

@@ -470,7 +470,7 @@ Playing Hotcues
 * **While playing**: Tap a hotcue button to cause the track to instantly jump to
   the location of the hotcue and continue playing. If you are playing inside a
   loop and tap a hotcue whose position is outside of the loop, then the track
-  still instantly jump to the hotcue but the loop will be deactivated.
+  still instantly jumps to the hotcue but the loop will be deactivated.
 
 * **While stopped**: Tap a hotcue button to cause the track to instantly jump to
   the location of the hotcue and start playing as long as the button is pressed.
@@ -588,7 +588,7 @@ Headphone and Master Mix Controls
 
 **Head volume Knob**
   This button adjusts your headphone volume. You can adjust the volume of a
-  single deck's signal you listening to in the headphones with the
+  single deck's signal you are listening to in the headphones with the
   :ref:`Gain <interface-eq-gain>` knob.
 
 **Balance Knob**
@@ -691,7 +691,7 @@ on the left end of the crossfader and vice versa. This is also known as
 :menuselection:`Preferences --> Crossfader`.
 
 .. hint :: Using the :ref:`AutoDJ <djing-auto-dj>` feature in Mixxx, you can
-           automatize the crossfade between the decks.
+           automate the crossfade between the decks.
 
 .. _interface-play-pause:
 
@@ -932,7 +932,7 @@ Microphone Controls
 
 **Talk Button**
 
-  .. versionchanged:: 1.11 Latch mode added
+  .. versionchanged:: 1.11 Latch mode added.
 
   Hold this button and talk to mix the microphone input into the Mixxx master
   output. Short click on the button for latching. This is handy for talking for

source/chapters/vinyl_control.rst

@@ -189,7 +189,7 @@ Turntable Input Preamp
 Many turntables provide unamplified “phono level” output which must be boosted
 to a “line level” signal. Normally, a mixer or soundcard provides this
 amplification, but if you're plugging a turntable's phono output directly into
-a soundcard, that doesn't support phono input, Mixxx can do the amplification.
+a soundcard that doesn't support phono input, Mixxx can do the amplification.
 The :guilabel:`Turntable Input Preamp` slider allows you to adjust the level of
 preamplification applied to your decks' signal. However it is always preferable
 to use a proper phono preamplifier if you have one.
@@ -318,7 +318,7 @@ A rectangle provides visual feedback with regards to vinyl control status of a
 deck.
 
 * **Off**: Vinyl control disabled on the deck.
-* **Green**: Vinyl control is enable on the deck.
+* **Green**: Vinyl control is enabled on the deck.
 * **Yellow**: The needle has reached End-Of-Record.
 * **Red**: A needle skip was detected.
 
@@ -364,7 +364,7 @@ a new track, *End-Of-Record Mode* will be automatically disabled and
 
 When you're in *End-Of-Record Mode* and you want to still use the turntable for
 pitch control, simply lift the needle and place it anywhere in the main timecode
-area. It's ok, the track won't stop playing. As soon as Mixxx detects that the
+area. It's OK, the track won't stop playing. As soon as Mixxx detects that the
 needle has settled, it will automatically switch to *Relative Mode*.
 
 Control Track

source/glossary.rst

@@ -47,7 +47,7 @@ Glossary of Terms
      operating systems that Mixxx supports.
 
    file manager
-     Is a computer program that organizes data files into groups and shows you
+     A computer program that organizes data files into groups and shows you
      where they are when you need to find them again. Popular file managers for
      the :term:`operating systems <operating system>` Mixxx supports are
      Explorer on Windows, Finder on Mac OS X and Nautilus on GNU/Linux.
@@ -143,7 +143,7 @@ Glossary of Terms
      To cause something to advance at quicker than normal speed. In
      terms of audio software that means if you press the fast-forward button
      the audio will play with increased speed as long as the button is pressed.
-     This is useful to seek trough a track.
+     This is useful to seek through a track.
 
    fast-rewind
      The opposite of :term:`fast-forward`. If you press the fast-rewind button
@@ -222,7 +222,7 @@ Glossary of Terms
    AAC
      Advanced Audio Coding (AAC) is a patented audio compression algorithm which
      uses a form of :term:`lossy` data compression. Designed to be the successor
-     :term:`MP3`, AAC generally achieves better sound quality at similar bit
+     to :term:`MP3`, AAC generally achieves better sound quality at similar bit
      rates. While the .AAC extension is sometimes used for AAC-encoded files,
      they are typically saved with an .M4A file extension.
 
@@ -255,42 +255,42 @@ Glossary of Terms
 
    bitrate
      Describe the quality of an audio or video file. For audio data the bitrate
-     is commonly measured :term:`Kbps`. For example, an MP3 audio file that is
-     compressed at 192 Kbps will have a greater dynamic range and may sound
+     is commonly measured in :term:`Kbps`. For example, an MP3 audio file that
+     is compressed at 192 Kbps will have a greater dynamic range and may sound
      slightly more clear than the same audio file compressed at 128 Kbps.
 
    kbps
-    Short for kilobits per second. Here used to measure the quality of audio
-    data. See :term:`bitrate`
+     Short for kilobits per second. Here used to measure the quality of audio
+     data. See :term:`bitrate`
 
    ReplayGain
-    ReplayGain normalizes audio data in a non-destructive way, so the tracks in
-    your music library dont all play at different volume. Audio files are
-    scanned by an psychoacoustic algorithm to determine the loudness of the
-    audio data. ReplayGain information is stored as :term:`metadata` in a
-    digital audio file in order for the sound to be correctly played at the
-    right level of loudness.
+     ReplayGain normalizes audio data in a non-destructive way, so the tracks in
+     your music library don't all play at different volumes. Audio files are
+     scanned by a psychoacoustic algorithm to determine the loudness of the
+     audio data. ReplayGain information is stored as :term:`metadata` in a
+     digital audio file in order for the sound to be correctly played at the
+     right level of loudness.
 
    db
-    Short for decibels. A Decibel is a logarithmic measurement of sound
-    level. Whispering is around 25 dB while unbearable sound such as a jet
-    engine is around 160 db. Rule of thumb: A volume increase of 10 dB is
-    perceived as twice as loud.
+     Short for decibels. A Decibel is a logarithmic measurement of sound
+     level. Whispering is around 25 dB while unbearable sound such as a jet
+     engine is around 160 db. Rule of thumb: A volume increase of 10 dB is
+     perceived as twice as loud.
 
    cue sheet
-    A cue sheet (or CUE file, CUE sheet, etc.) is a formatted plain text file
-    which is used to provide index information for a large audio file. For
-    example, it can be used to tell software extra details about the layout of a
-    CD to burn.
+     A cue sheet (or CUE file, CUE sheet, etc.) is a formatted plain text file
+     which is used to provide index information for a large audio file. For
+     example, it can be used to tell software extra details about the layout of
+     a CD to burn.
 
    metadata
-    In general, any piece of information about a music file that Mixxx uses
-    (e.g. title, artist, album, hotcue locations, loops, etc.). Various file
-    metadata formats allow information such as the title, artist, album, and
-    track number to be stored in the audio file itself, see
-    `<https://en.wikipedia.org/wiki/ID3>`_ . Mixxx stores additional metadata
-    about music files in its database, like :term:`beatgrid`, waveform data,
-    :term:`hotcues <hotcue>`, playlists, crates, number of plays, etc.
+     In general, any piece of information about a music file that Mixxx uses
+     (e.g. title, artist, album, hotcue locations, loops, etc.). Various file
+     metadata formats allow information such as the title, artist, album, and
+     track number to be stored in the audio file itself, see
+     `<https://en.wikipedia.org/wiki/ID3>`_ . Mixxx stores additional metadata
+     about music files in its database, like :term:`beatgrid`, waveform data,
+     :term:`hotcues <hotcue>`, playlists, crates, number of plays, etc.
 
    CDJ
      CDJ is a term originally used to describe a line of CD players from Pioneer
@@ -409,4 +409,4 @@ Glossary of Terms
      to a user interface based on graphics (icons, pictures and menus) instead
      of text. In Mixxx, it uses a mouse, keyboard, or
      :term:`MIDI <MIDI controller>` / :term:`HID <HID controller>` controllers
-     as input devices.
+     as input devices.