Get rid of a few Fixme's

diff --git a/include/microsoft-windows.html b/include/microsoft-windows.html
index a4a5d97d3391a867f232479a00bd3fe3f3bafc04..c4adf9ffe06dd4f4994c84a49726c930301a0b4f 100644 (file)
--- a/include/microsoft-windows.html
+++ b/include/microsoft-windows.html
@@ -1,27 +1,25 @@
 
-<p class=fixme>This section is need of updating.</p>
-
 <p>
-  <dfn>Microsoft Windows</dfn> is not currently officially supported. If you
-  are willing to live with bugs and <b>help to test</b> this platform, read on.
+  <dfn>Microsoft Windows</dfn> is officially supported since version 5.0 (2016).
 </p>
 
 <h2>Installing Ardour</h2>
 
 <ol>
   <li>Download the latest windows build from <a
-  href="http://nightly.ardour.org/"> the nightly build page</a>.</li>
+  href="https://community.ardour.org/download"> the download page</a>.</li>
   <li>Run the installer and follow the prompts.</li>
 </ol>
 
 <h2>How to help</h2>
 
 <ul>
-  <li>Hang out in #ardour-windows on irc.freenode.net. One may ask questions
-  there and if possible, answer questions that others have.</li>
+  <li>Hang out in <a href="http://webchat.freenode.net/?channels=ardour">#ardour</a>
+  on irc.freenode.net. One may ask questions there and if possible, answer
+  questions that others have.</li>
   <li>Keep an eye on the <a
-  href="https://community.ardour.org/forum/27">Windows forum</a> and contribute
-  to the discussions there.</li>
+  href="https://discourse.ardour.org/c/installation-configuration/windows">Windows
+  forum</a> and contribute to the discussions there.</li>
   <li>Update this manual via pull requests on <a
   href="https://github.com/Ardour/manual">github</a>.</li>
 </ul>

diff --git a/include/the-transport-menu.html b/include/the-transport-menu.html
index d5caa4488fb4194a053aa3f1c658e8dcd119fed5..5ec9bfe0481f668d160cdcd95e069ba141bab766 100644 (file)
--- a/include/the-transport-menu.html
+++ b/include/the-transport-menu.html
@@ -8,7 +8,7 @@
        <tr><th>Play</th>
                <tr><th class="sub1">Play Selection</th><td>Only plays the selected part of the session, be it a range or selected regions</td></tr>
                <tr><th class="sub1">Play Selection w/Preroll</th><td>As the previous menu, except it starts the playback a few bars or seconds before the beginning of the selection (the amount of time can be set in the <a href="@@preferences#transport">Preferences</a>)</td></tr>
-               <tr><th class="sub1">Start/Continue/Stop</th><td>FIXME</td></tr>
+               <tr><th class="sub1">Start/Continue/Stop</th><td>Leaves loop play or range play mode but without stopping the transport</td></tr>
                <tr><th class="sub1">Play from Edit Point and Return</th><td>Starts the playback at the <a href="@@edit-point-control">Edit point</a>, and when stopped, goes back to the original location</td></tr>
                <tr><th class="sub1">Play Loop Range</th><td>If a <a href="@@the-loop-range">Loop range</a> is defined, play it and loop until stopped</td></tr>
        <tr><th>Start Recording</th><td>This is a shortcut to trigger the global recording, and start playback at once</td></tr>
@@ -21,10 +21,10 @@
        <tr><th>Set Punch from Selection</th><td>Same thing, for <a href="@@punch-range">Punch</a></td></tr>
        <tr><th>Set Session Start/End from Selection</th><td>Same thing, for the start and end markers of the session, defining the session's length</td></tr>
 
-       <tr><th>Forward</th><td>FIXME</td></tr>
-       <tr><th>Rewind</th><td>Plays the audio backwards from the playhead on</td></tr>
-       <tr><th>Transition to Roll</th><td>FIXME</td></tr>
-       <tr><th>Transition to Reverse</th><td>FIXME</td></tr>
+       <tr><th>Forward</th><td>Plays the audio forwards from the playhead on. If the audio is already playing forwards, increment its speed by 50&percnt;.</td></tr>
+       <tr><th>Rewind</th><td>Plays the audio backwards from the playhead on. If the audio is already playing backwards, increment its speed by 50&percnt;.</td></tr>
+       <tr><th>Transition to Roll</th><td>Plays the audio forwards, with a speed of 1 (real time)</td></tr>
+       <tr><th>Transition to Reverse</th><td>Plays the audio backwards, with a speed of 1 (real time)</td></tr>
 
        <tr><th>Playhead</th><td></td></tr>
                <tr><th class="sub1">Playhead to Mouse</th><td>Set the position of the playhead at the current position of the mouse cursor</td></tr>

diff --git a/include/using-the-mouse.html b/include/using-the-mouse.html
index def088c17cc7aff73562a5bc307282f2f81f5f94..d593743a2ff094b097258772d98aba5f09f1a20d 100644 (file)
--- a/include/using-the-mouse.html
+++ b/include/using-the-mouse.html
@@ -86,24 +86,9 @@
   <li><kbd>Ctrl</kbd> (Control)</li>
   <li><kbd>Shift</kbd></li>
   <li><kbd>Alt</kbd></li>
-  <li><kbd>Mod2</kbd></li>
-  <li><kbd>Mod3</kbd></li>
-  <li><kbd>Mod4</kbd></li>
-  <li><kbd>Mod5</kbd></li>
+  <li><kbd>Win</kbd> (Super/Windows)</li>
 </ul>
 
-<p class=fixme>
-  The following section is almost certainly wrong. Will need to be checked
-  and rewritten asap.
-</p>
-
-<p>
-  Mod2 typically corresponds to the <kbd>NumLock</kbd> key on many systems.
-  On most Linux systems, there are no keys that will function as modifiers
-  Mod3, Mod4 or Mod5 by default, but they can be setup using
-  <dfn>xmodmap(1)</dfn>. This can be rather useful.
-</p>
-
 <h3>OS X Modifiers</h3>
 
 <ul>