From 435e061e52c0adadcb74f9ab61d52fba2d353f03 Mon Sep 17 00:00:00 2001
From: Samuel Hinton <samuelreay@gmail.com>
Date: Tue, 20 Sep 2016 09:58:06 +1000
Subject: [PATCH] Updating detailed instructions for key bindings

---
 README.md            | 3 +++
 js/config.js         | 2 +-
 js/controllers.js    | 4 ++--
 templates/usage.html | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 31d795c..6aaf795 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,9 @@ After doing this, you can analyse a FITS file by running `./marz.sh <FITSFilePat
 
 # Updates
 
+## 1.3.6
+* Improving keybinding documentation.
+
 ## 1.3.5
 * Adding type "AGN"
 
diff --git a/js/config.js b/js/config.js
index 8049d16..01dbac2 100644
--- a/js/config.js
+++ b/js/config.js
@@ -6,7 +6,7 @@
 // Any change in the version will mean prior redshifts stored in the program
 // will not be loaded (as they may be different with the update).
 var globalConfig = {};
-globalConfig.marzVersion = "1.3.5";
+globalConfig.marzVersion = "1.3.6";
 
 globalConfig.waveExt = 'wavelength';
 globalConfig.dataExt = 'intensity';
diff --git a/js/controllers.js b/js/controllers.js
index f908b23..fb17de1 100644
--- a/js/controllers.js
+++ b/js/controllers.js
@@ -135,10 +135,10 @@ angular.module('controllersZ', ['ui.router', 'ui.bootstrap', 'servicesZ'])
             {key: 'shift+?', label: '?', description: 'Go to the Usage tab', fn: function() {
                 $state.go('usage');
             }},
-            {key: 'n', label: 'n', description: 'Selects to the next spectra', fn: _.throttle(function() {
+            {key: 'n', label: 'n', description: 'Selects the next spectra', fn: _.throttle(function() {
                 $scope.$apply(function() {$scope.setNextSpectra();});
             }, 300, { 'trailing': false})},
-            {key: 'b', label: 'b', description: 'Selects to the previous spectra', fn: _.throttle(function() {
+            {key: 'b', label: 'b', description: 'Selects the previous spectra', fn: _.throttle(function() {
                 $scope.$apply(function() {$scope.setPreviousSpectra();});
             }, 300, { 'trailing': false})},
             {key: 't', label: 't', description: 'Toggle whether templates are displayed', fn: _.throttle(function() {
diff --git a/templates/usage.html b/templates/usage.html
index 6e847a4..3a2dad0 100644
--- a/templates/usage.html
+++ b/templates/usage.html
@@ -85,7 +85,8 @@ <h4>Downloading results</h4>
         <p>The options to clear the internal saved data are irreversible. If you have saved <code>.mz</code> output via downloading the results, these can still be loaded in without hassle, this section only pertains to the automatic background saving of results.</p>
     </accordion-group>
     <accordion-group heading="Keybindings">
-        <p>Many key bindings have been added to this application from the RUNZ default keymapping to make usage easier. The following commands are available:</p>
+        <p>Many key bindings have been added to this application from the RUNZ default keymapping to make usage easier. Note that the way the key bindings and browser interact, make sure you don't have any input element selected when pressing the keyboard shortcuts. In most cases this is obvious - if you are in the comment text input, typing will write out a comment, not trigger shortcuts. However, the same is true if you have a check-button focused, or a slider. So, if a shortcut doesn't work, click away and try again!</p>
+        <p>The following commands are available:</p>
         <keybind bind="bind" ng-repeat="bind in keybinds"></keybind>
     </accordion-group>
     <accordion-group heading="File Output and Loading Results with Python">