X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Flocale%2Fen-US%2Fmarks.xml;fp=common%2Flocale%2Fen-US%2Fmarks.xml;h=75aaf29a5cc2bed61f3be30bf9c6b783dcae6499;hb=9044153cb63835e39b9de8ec4ade237c03e3888a;hp=b85e93618825b12191d6eddb1e36bd5683dbfa90;hpb=70740024f9c028c1fd63e1a1850ab062ff956054;p=dactyl.git

diff --git a/common/locale/en-US/marks.xml b/common/locale/en-US/marks.xml
index b85e936..75aaf29 100644
--- a/common/locale/en-US/marks.xml
+++ b/common/locale/en-US/marks.xml
@@ -14,7 +14,7 @@
 
 <p>
     &dactyl.appName; supports a number of different methods of
-    marking your place, in order to easily return later,
+    marking your place, in order to easily return later:
 </p>
 
 <ul>
@@ -22,7 +22,6 @@
     <li><em>QuickMarks</em> allow you to quickly save and return to as many as 62 (a-zA-Z0-9) different web sites with a quick keyboard shortcut.</li>
     <li><em>Local marks</em> allow you to store and return to a position within the current web page.</li>
     <li><em>URL marks</em> allow you to store and return to the position and URL of the current web page.</li>
-    <li><em>History</em> marks every opened page with data on when and how often it has been visited.</li>
 </ul>
 
 <h2 tag="bookmarks">Bookmarks</h2>
@@ -53,6 +52,10 @@
                 sites that require query parameters in encodings other than
                 UTF-8 (short name <em>-c</em>).
             </dd>
+            <dt>-id</dt>
+            <dd>
+                The numerical ID of a bookmark to update.
+            </dd>
             <dt>-keyword</dt>
             <dd>
                 A keyword which may be used to open the bookmark via
@@ -89,7 +92,7 @@
         <p>
             If <oa>!</oa> is present, a new bookmark is always
             added. Otherwise, the first bookmark matching
-            <oa>url</oa> is updated.
+            <oa>id</oa>, <oa>keyword</oa>, or <oa>url</oa> is updated.
         </p>
     </description>
 </item>
@@ -171,129 +174,6 @@
     </description>
 </item>
 
-<h2 tag="history">History</h2>
-
-<p>
-    Though not traditionally considered a mark, history behaves very
-    similarly to bookmarks both in &dactyl.host; and
-    &dactyl.appName;. Every visited page is marked and weighted by
-    when and how often it is visited, and can be retrieved both in
-    history list and location completions. Indeed, the ‘frecency’
-    algorithm used to determine the results of location completions
-    (see the <o>complete</o> option) means that history is often a
-    more effective type of mark than bookmarks themselves.
-</p>
-
-<item>
-    <tags><![CDATA[<C-o>]]></tags>
-    <strut/>
-    <spec><![CDATA[[count]<C-o>]]></spec>
-    <description>
-        <p>
-            Go to an older position in the jump list. This currently
-            entails moving backward in page history, but in the
-            future will take into account page positions as well.
-            If <oa>count</oa> is specified go back <oa>count</oa> pages.
-        </p>
-    </description>
-</item>
-
-<item>
-    <tags><![CDATA[<C-i>]]></tags>
-    <strut/>
-    <spec><![CDATA[[count]<C-i>]]></spec>
-    <description>
-        <p>
-            Go to an newer position in the jump list. This currently
-            entails moving forward in page history, but in the
-            future will take into account page positions as well.
-            If <oa>count</oa> is specified go forward <oa>count</oa> pages.
-        </p>
-    </description>
-</item>
-
-<item>
-    <tags><![CDATA[<M-Left> <A-Left> H]]></tags>
-    <strut/>
-    <spec>[count]H</spec>
-    <description>
-        <p>Go back in the browser history. If <oa>count</oa> is specified go back <oa>count</oa> pages.</p>
-    </description>
-</item>
-
-<item>
-    <tags><![CDATA[<M-Right> <A-Right> L]]></tags>
-    <strut/>
-    <spec><oa>count</oa>L</spec>
-    <description>
-        <p>
-            Go forward in the browser history. If <oa>count</oa> is specified go forward <oa>count</oa>
-            pages.
-        </p>
-    </description>
-</item>
-
-<item>
-    <tags>:ba :back</tags>
-    <spec>:<oa>count</oa>ba<oa>ck</oa> <oa>url</oa></spec>
-    <spec>:<oa>count</oa>ba<oa>ck</oa>!</spec>
-    <description>
-        <p>
-            Go back in the browser history. If <oa>count</oa> is specified go back <oa>count</oa> pages.
-        </p>
-        <p>
-            The special version <ex>:back!</ex> goes to the beginning of the browser history.
-        </p>
-    </description>
-</item>
-
-<item>
-    <tags>:fw :fo :forward</tags>
-    <spec>:<oa>count</oa>fo<oa>rward</oa> <oa>url</oa></spec>
-    <spec>:<oa>count</oa>fo<oa>rward</oa>!</spec>
-    <description>
-        <p>
-            Go forward in the browser history. If <oa>count</oa> is specified go forward <oa>count</oa>
-            pages.
-        </p>
-        <p>
-            The special version <ex>:forward!</ex> goes to the end of the browser history.
-        </p>
-    </description>
-</item>
-
-<item>
-    <tags>:hs :hist :history</tags>
-    <spec>:hist<oa>ory</oa><oa>!</oa> <oa>filter</oa></spec>
-    <description>
-        <p>
-            Show recently visited URLs. Opens the message window at the bottom of the screen
-            with all history items whose page titles or URLs match
-            <oa>filter</oa>.
-        </p>
-
-        <p>
-            The special version <ex>:history!</ex> works the same as
-            <ex>:history</ex> except that it opens all matching
-            pages in new tabs rather than listing them.
-        </p>
-
-        <p>The pages may also be filtered via the following options,</p>
-
-        <dl dt="width: 8em;">
-            <dt>-max</dt>
-            <dd>
-                The maximum number of items to list or open
-                (short name <em>-m</em>).
-            </dd>
-            <dt>-sort</dt>
-            <dd>
-                The sort order of the results
-                (short name <em>-s</em>).
-            </dd>
-        </dl>
-    </description>
-</item>
 
 <h2 tag="quickmarks">QuickMarks</h2>