diff --git a/docs/index.html b/docs/index.html
index 74028d428..44475a7dc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -28,6 +28,7 @@
         <li><a href="#Games">Locating Game Images (aka, ROMs)</a></li>
         <li><a href="#Playing">Playing a Game</a></li>
         <li><a href="#Keyboard">Keyboard Layout</a></li>
+        <li><a href="#ControlMap">Controller Map</a></li>
       </ul>
     </li>
     <li><a href="#Advanced">Advanced Configuration</a><br>
@@ -1558,6 +1559,103 @@
   </table>
   </blockquote>
 
+  <h2><b><a name="ControlMap">6. Controller Map</a></b></h2>
+  <blockquote>
+
+  <p>Some Atari (virtual) controllers are simulated with more than one computer controller, and
+  there are several special cases where controllers are active in certain modes only, as the table
+  below shows.  Items marked as <b>(+ extra)</b> indicate that the computer controller may not have
+  enough buttons/axes/etc to fully emulate the device, so extra functionality must be mapped to other
+  controllers.</p>
+
+  <table BORDER=2 cellpadding=5>
+    <tr>
+      <th>&nbsp;</th>
+      <th colspan="5">Computer</th>
+    </tr>
+    <tr>
+      <th>Virtual<br>Controller</th>
+      <th>Keyboard</th>
+      <th>Joystick</th>
+      <th>Mouse<br>(auto mode)</th>
+      <th>Mouse<br>(specific axis)</th>
+      <th>Stelladaptor/<br>2600-daptor</th>
+    </tr>
+    <tr>
+      <th> Joystick</th>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2715;</td>
+      <td> &#x2713;</td>
+    </tr>
+    <tr>
+      <th> Paddles</th>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2713; (+ extra)</td>
+      <td> &#x2713;</td>
+    </tr>
+    <tr>
+      <th> Booster</th>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2713; (+ extra)</td>
+      <td> &#x2715;</td>
+      <td> &#x2713; (+ extra)</td>
+    </tr>
+    <tr>
+      <th> Genesis</th>
+      <td> &#x2713;</td>
+      <td> &#x2713; (+ extra)</td>
+      <td> &#x2715;</td>
+      <td> &#x2715;</td>
+      <td> &#x2715;</td>
+    </tr>
+    <tr>
+      <th> Keyboard</th>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2715;</td>
+      <td> &#x2715;</td>
+      <td> &#x2715;</td>
+    </tr>
+    <tr>
+      <th> Driving</th>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2713;</td>
+      <td> &#x2715;</td>
+      <td> &#x2713;</td>
+    </tr>
+    <tr>
+      <th> Trackball/mouse</th>
+      <td> &#x2715;</td>
+      <td> &#x2715;</td>
+      <td> &#x2713;</td>
+      <td> &#x2713; (axis ignored)</td>
+      <td> &#x2715;</td>
+    </tr>
+    <tr>
+      <th> AtariVox</th>
+      <td> N/A</td>
+      <td> N/A</td>
+      <td> N/A</td>
+      <td> N/A</td>
+      <td> N/A</td>
+    </tr>
+    <tr>
+      <th> SaveKey</th>
+      <td> N/A</td>
+      <td> N/A</td>
+      <td> N/A</td>
+      <td> N/A</td>
+      <td> N/A</td>
+    </tr>
+  </table>
+  </blockquote>
+
 
 <!-- /////////////////////////////////////////////////////////////////////////  -->
   <br><br>
diff --git a/src/emucore/Driving.cxx b/src/emucore/Driving.cxx
index a6a53c2c9..9a6529af5 100644
--- a/src/emucore/Driving.cxx
+++ b/src/emucore/Driving.cxx
@@ -117,7 +117,7 @@ void Driving::update()
 void Driving::setMouseControl(
     MouseAxisControl xaxis, MouseAxisControl yaxis, int ctrlID)
 {
-  // In 'automatic' mode, both axes on the mouse map to a single normal joystick
+  // In 'automatic' mode, only the X-axis is used
   if(xaxis == Controller::Automatic || yaxis == Controller::Automatic)
   {
     myControlID = ((myJack == Left && (ctrlID == 0 || ctrlID == 1)) ||