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

mixxxdj · May 13, 2013 · 1cc7f6f · 1cc7f6f
2 parents 96a3a1a + 656f5e0
commit 1cc7f6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/source/chapters/library.rst b/source/chapters/library.rst
@@ -265,9 +265,9 @@ 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
-  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>`.
+  dragging-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 menu in the library`s :ref:`track list<library-root>`.
 
 Right-click on an existing playlist's name to access the different features in
 the context menu:

diff --git a/source/chapters/vinyl_control.rst b/source/chapters/vinyl_control.rst
@@ -235,8 +235,7 @@ Mixxx has three control modes regardless of which control records you use.
   your deck in relative mode, with one exception.  If you drop the needle in the
   “Lead-in Time” area (see `Vinyl Configuration`_), Mixxx will seek back to
   the beginning of the track.  Once a track is playing in Relative Mode, Mixxx
-  will not allow you to
-  select Absolute mode. Otherwise, the track would suddenly jump to a new
+  will not allow you to select Absolute mode. Otherwise, the track would suddenly jump to a new
   position.  Make sure the record is stopped and then you're free to select
   Absolute mode.
 * **Constant Mode**: This special mode is usually only activated when Mixxx