X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FHelp%2FContents%2FResources%2FEnglish.lproj%2Fpgs%2Fmappings.html;h=742885925e70b10ea27dd5af14aa6339bdff5f45;hp=3b181ffbe264e7dd0eeacca072d15be2c19e9b4b;hb=6d5736852d9ba5f1cd8e2905842c181f6f5f8f61;hpb=5a0c575facf7002f69d1d87f8d4362cbb0895301

diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/mappings.html b/Resources/Help/Contents/Resources/English.lproj/pgs/mappings.html
index 3b181ff..7428859 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/mappings.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/mappings.html
@@ -48,15 +48,16 @@
 
     <p>
       You can also switch mappings with the <b>Mappings</b> menu, with
-      Enjoyable's dock menu, or by pressing ⌘1 through ⌘9.
+      Enjoyable's dock menu, from the status bar item, or by pressing
+      ⌘1 through ⌘9.
     </p>
 
     <p>
-      Switching mappings can also be mapped to an input. Select the
-      input you wish to use and then choose a mapping from
-      the <b>Switch to mapping</b> option. For example, you could have
-      one mapping for a game's menu and another for its main screen
-      and switch between them in-game without returning to Enjoyable.
+      Switching can also be mapped to an input. Select the input you
+      want to use and then choose a mapping from the <b>Switch to
+      mapping</b> option. For example, you could have one mapping for
+      a game's menu and another for its main screen and switch between
+      them in-game without returning to Enjoyable.
     </p>
 
     <h3><a name="automatic"></a>Automatic Switching</h3>
@@ -73,8 +74,8 @@
 
     <h3><a name="sharing"></a>Import and Export</h3>
     <p>
-      Mappings can be exported and shared with other people. To export
-      your current mapping choose <b>Mappings > Export…</b> and pick a
+      Mappings can be exported and shared with others. To export your
+      current mapping choose <b>Mappings > Export…</b> and pick a
       location to save the file. This file can be shared with anyone;
       it doesn't contain any personal information other than the
       product IDs of the input devices you used and what you mapped
@@ -84,9 +85,7 @@
       To import a mapping choose <b>Mappings > Import…</b> and select
       the file you want to import. Mapping files end
       with <kbd>.enjoyable</kbd> (the default), <kbd>.json</kbd>,
-      or <kbd>.txt</kbd>. If the imported mapping conflicts with one
-      you already made, you can choose to merge the two mappings or
-      create a new one with the same name.
+      or <kbd>.txt</kbd>.
     </p>
     <p>
       You can also import mappings by opening them in Finder or