From 8db7f4c1e5ecbeca74bcf5911fc2c2026de229f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= <stepnem@gmail.com>
Date: Thu, 27 Jan 2011 01:40:14 +0100
Subject: [PATCH] Minor documentation fixes.

---
 common/locale/en-US/intro.xml   |  4 +---
 common/locale/en-US/map.xml     |  3 ++-
 common/locale/en-US/options.xml | 32 +++++++++++++++++---------------
 common/modules/services.jsm     |  6 ++++--
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/common/locale/en-US/intro.xml b/common/locale/en-US/intro.xml
index 4c0114f9..09fc4afa 100644
--- a/common/locale/en-US/intro.xml
+++ b/common/locale/en-US/intro.xml
@@ -60,9 +60,7 @@
     Please send comments, questions, or patches to the
     <link topic="&dactyl.list.href;">mailing list</link>,
     where we will do our best to answer any inquiries. You can also
-    check the
-    <link topic="http://code.google.com/p/dactyl/wiki">wiki</link> or
-    <link topic="&dactyl.faq;">FAQ</link>.
+    find more information on the <link topic="&dactyl.home;">homepage</link>.
     Issue reports can be entered in the
     <link topic="&dactyl.issues;">issue tracker</link>.
 </p>
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 2a0bfd21..a6d1dd87 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -46,7 +46,7 @@
 </p>
 
 <p tag=":map-modes">
-    Standard key mapping commands are provided for the four most
+    Standard key mapping commands are provided for the five most
     common modes,
 </p>
 
@@ -65,6 +65,7 @@
     prefixed with one of the above letters. For instance,
     <ex>:imap</ex> creates a new key mapping in insert mode, while
     <ex>:cunmap</ex> removes a key mapping from command-line mode.
+    Other modes can be specified using the -modes option described below.
 </p>
 
 <warning>
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index c11a047a..2fd55ebf 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -443,8 +443,8 @@
 </item>
 
 <item>
-    <tags>'cookieaccept' 'ca'</tags>
-    <spec>'cookieaccept'</spec>
+    <tags>'ca' 'cookieaccept'</tags>
+    <spec>'cookieaccept' 'ca'</spec>
     <type>string</type>
     <default>all</default>
     <description>
@@ -575,7 +575,7 @@
 
 <item>
     <tags>'enc' 'encoding'</tags>
-    <spec>'encoding'</spec>
+    <spec>'encoding' 'enc'</spec>
     <type>string</type>
     <default>UTF-8</default>
     <description>
@@ -602,7 +602,7 @@
 
 <item>
     <tags>'ei' 'eventignore'</tags>
-    <spec>'eventignore'</spec>
+    <spec>'eventignore' 'ei'</spec>
     <type>stringlist</type>
     <default></default>
     <description>
@@ -658,7 +658,7 @@
 
 <item>
     <tags>'fenc' 'fileencoding'</tags>
-    <spec>'fileencoding'</spec>
+    <spec>'fileencoding' 'fenc'</spec>
     <type>string</type>
     <default>UTF-8</default>
     <description>
@@ -671,7 +671,7 @@
 
 <item>
     <tags>'fc' 'findcase'</tags>
-    <spec>'findcase'</spec>
+    <spec>'findcase' 'fc'</spec>
     <type>string</type>
     <default>smart</default>
     <description>
@@ -939,6 +939,7 @@
 </item>
 
 <item>
+    <tags>'nojsd' 'nojsdebugger'</tags>
     <tags>'jsd' 'jsdebugger'</tags>
     <spec>'jsdebugger' 'jsd'</spec>
     <type>boolean</type>
@@ -951,8 +952,8 @@
 </item>
 
 <item>
-    <tags>'nolpl' 'lpl'</tags>
-    <tags>'noloadplugins' 'loadplugins'</tags>
+    <tags>'nolpl' 'noloadplugins'</tags>
+    <tags>'lpl' 'loadplugins'</tags>
     <spec>'loadplugins' 'lpl'</spec>
     <type>regexplist</type>
     <default>'\.(js|&dactyl.fileExt;)$'</default>
@@ -991,7 +992,7 @@
 
 <item>
     <tags>'ml' 'mapleader'</tags>
-    <spec>'mapleader'</spec>
+    <spec>'mapleader' 'ml'</spec>
     <type>string</type>
     <default>\</default>
     <description>
@@ -1247,8 +1248,8 @@
 </item>
 
 <item>
-    <tags>'sanitizeshutdown' 'ss'</tags>
-    <spec>'sanitizeshutdown'</spec>
+    <tags>'ss' 'sanitizeshutdown'</tags>
+    <spec>'sanitizeshutdown' 'ss'</spec>
     <type>stringlist</type>
     <default/>
     <description>
@@ -1296,7 +1297,7 @@
 </item>
 
 <item>
-    <tags>'shell' 'sh'</tags>
+    <tags>'sh' 'shell'</tags>
     <spec>'shell' 'sh'</spec>
     <type>string</type>
     <default type="plain"><em>$SHELL</em> or <str>sh</str>, Windows: <str>cmd.exe</str></default>
@@ -1306,7 +1307,7 @@
 </item>
 
 <item>
-    <tags>'shellcmdflag' 'shcf'</tags>
+    <tags>'shcf' 'shellcmdflag'</tags>
     <spec>'shellcmdflag' 'shcf'</spec>
     <strut/>
     <type>string</type>
@@ -1392,6 +1393,7 @@
 </item>
 
 <item>
+    <tags>'notmo' 'notimeout'</tags>
     <tags>'tmo' 'timeout'</tags>
     <spec>'timeout' 'tmo'</spec>
     <type>boolean</type>
@@ -1435,7 +1437,7 @@
 
 <item>
     <tags>'us' 'urlsep' 'urlseparator'</tags>
-    <spec>'urlseparator'</spec>
+    <spec>'urlseparator' 'urlsep' 'us'</spec>
     <type>string</type>
     <default>\|</default>
     <description>
@@ -1533,7 +1535,7 @@
 </item>
 
 <item>
-    <tags>'wildignore' 'wig'</tags>
+    <tags>'wig' 'wildignore'</tags>
     <spec>'wildignore' 'wig'</spec>
     <type>regexplist</type>
     <default></default>
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index 48629933..6c38529b 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -124,7 +124,7 @@ var Services = Module("Services", {
      * @param {string} class The class's contract ID.
      * @param {nsISupports|nsISupports[]} ifaces The interface or array of
      *     interfaces implemented by this service.
-     * @param {string} meth The name of the function used to instanciate
+     * @param {string} meth The name of the function used to instantiate
      *     the service.
      */
     add: function (name, class_, ifaces, meth) {
@@ -138,9 +138,11 @@ var Services = Module("Services", {
      * Adds a new XPCOM class to the cache.
      *
      * @param {string} name The class's cache key.
-     * @param {string} class The class's contract ID.
+     * @param {string} class_ The class's contract ID.
      * @param {nsISupports|nsISupports[]} ifaces The interface or array of
      *     interfaces implemented by this class.
+     * @param {string} init Name of a property or method used to initialise the
+     *     class. See {@link #_create}.
      */
     addClass: function (name, class_, ifaces, init) {
         const self = this;