Merge branch 'releases/Release_2_11_4_Branch'

[jalview.git] / help / help / html / menus / desktopMenu.html

diff --git a/help/help/html/menus/desktopMenu.html b/help/help/html/menus/desktopMenu.html
index d716e33..7068bad 100755 (executable)
--- a/help/help/html/menus/desktopMenu.html
+++ b/help/help/html/menus/desktopMenu.html
@@ -54,16 +54,19 @@
         <li><strong>Load Project</strong><br> <em>Loads
             Jalview archives <strong>only</strong>.
         </em></li>
-        <li><strong>Quit</strong><br> <em>Close Jalview.
-            <br> <strong>Note - any annotation you have
+        <li><strong>Quit</strong><br> <em>Close Jalview.</em>
+            <br> <em>Under the Jalview dropdown on Macs</em>
+            <br>
+            <strong>Jalview will try to check if you have any unsaved 
+              data and warn you, but please remember that any annotation you have
               made on alignments will be lost unless you Save your work
               before quitting.</strong>
-        </em><br></li>
+        <br></li>
       </ul></li>
     <li><strong>Tools</strong>
       <ul>
         <li><strong><a href="../features/preferences.html">Preferences<br>
-          </a></strong><em>Change the default visual settings for opening new
+          </a></strong><em>Under the Jalview menu on OSX</em><br><em>Change the default visual settings for opening new
             alignment windows.</em></li>
         <li><strong>Show Memory Usage<br></strong> <em>When
             ticked, the currently available memory will be displayed in
@@ -86,34 +89,9 @@
             the <a href="../features/groovy.html">Groovy Console</a> for
             interactive scripting.
         </em><strong><br></strong></li>
-        <!--         <li><strong>Enable Experimental Features</strong> <em>Enable or disable <a href="../whatsNew.html#experimental">features still under development</a> in Jalview's user interface. This setting is remembered in your preferences.</em> -->
+        <strong>Enable Experimental Features</strong> <em>Enable or disable <a href="../whatsNew.html#experimental">features still under development</a> in Jalview's user interface. This setting is remembered in your preferences.</em>
 
       </ul></li>
-    <li><strong>Vamsas</strong> <em>For more details, read the
-        <a href="../vamsas/index.html">Jalview VAMSAS documentation</a>.<br />
-        When no session is active, the menu provides options for
-        initiating a new VAMSAS session:
-    </em>
-      <ul>
-        <li><strong>Connect to<br /></strong> <em>Connect to
-            one of the existing sessions available.</em></li>
-        <li><strong>New VAMSAS session<br /></strong> <em>Initiates
-            a new local VAMSAS session.</em></li>
-        <li><strong>Load VAMSAS session...<br /></strong> <em>Opens
-            a file browser allowing you to choose a VAMSAS document to
-            import into a new local session.</em></li>
-      </ul> <em>When Jalview is joined to a VAMSAS session, the menu
-        contains the following:</em>
-      <ul>
-        <li><strong>Session Update<br /></strong> <em>Sends
-            alignment data in the Jalview desktop to the VAMSAS session.</em></li>
-        <li><strong>Save VAMSAS Session...<br /></strong> <em>Saves
-            the current session to a VAMSAS document archive.</em></li>
-        <li><strong>Stop VAMSAS Session<br /></strong> <em>Disconnects
-            from the current session. You may be asked if you want to
-            save the current session's data if no other VAMSAS clients
-            are connected.</em></li>
-      </ul></li>
     <li><strong>Help </strong>
       <ul>
         <li><strong>About<br>