Merge pull request #15 from mixxxdj/manual-updates

Update manual with Master Sync and Midi Wizard instructions

source/chapters/advanced_topics.rst

@@ -51,10 +51,28 @@ Wizard.
 #. Click any control in the Mixxx :term:`GUI`
 #. Alternatively, click the :guilabel:`Choose Control` button and choose one
    from the selection list
-#. Move a control on your controller to map it. Repeat this as many times as you
-   wish.
+#. Push Learn and then move a control or push a button on your controller to map it.  You
+can also move a control without pushing the Learn button if you are learning many controls.
+#. If you are learning a button, just push it once.  If you are learning a knob or a slider,
+try to move it throughout its range.
+#. After Mixxx detects the control, you may click Learn Another or you can just click on
+another button in the Mixxx GUI to learn another control.
 #. When you are finished mapping controls, click :guilabel:`Done`
 
+There are also some advanced options in the Midi Wizard you may need to use:
+
+* Soft Takeover. Use this option for knobs or sliders to avoid sudden jumps in value
+when the knob in the GUI doesn't match the physical knob.  If you select this
+option, you won't be able to perform super-fast motions as easily. (Recommended off)
+* Invert:  Use this option for controls that you want to work backwards from how they
+were detected.
+* Switch Mode: Use this option on controllers that have controls that act like 
+switches and emit one value on the first press, and a different value on the next press.
+(Think an actual hardware toggle switch, or a button that lights up on the first press and
+turns off on the second press).
+* Jog Wheel / Select Knob.  Use this for knobs that don't have a beginning or an end, but spin
+continuously.
+
 The Controller wizard saves the new preset to the following file paths:
 
 * Linux: :file:`/home/<username>/.mixxx/controllers`

source/chapters/djing_with_mixxx.rst

@@ -482,7 +482,7 @@ the two things a DJ must do to beatmatch.
 
 Mixxx can match the tempo and align the beats for you but this requires an
 accurately detected BPM value and a correct beat grid for both tracks. To enable
-this feature, hit the :guilabel:`SYNC` button. To beatmatch manually, the tempo
+this feature, tap the :guilabel:`SYNC` button. To beatmatch manually, the tempo
 of the two tracks must be synchronized by adjusting the playback rate
 sliders. You can adjust the phase of the beats by right-clicking and dragging on
 either waveform display to temporarily speed up or slow down one of the tracks
@@ -500,6 +500,32 @@ the two kicks drift out of phase. When this happens, the beats can be realigned
 by simply tapping one of the temporary pitch bend buttons a few times in the
 appropriate direction.
 
+.. _master-sync:
+
+Master Sync
+===========
+
+:term:`Master Sync` is an intelligent assistant that allows you to leave the
+beatmatching to Mixxx so you can focus on track selection, effects manipulation,
+looping, 4 deck mixing, and other advanced DJing techniques.
+
+To activate Master Sync on a deck, push and hold (or click and hold) the :guilabel:`SYNC` button.
+You'll know Master Sync is on because the sync button will remain lit.  Changing 
+the rate of any deck that has Sync lit will change the rates of all other
+decks that also have the Sync button lit.  There is no need to set specific decks
+to be a master or followers.  You can play, stop, eject, load, and queue any track
+with master sync and it won't interrupt the playback of the other decks.  Changing
+the rate of stopped deck will change the rate of playing decks, however.
+
+Usually, Master Sync will only make sure the rate sliders are set correctly.  If you
+also want to make sure your beats are perfectly in sync, turn on the :guilabel:`QUANTIZE`
+button.  When activated, Quantize will ensure that the beats are perfectly lined
+up as well.
+
+Master Sync will also notice if one of your tracks is double the BPM of another track
+and match them correctly.  So if you want to mix a 140 BPM drum & bass track with a
+70 bpm dubstep track, Master Sync will make sure they are lined up properly.
+
 .. _headphone-cueing:
 
 Headphone Cueing