From 6d5736852d9ba5f1cd8e2905842c181f6f5f8f61 Mon Sep 17 00:00:00 2001
From: Joe Wreschnig <joe.wreschnig@gmail.com>
Date: Wed, 13 Mar 2013 10:43:10 +0100
Subject: [PATCH] Copyediting.

---
 .../Resources/English.lproj/index.html        |  6 +--
 .../Resources/English.lproj/pgs/keyboard.html | 45 ++++++++++---------
 .../Resources/English.lproj/pgs/mappings.html | 21 +++++----
 .../Resources/English.lproj/pgs/mouse.html    | 44 ++++++++----------
 .../Resources/English.lproj/pgs/problems.html |  4 +-
 .../Resources/English.lproj/pgs/whatsnew.html |  9 ++--
 6 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/Resources/Help/Contents/Resources/English.lproj/index.html b/Resources/Help/Contents/Resources/English.lproj/index.html
index 10d998a..474df0b 100644
--- a/Resources/Help/Contents/Resources/English.lproj/index.html
+++ b/Resources/Help/Contents/Resources/English.lproj/index.html
@@ -28,7 +28,7 @@
     </div>
     
     <p style="margin-bottom: 2em">
-      Enjoyable helps you use a joystick or gamepad to control
+      Enjoyable lets you use a joystick or gamepad to control
       applications which normally require a keyboard and mouse.
     </p>
 
@@ -41,8 +41,8 @@
       <h3>Quick Start</h3>
       <ul>
         <li>Connect a joystick or gamepad.</li>
-        <li>Press a button on it, then the keyboard key you want to use.</li>
-        <li>Press the ▶ button in the upper-right.</li>
+        <li>Press a button on it, then the keyboard key you it to simulate.</li>
+        <li>Press the ▶ button in the upper-right of the .</li>
         <li>Start up your game and use your gamepad!</li>
       </ol>
     </div>
diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/keyboard.html b/Resources/Help/Contents/Resources/English.lproj/pgs/keyboard.html
index 522cf96..c891c52 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/keyboard.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/keyboard.html
@@ -34,44 +34,45 @@
     </div>
 
     <p>
-      Enjoyable supports mapping joystick buttons, hat switches, and
-      axis thresholds to simulate keyboard keys. First disable
-      mapping by deactivating the ▶ button in the top left. Then press
-      the button on the joystick you want to map. This will select it
-      on the left-hand side of the screen.
+      To use buttons, hat switches, and axis thresholds to simulate
+      keyboard keys, first disable mapping by turning off the ▶ button
+      in the top left. Then press the button on the input device you
+      want to map. This will select it on the left-hand side of the
+      screen.
     </p>
 
     <p>
       If the button wasn't mapped or was mapped to a key press
-      already, the key input field activates and you can simply press
-      the key you want to use. Otherwise, click on the <b>Press a
-      key</b> label or input field, then press the key.
+      already, the key input field activates and you can press the key
+      you want to use. Otherwise, click on the <b>Press a key</b> item
+      or input field, then press the key.
     </p>
 
     <p>
-      To change a key without disabling mapping you can choose the
-      input's entry in the sidebar directly.
+      To change a key without disabling mapping you can choose its
+      entry in the sidebar directly.
     </p>
 
-    <h3><a name="clear_key"></a>Clearing the Selection</h3>
+    <h3><a name="cancel_key"></a>Cancelling</h3>
     <p>
-      To clear a mapped key select the <b>Do nothing</b>
-      option or press ⌘⌫ when the key input field is selected.
+      If you select the input field by mistake you can press ⌘⎋ or
+      click on the key field to cancel without changing the current
+      setting.
     </p>
 
-    <h3><a name="cancel_key"></a>Cancelling the Selection</h3>
+    <h3><a name="clear_key"></a>Clearing the Key</h3>
     <p>
-      If you select the key input field by mistake you can press ⌘⎋ or
-      click on the field to cancel the selection without changing the
-      current setting.
+      To clear a mapped key select <b>Do nothing</b> or press ⌘⌫ when
+      the input field is selected.
     </p>
 
-    <h3><a name="raw_key"></a>Raw Key Codes</h3>
+    <h3><a name="raw_key"></a>Entering Raw Key Codes</h3>
     <p>
