Check spelling

[tig] / tig.c

diff --git a/tig.c b/tig.c
index 3b51c5a..bbdf3c1 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -23,7 +23,7 @@
  * Browse changes in a git repository. Additionally, tig(1) can also act
  * as a pager for output of various git commands.
  *
- * When browsing repositories, tig(1) uses the underlaying git commands
+ * When browsing repositories, tig(1) uses the underlying git commands
  * to present the user with various views, such as summarized commit log
  * and showing the commit with the log message, diffstat, and the diff.
  *
@@ -295,7 +295,7 @@ parse_options(int argc, char *argv[])
                /**
                 * \--::
                 *      End of tig(1) options. Useful when specifying commands
-                *      for the main view. Example:
+                *      options for the main view. Example:
                 *
                 *              $ tig -- --since=1.month
                 **/
@@ -305,13 +305,13 @@ parse_options(int argc, char *argv[])
                }
 
                /**
-                * log [options]::
+                * log [git log options]::
                 *      Open log view using the given git log options.
                 *
-                * diff [options]::
+                * diff [git diff options]::
                 *      Open diff view using the given git diff options.
                 *
-                * show [options]::
+                * show [git show options]::
                 *      Open diff view using the given git show options.
                 **/
                if (!strcmp(opt, "log") ||
@@ -322,11 +322,16 @@ parse_options(int argc, char *argv[])
                        break;
                }
 
-               /* Make stuff like:
+               /**
+                * [git log options]::
+                *      tig(1) will stop the option parsing when the first
+                *      command line parameter not starting with "-" is
+                *      encountered. All options including this one will be
+                *      passed to git log when loading the main view.
+                *      This makes it possible to say:
                 *
                 *      $ tig tag-1.0..HEAD
-                *
-                * work. */
+                **/
                if (opt[0] && opt[0] != '-')
                        break;
 
@@ -1702,7 +1707,7 @@ struct keymap keymap[] = {
         * h::
         *      Show man page.
         * Return::
-        *      If on a commit line show the commit diff. Addiionally, if in
+        *      If on a commit line show the commit diff. Additionally, if in
         *      main or log view this will split the view. To open the commit
         *      diff in full size view either use 'd' or press Return twice.
         * Tab::
@@ -1721,17 +1726,17 @@ struct keymap keymap[] = {
         * Cursor navigation
         * ~~~~~~~~~~~~~~~~~
         * Up::
-        *      Move curser one line up.
+        *      Move cursor one line up.
         * Down::
         *      Move cursor one line down.
         * k::
-        *      Move curser one line up and enter. When used in the main view
+        *      Move cursor one line up and enter. When used in the main view
         *      this will always show the diff of the current commit in the
         *      split diff view.
         * j::
         *      Move cursor one line down and enter.
         * PgUp::
-        *      Move curser one page up.
+        *      Move cursor one page up.
         * PgDown::
         *      Move cursor one page down.
         * Home::
@@ -2166,8 +2171,9 @@ main(int argc, char *argv[])
  *
  *     $ tig log tag-2.0 ^tag-1.0
  *
- * You can think of '^' as a negator. Using this alternate syntax, it is
- * possible to furthur prune commits by specifying multiple negators.
+ * You can think of '^' as a negation operator. Using this alternate syntax,
+ * it is possible to further prune commits by specifying multiple branch
+ * cut offs.
  *
  * BUGS
  * ----