-      Hold ⌘ and click on the field to enter a raw key code. Key codes
-      are hexadecimal numbers associated with each key on a
-      keyboard. For example, if you need to map something to the Windows Menu
-      key and your keyboard doesn't have one, enter <kbd>0x6E</kbd> here.
+      Hold ⌘ and click on the field to enter a raw hexadecimal key
+      code. Key codes are numbers associated with each key on a
+      keyboard. For example, if you need to map something to the
+      Windows Menu key and your keyboard doesn't have one,
+      enter <kbd>0x6E</kbd> here.
     </p>
   </body>
 </html>
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
diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html b/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
index c88e8ad..5436540 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
@@ -33,23 +33,17 @@
       <h1>Mouse Events</h1>
     </div>
 
-    <p>
-      You can use Enjoyable to map input to mouse buttons, moving, and
-      scrolling.
-    </p>
-
     <h3>Movement</h3>
     <p>
       Select the direction you'd like the input to move the
-      mouse. Adjust the movement speed using the slider underneath.  If
-      you are mapping an analog input then this is the maximum speed;
-      for a button it's a constant speed.
+      mouse. Adjust the movement speed using the slider underneath.
+      If you're mapping an analog input then this is the maximum
+      speed; for a button it's a constant speed.
     </p>
     <p>
-      The speed is set independently for each input. You can have
-      faster horizontal movement than vertical movement, or map one
-      set of inputs to a fast speed and another set to a slow
-      speed.
+      The speed is independent for each input. You can have faster
+      horizontal movement than vertical movement, or map one set of
+      inputs to a fast speed and another set to a slow speed.
     </p>
 
     <h3>Buttons</h3>
@@ -59,18 +53,16 @@
 
     <h3><a name="scrolling"></a>Scrolling</h3>
     <p>
-      Simulated scrolling can be continuous like the scrolling
-      gestures on a trackpad, or discrete like a mouse wheel that
-      clicks as you spin it. You can simulate a vertical or horizontal
-      mouse wheel.
+      Simulated scrolling can be smooth like the scrolling gestures on
+      a trackpad, or discrete like a mouse wheel that clicks as you
+      spin it. You can simulate a vertical or horizontal mouse wheel.
     </p>
     <p>
-      To use <em>continuous scrolling</em> check the <b>Smooth</b>
-      button and use the slider underneath the directions to adjust
-      the scrolling speed. If you are mapping an analog input then
-      this is the maximum speed; for a button it's a constant
-      speed. Scrolling will continue as long as as the input is held
-      down.
+      To use <em>smooth scrolling</em> check the <b>Smooth</b> button
+      and use the slider underneath the arrows to adjust the
+      scrolling speed. If you're mapping an analog input then this is
+      the maximum speed; for a button it's a constant speed. Scrolling
+      will continue as long as as the input is held down.
     <p>
       To use <em>discrete scrolling</em> leave the button
       unchecked. The input will trigger scrolling by exactly one line
@@ -79,10 +71,10 @@
     </p>
     <p>
       The arrows indicate the direction you would spin a mouse wheel
-      or move your fingers. Depending on settings this may mean you
-      need to choose a down arrow to scroll up and vice versa. You can
-      also change this globally in <b> > System Preferences… >
-      Mouse</b> and <b> > System Preferences… > Trackpad</b>.
+      or move your fingers. If you use natural scrolling you may need
+      to choose a down arrow to scroll up and vice versa. You can also
+      change this globally in <b> > System Preferences… > Mouse</b>
+      and <b> > System Preferences… > Trackpad</b>.
     </p>
     
     <h3><a name="mouseissues"></a>Known Issues</h3>
diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/problems.html b/Resources/Help/Contents/Resources/English.lproj/pgs/problems.html
index 5cb6d8c..0e45c23 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/problems.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/problems.html
@@ -53,13 +53,13 @@
     <p>
       Make sure it matches the name of the application exactly. If you
       still have trouble, name the mapping <kbd>@Application</kbd> and
-      switch back to have Enjoyable try to deduce the correct name
+      switch back to have Enjoyable try to pick the correct name
       automatically.
     </p>
 
     <h3>
-      Mouse clicks and drags don't work
       <a name="brokenmouse"></a>
+      Mouse clicks and drags don't work
     </h3>
     <p>
       For reasons yet to be determined, Enjoyable can freeze if it
diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html b/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html
index a299806..961e84c 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html
@@ -53,9 +53,12 @@
             <li>
                 Automatic switching for applications with ambiguous
                 names (e.g. "Flash Player") has been improved. You can
-                now also name a mapping after the application's
-                filename.
+                also name a mapping after the application's filename.
+            </li>
+            <li>
+              Enjoyable uses fewer resources when running in the
+              background.
             </li>
         </ul>
     </body>
-</html>
\ No newline at end of file
+</html>
-- 
2.30.2