Help formatting fixes.

--HG--
branch : xslt

common/content/help.xsl

@@ -88,7 +88,7 @@
     <xsl:template name="linkify-tag">
         <xsl:param name="contents"/>
         <xsl:variable name="tag" select="str:tokenize($contents, ' [')[1]"/>
-        <html:a href="liberator://help-tag/{$tag}" style="color: inherit">
+        <html:a href="liberator://help-tag/{$tag}" style="color: inherit;">
             <xsl:if test="
                 //liberator:tags[contains(concat(' ', ., ' '), concat(' ', $tag, ' '))] |
                 //liberator:tag[contains(concat(' ', ., ' '), concat(' ', $tag, ' '))] |
@@ -105,7 +105,7 @@
             </xsl:call-template>
         </xsl:copy>
     </xsl:template>
-    <xsl:template match="liberator:k">
+    <xsl:template match="liberator:k|liberator:t">
         <xsl:copy>
             <xsl:call-template name="linkify-tag">
                 <xsl:with-param name="contents" select="text()"/>
@@ -127,6 +127,10 @@
         </xsl:copy>
     </xsl:template>
 
+    <xsl:template match="liberator:link">
+        <html:a href="{@topic}"><xsl:apply-templates select="@*|node()"/></html:a>
+    </xsl:template>
+
     <xsl:template match="liberator:tag|@tag">
         <xsl:call-template name="parse-tags">
             <xsl:with-param name="text"><xsl:value-of select="."/></xsl:with-param>

common/content/liberator.js

@@ -215,7 +215,7 @@ const liberator = (function () //{{{
 
         options.add(["helpfile", "hf"],
             "Name of the main help file",
-            "string", "intro.html");
+            "string", "intro");
 
         options.add(["loadplugins", "lpl"],
             "Load plugin scripts when starting up",

common/content/style.js

@@ -184,6 +184,7 @@ Highlights.prototype.CSS = <![CDATA[
 
     HelpTag,liberator|tag                       display: inline-block; color: #527BBD; margin-left: 1ex; font-size: 8pt; font-weight: bold;
     HelpTags,liberator|tags                     display: block; float: right; clear: right;
+    HelpTopic,liberator|t                       color: #102663;
     HelpType,liberator|type                     display: block; float: left; margin-right: 1ex; margin-bottom: 1em;
 
     HelpWarning,liberator|warning               display: block; margin: 1em 0em;

vimperator/locale/en-US/all.xml

@@ -8,7 +8,7 @@
     title="&appname; All"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
-<tags>all</tags> +
+<tags>all</tags>
 
 <!-- TODO: this should be generated by the Makefile in the same order as
      config.helpFiles -->

vimperator/locale/en-US/autocommands.xml

@@ -103,13 +103,13 @@
 </item>
 <h2 tag="autocmd-examples">Examples</h2>
 
-<p>Enable _passthrough_ mode on all Google sites:</p>
+<p>Enable <em>passthrough</em> mode on all Google sites:</p>
 
 <p>
      <ex>:autocmd LocationChange .* js modes.passAllKeys = /google\.com/.test(buffer.URL)</ex>
 </p>
 
-<p>Enable _passthrough_ mode on *some* Google sites:</p>
+<p>Enable <em>passthrough</em> mode on *some* Google sites:</p>
 
 <p>
      <ex>:autocmd LocationChange .* js modes.passAllKeys = /(www|mail)\.google\.com/.test(buffer.URL)</ex>
@@ -124,7 +124,7 @@
 </p>
 
 <p>
-    <ex>:autocmd LocationChange mail\.google\.com :set editor=<str>gvim -f -c 'set ft=mail'</str></ex>
+    <ex>:autocmd LocationChange mail\\.google\\.com :set editor=<str>gvim -f -c 'set ft=mail'</str></ex>
 </p>
 
 </document>

vimperator/locale/en-US/buffer.xml

@@ -157,7 +157,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an
     <description>
         <p>
             Scroll document to the left. If <oa>count</oa> is specified then move <oa>count</oa> times as
-            much to the left. +
+            much to the left.
+        </p>
+        <p>
             If the document cannot scroll more, a beep is emitted (unless <o>visualbell</o> is
             set).
         </p>
@@ -171,7 +173,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an
     <description>
         <p>
             Scroll document down. If <oa>count</oa> is specified then move <oa>count</oa> times as much
-            down. +
+            down.
+        </p>
+        <p>
             If the document cannot scroll more, a beep is emitted (unless <o>visualbell</o> is
             set).
         </p>
@@ -184,7 +188,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an
     <spec><oa>count</oa>k</spec>
     <description>
         <p>
-            Scroll document up. If <oa>count</oa> is specified then move <oa>count</oa> times as much up. +
+            Scroll document up. If <oa>count</oa> is specified then move <oa>count</oa> times as much up.
+        </p>
+        <p>
             If the document cannot scroll more, a beep is emitted (unless <o>visualbell</o> is
             set).
         </p>
@@ -198,7 +204,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an
     <description>
         <p>
             Scroll document to the right. If <oa>count</oa> is specified then move <oa>count</oa> times
-            as much to the right. +
+            as much to the right.
+        </p>
+        <p>
             If the document cannot scroll more, a beep is emitted (unless <o>visualbell</o> is
             set).
         </p>
@@ -348,10 +356,10 @@ default zoom levels are 30%, 50%, 67%, 80%, 90%, 100%, 110%, 120%, 133%, 150%,
 170%, 200%, 240%, 300%.
 
 The available zoom range can be changed by setting the
-<html:a href="http://kb.mozillazine.org/Zoom.minPercent">'zoom.minPercent'</html:a> and
+<link topic="http://kb.mozillazine.org/Zoom.minPercent">'zoom.minPercent'</link> and
-<html:a href="http://kb.mozillazine.org/Zoom.maxPercent">'zoom.maxPercent'</html:a> Firefox
+<link topic="http://kb.mozillazine.org/Zoom.maxPercent">'zoom.maxPercent'</link> Firefox
 preferences. The zoom levels can be changed using the
-<html:a href="http://kb.mozillazine.org/Toolkit.zoomManager.zoomValues">'toolkit.ZoomManager.zoomLevels'</html:a>
+<link topic="http://kb.mozillazine.org/Toolkit.zoomManager.zoomValues">'toolkit.ZoomManager.zoomLevels'</link>
 preference.
 
 <note>

vimperator/locale/en-US/intro.xml

@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
+
+<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+
 <document
+    name="intro"
+    title="&appname; Introduction"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 
 <logo/>
 
-<html:div>
+<html:p style="text-align: center; font-weight: bold;">
-<p style="text-align: center; font-weight: bold;">
 First there was a Navigator, then there was an Explorer.
 Later it was time for a Konqueror. Now it's time for an Imperator, the
 VIMperator :)
-</html:div>
+</html:p>
 
 <h1 tag="intro">Introduction</h1>
 
-<link href="http://vimperator.org">&appname;</link> is a free browser add-on for &hostapp;,
+<link topic="http://vimperator.org">&appname;</link> is a free browser add-on for &hostapp;,
 which makes it look and behave like the
-<link href="http://www.vim.org">Vim</link>
+<link topic="http://www.vim.org">Vim</link>
 text editor. It has similar key bindings, and you could call it a modal
 web browser, as key bindings differ according to which mode you are in.
 
 <warning tag="warning">
     To provide the most authentic Vim experience, the &hostapp; menubar and toolbar are hidden.
 </warning>
-<p>If you really need them, type: [c]:set guioptions+=mT[c] to get them back.</p>
+
+<p>If you really need them, type: <ex>:set guioptions+=mT</ex> to get them back.</p>
 <p>
     If you don't like &appname; at all, you can uninstall it by typing
     <ex>:extdelete &appname;</ex> or <ex>:extdisable &appname;</ex> to disable it.
@@ -36,20 +42,20 @@ web browser, as key bindings differ according to which mode you are in.
 <tags>author donaton sponsor</tags>
 <p>
     &appname; was initially written by 
-    <link href="mailto:stubenschrott@vimperator.org">Martin
+    <link topic="mailto:stubenschrott@vimperator.org">Martin
     Stubenschrott</link> but has found many other
-    <link href="http://vimperator.org/trac/wiki/&appname;/Authors">contributors</link>
+    <link topic="http://vimperator.org/trac/wiki/&appname;/Authors">contributors</link>
     in the meanwhile. If you appreciate the work on &appname; and want to
     encourage us working on it more, you can send us greetings, patches, or
     donations (thanks a lot to
-    <link href="http://vimperator.org/trac/wiki/&appname;/Donors">these
+    <link topic="http://vimperator.org/trac/wiki/&appname;/Donors">these
         people</link>
     who already did):
 </p>
 
 <html:form style="text-align: center;" action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal">
 <input type="hidden" name="cmd" value="_s-xclick"/>
-<input type="image" src="chrome://liberator/content/x-click-but21.gif" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"/>
+<input type="image" src="chrome://liberator/content/x-click-but21.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/>
 </fieldset>
 </html:form>
@@ -57,55 +63,54 @@ web browser, as key bindings differ according to which mode you are in.
 <p>
     If you prefer getting some nice products for your money, you can also support
     us by buying some cool 
-    <link href="http://www.zazzle.com/maxauthority*">merchandise</link> like
+    <link topic="http://www.zazzle.com/maxauthority*">merchandise</link> like
     t-shirts or mugs. Of course, as we believe in free, open source software, only
     support us financially if you really like &appname; and the money doesn't hurt
     — otherwise just use it, recommend it, and like it :)
 </p>
 
-section::Help{nbsp}topics[overview]
 <h2 tag="overview">Help topics</h2>
 
 <ol>
     <li>
-        <link topic="tutorial.html">Quick-start tutorial</link>:
+        <link topic="tutorial">Quick-start tutorial</link>:
         A quick-start tutorial for new users.
     </li>
     <li>
-        <link topic="starting.html">Starting &appname;</link>:
+        <link topic="starting">Starting &appname;</link>:
         How &appname; starts up, where it reads the config file…
     </li>
     <li>
-        <link topic="browsing.html">Browsing</link>:
+        <link topic="browsing">Browsing</link>:
         Basic mappings and commands needed for a browsing session (how to open
         a web page or go back in history).
     </li>
     <li>
-        <link topic="buffer.html">Buffer</link>:
+        <link topic="buffer">Buffer</link>:
         Operations on the current document like scrolling or copying text.
     </li>
     <li>
-        <link topic="cmdline.html">Command-line mode</link>:
+        <link topic="cmdline">Command-line mode</link>:
         Command-line editing.
     </li>
     <li>
-        <link topic="insert.html">Insert mode</link>:
+        <link topic="insert">Insert mode</link>:
         Insert-mode editing.
     </li>
     <li>
-        <link topic="options.html">Options</link>:
+        <link topic="options">Options</link>:
         A description of all options.
     </li>
     <li>
-        <link topic="pattern.html">Text search commands</link>:
+        <link topic="pattern">Text search commands</link>:
         Searching for text in the current buffer.
     </li>
     <li>
-        <link topic="tabs.html">Tabs</link>:
+        <link topic="tabs">Tabs</link>:
         Managing your tabbed browsing session.
     </li>
     <li>
-        <link topic="hints.html">Hints</link>:
+        <link topic="hints">Hints</link>:
         Selecting hyperlinks and other page elements.
     </li>
     <li>
@@ -113,47 +118,47 @@ section::Help{nbsp}topics[overview]
         Defining new key mappings, abbreviations and user commands.
     </li>
     <li>
-        <link topic="eval.html">Expression evaluation</link>:
+        <link topic="eval">Expression evaluation</link>:
         Executing JavaScript.
     </li>
     <li>
-        <link topic="marks.html">Marks</link>:
+        <link topic="marks">Marks</link>:
         Using bookmarks, QuickMarks, history and local marks.
     </li>
     <li>
-        <link topic="repeat.html">Repeating commands</link>:
+        <link topic="repeat">Repeating commands</link>:
         Using macros to repeat recurring workflows.
     </li>
     <li>
-        <link topic="autocommands.html">Automatic commands</link>:
+        <link topic="autocommands">Automatic commands</link>:
         Automatically executing code on certain events.
     </li>
     <li>
-        <link topic="print.html">Printing</link>:
+        <link topic="print">Printing</link>:
         Printing pages.
     </li>
     <li>
-        <link topic="gui.html">&appname;'s GUI</link>:
+        <link topic="gui">&appname;'s GUI</link>:
         Accessing &hostapp; menus, dialogs and the sidebar.
     </li>
     <li>
-        <link topic="styling.html">Styling the GUI and web pages</link>:
+        <link topic="styling">Styling the GUI and web pages</link>:
         Changing the styling of content pages and &appname; itself.
     </li>
     <li>
-        <link topic="message.html">Error and informational messages</link>:
+        <link topic="message">Error and informational messages</link>:
         A description of messages and error messages.
     </li>
     <li>
-        <link topic="developer.html">Developer information</link>:
+        <link topic="developer">Developer information</link>:
         How to write docs or plugins.
     </li>
     <li>
-        <link topic="various.html">Various commands</link>:
+        <link topic="various">Various commands</link>:
         Other help which didn't fit into any other category.
     </li>
     <li>
-        <link topic="index.html">Index</link>:
+        <link topic="index">Index</link>:
         An index of all commands and options.
     </li>
 </ol>
@@ -166,19 +171,19 @@ or <ex>:help :set</ex>.
 <h2 tag="features">Features</h2>
 
 <ul>
-    <li>Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m], [m]gg[m], [m]G[m], [m]0[m], [m]$[m], [m]ZZ[m], [m]<C-f>[m], etc.)</li>
+    <li>Vim-like keybindings (<k>h</k>, <k>j</k>, <k>k</k>, <k>l</k>, <k>gg</k>, <k>G</k>, <k>0</k>, <k>$</k>, <k>ZZ</k>, <k name="C-f"/>, etc.)</li>
     <li>Ex commands (<ex>:quit</ex>, <ex>:open www.foo.com</ex>, …)</li>
     <li>Tab completion available for all commands with support for "longest" matching when set in 'wildmode'</li>
-    <li>Hit-a-hint like navigation of links (start with [m]f[m] to follow a link)</li>
+    <li>Hit-a-hint like navigation of links (start with <k>f</k> to follow a link)</li>
     <li>Advanced completion of bookmark and history URLs (searching also in title, not only URL)</li>
     <li>Vim-like statusline with a Wget-like progress bar</li>
     <li>Minimal GUI (easily hide useless menubar and toolbar with <ex>:set guioptions=</ex>)</li>
-    <li>Ability to <ex>:source</ex> JavaScript files, and to use a [a]~/.vimperatorrc[a] file with syntax highlighting if you install http://vimperator.org/trac/ticket/26[vimperator.vim]</li>
+    <li>Ability to <ex>:source</ex> JavaScript files, and to use a <em>~/.vimperatorrc</em> file with syntax highlighting if you install vimperator.vim</li>
     <li>Easy quick searches (<ex>:open foo</ex> will search for "foo" in google, <ex>:open ebay terminator</ex> will search for "terminator" on ebay) with support for &hostapp; keyword bookmarks and search engines</li>
-    <li>Count supported for many commands ([m]3<C-o>[m] will go back 3 pages)</li>
+    <li>Count supported for many commands (<em>3</em><k name="C-o"/> will go back 3 pages)</li>
     <li>Beep on errors</li>
-    <li>Marks support ([m]m[m][a]a[a] to set mark a on a web page, [m]'[m][a]a[a] to go there)</li>
+    <li>Marks support (<k>m</k><em>a</em> to set mark a on a web page, <k>'</k><em>a</em> to go there)</li>
-    <li>QuickMarks support (quickly go to previously marked web pages with [m]go[m][a]{a-zA-Z0-9}[a])</li>
+    <li>QuickMarks support (quickly go to previously marked web pages with <k>go</k><a>a-zA-Z0-9</a>)</li>
     <li><ex>:map</ex> and <ex>:command</ex> support (and feedkeys() for script writers)</li>
     <li><ex>:time</ex> support for profiling</li>
     <li>Move the text cursor and select text with Vim keys and a Visual mode</li>
@@ -193,10 +198,10 @@ or <ex>:help :set</ex>.
 <p>
     Please send comments/bug reports/patches to the mailing list, where we will
     properly answer any questions. You can also join the
-    <link href="irc://irc.freenode.net/vimperator">#vimperator</a> IRC channel
+    <link topic="irc://irc.freenode.net/vimperator">#vimperator</link> IRC channel
-    on <link href="http://www.freenode.net/">Freenode</link> or check the
+    on <link target="http://www.freenode.net/">Freenode</link> or check the
-    <link href="http://vimperator.org/trac/wiki/&appname;/Wiki">Wiki</link> for
+    <link topic="http://vimperator.org/trac/wiki/&appname;/Wiki">Wiki</link> for
-    <link href="http://vimperator.org/trac/wiki/&appname;/FAQ">
+    <link topic="http://vimperator.org/trac/wiki/&appname;/FAQ">
         frequently asked questions (FAQ)
     </link>. Make sure, you have read the TODO file first, as we are aware of many
     things which can be improved when we find time for it or receive patches.

vimperator/locale/en-US/map.xml

@@ -14,7 +14,7 @@
 
 <p>
     The key mapping commands can be used to either redefine the standard key
-    bindings or define new ones. A mapping consists of a key, or [j]key-sequence[j],
+    bindings or define new ones. A mapping consists of a key, or <t>key-sequence</t>,
     which is translated to a string of characters. Example:
 </p>
 <code><ex>:map <k name="F2"/> :echo new Date().toDateString()<k name="CR"/></ex></code>
@@ -55,7 +55,7 @@
     <spec>:cm<oa>ap</oa> <a>lhs</a> <a>rhs</a></spec>
     <description>
         <p>
-            Map the [j]key-sequence[j] <a>lhs</a> to <a>rhs</a> for the applicable mode(s). The <a>rhs</a> is
+            Map the <t>key-sequence</t> <a>lhs</a> to <a>rhs</a> for the applicable mode(s). The <a>rhs</a> is
             remapped, allowing for nested and recursive mappings.
         </p>
     </description>
@@ -75,7 +75,7 @@
     <spec>:cno<oa>remap</oa> <a>lhs</a> <a>rhs</a></spec>
     <description>
         <p>
-            Map the [j]key-sequence[j] <a>lhs</a> to <a>rhs</a> for the applicable mode(s). No remapping of
+            Map the <t>key-sequence</t> <a>lhs</a> to <a>rhs</a> for the applicable mode(s). No remapping of
             the <a>rhs</a> is performed.
         </p>
     </description>

vimperator/locale/en-US/marks.xml

@@ -59,8 +59,8 @@
         <p>
             Toggle bookmarked state of current URL. Add/remove a bookmark for the current
             location, depending on if it is already bookmarked or not. In contrast to the
-            <ex>:bmark</ex> command, the bookmark is just _starred_ which means it is placed
+            <ex>:bmark</ex> command, the bookmark is just <em>starred</em> which means it is placed
-            in the _Unfiled Bookmarks Folder_ instead of the bookmarks menu.
+            in the <em>Unfiled Bookmarks Folder</em> instead of the bookmarks menu.
         </p>
     </description>
 </item>

vimperator/locale/en-US/message.xml

@@ -74,7 +74,7 @@
     <dt/><dd/>
     <dt>q, <k name="Esc"/> or CTRL-C             </dt><dd>stop the listing</dd>
     <dt>:                                        </dt><dd>stop the listing and enter a command-line</dd>
-    <dt>;                                        </dt><dd>start an [j]extended-hints[j] command</dd>
+    <dt>;                                        </dt><dd>start an <t>extended-hints</t> command</dd>
     <dt><k name="C-Y"/>                          </dt><dd>yank (copy) a modeless selection to the clipboard</dd>
 </dl>
 

vimperator/locale/en-US/options.xml

@@ -84,8 +84,8 @@
         <code><ex>:set opt=foo,bar</ex></code>
         <p>then,</p>
         <code><ex>:set opt!=foo,baz</ex></code>
-        <p>results in</p>
+        <p>has the same result as</p>
-        <code>opt=bar,baz</code>
+        <code><ex>:set opt=bar,baz</ex></code>
     </description>
 </item>
 
@@ -206,8 +206,8 @@
 
 <p>
     Environment variables are expanded for path options like <o>cdpath</o> and
-    <o>runtimepath</o>. The variable notation is _$VAR_ (terminated by a non-word
+    <o>runtimepath</o>. The variable notation is <em>$VAR</em> (terminated by a non-word
-    character) or _$\\<a>VAR</a>_. _%VAR%_ is also supported on Windows.
+    character) or <em>$<a>VAR</a></em>. <em>%VAR%</em> is also supported on Windows.
 </p>
 
 <h2 tag="firefox-options preferences">Setting &hostapp; options</h2>
@@ -261,9 +261,9 @@
 <p>The following preferences are set:</p>
 
 <ul>
-    <li><link href="http://kb.mozillazine.org/Dom.popup_allowed_events">dom.popup_allowed_events</link></li>
+    <li><link target="http://kb.mozillazine.org/Dom.popup_allowed_events">dom.popup_allowed_events</link></li>
-    <li><link href="http://kb.mozillazine.org/Accessibility.typeaheadfind.autostart">accessibility.typeaheadfind.autostart</link></li>
+    <li><link target="http://kb.mozillazine.org/Accessibility.typeaheadfind.autostart">accessibility.typeaheadfind.autostart</link></li>
-    <li><link href="http://kb.mozillazine.org/Accessibility.typeaheadfind">accessibility.typeaheadfind</link></li>
+    <li><link target="http://kb.mozillazine.org/Accessibility.typeaheadfind">accessibility.typeaheadfind</link></li>
 </ul>
 
 <!-- TODO: others? -->
@@ -294,7 +294,7 @@
     <tags>'cd' 'cdpath'</tags>
     <spec>'cdpath' 'cd'</spec>
     <type>string</type>
-    <default>equivalent to _$CDPATH_ or ",,"</default>
+    <default type="plain">equivalent to <em>$CDPATH</em> or <str>,,</str></default>
     <description>
         <p>
             List of directories searched when executing the <ex>:cd</ex>
@@ -549,7 +549,7 @@
     <tags>'hf' 'helpfile'</tags>
     <spec>'helpfile' 'hf'</spec>
     <type>string</type>
-    <default>intro.html</default>
+    <default>intro</default>
     <description>
         <p>
             Name of the main help file. This is the tail component of the chrome
@@ -963,7 +963,7 @@
         </p>
 
         <p>
-            On startup, if the environment variable _$VIMPERATOR_RUNTIME_ does not
+            On startup, if the environment variable <em>$VIMPERATOR_RUNTIME</em> does not
             exist, &appname; will set it to match this value.
         </p>
     </description>
@@ -1272,7 +1272,7 @@
         <p>
             List of file patterns to ignore when completing files. E.g., to ignore object
             files and Vim swap files 
-            <ex>:set wildignore=<str>.<em>\.o,\..</em>\.s[a-z]\\<a>2</a></str></ex>
+            <ex>:set wildignore=<str>.<em>\\.o,\\..</em>\\.s[a-z]\\<a>2</a></str></ex>
         </p>
 
         <note>Unlike Vim each pattern is a regex rather than a glob.</note>

vimperator/locale/en-US/starting.xml

@@ -24,7 +24,7 @@
     <description>
         <p>
             Execute a single Ex command after all initialization has been performed. See
-            [j]initialization[j].
+            <t>initialization</t>.
         </p>
         
         <p>This option can be specified multiple times.</p>
@@ -38,7 +38,7 @@
     <description>
         <p>
             Execute a single Ex command before any initialization has been performed. See
-            [j]initialization[j].
+            <t>initialization</t>.
         </p>
         
         <p>This option can be specified multiple times.</p>
@@ -53,7 +53,7 @@
         <p>
             The file <a>rcfile</a> is used for user initialization commands. If <a>rcfile</a> is
             "NORC" then no startup initialization is performed except for the loading of
-            plugins, i.e., steps 1. and 2. in [j]initialization[j] are skipped. If <a>rcfile</a>
+            plugins, i.e., steps 1. and 2. in <t>initialization</t> are skipped. If <a>rcfile</a>
             is "NONE" then plugin loading is also skipped.
         </p>
     </description>

vimperator/locale/en-US/tabs.xml

@@ -96,7 +96,7 @@
 
 
 <!-- TODO: should the tab commands be moved back here? -->
-See [j]opening[j] for other ways to open new tabs.
+See <t>opening</t> for other ways to open new tabs.
 
 <h2 tag="changing-tabs">Changing tabs</h2>
 
@@ -219,7 +219,7 @@ See [j]opening[j] for other ways to open new tabs.
             shortcut to open this prompt.
         </p>
         
-        <p>If argument is [a]#[a], the alternate buffer will be selected (see <k name="C-^"/>).</p>
+        <p>If argument is <em>#</em>, the alternate buffer will be selected (see <k name="C-^"/>).</p>
         
         <p>If no argument is given the current buffer remains current.</p>
     </description>

vimperator/locale/en-US/tutorial.xml

@@ -22,7 +22,7 @@
     If you've started using &appname; from scratch (i.e., without any
     customization), you should be looking at this help page in a relatively
     bare-looking window. The menubar, navigation bar, and bookmark bars are hidden.
-    In case you missed the notice in the help:Introduction[intro.html], you can
+    In case you missed the notice in the <t>intro</t>, you can
     regain these by issuing the command
 </p>
 
@@ -37,7 +37,7 @@
     However, in this author's opinion, the best way to get familiar with
     &appname; is to leave these disabled for now. (The above action can be
     reversed with <ex>:set go=<key name="CR"/></ex>) You can look at the entry for <o>guioptions</o> in
-    help:options[options.html] for more information on this.
+    <t>options</t> for more information on this.
 </p>
 
 <h2 tag="modal">&appname;'s modal interface</h2>
@@ -45,8 +45,8 @@
 <p>
     &appname;'s power, like Vim's, comes from it's modal interface. Keys have
     different meanings depending on which mode the browser is in. &appname; has
-    several modes, but the 2 most important are ``Normal'' mode and
+    several modes, but the 2 most important are <em>Normal</em> mode and
-    ``Command-line'' mode.
+    <em>Command-line</em> mode.
 </p>
 
 <p>
@@ -56,8 +56,8 @@
 
 <p>
     The other core mode of &appname;, Command-line mode, can be entered from
-    Normal mode by typing a \'<k>:</k>' (colon). You will frequently see &appname;
+    Normal mode by typing a <k>:</k> (colon). You will frequently see &appname;
-    commands start with a \'<k>:</k>', indicating that what follows is a command.
+    commands start with a <k>:</k>, indicating that what follows is a command.
 </p>
 
 <p>
@@ -145,7 +145,7 @@
 <h2 tag="history-navigation tab-navigation">History and tabs</h2>
 
 <p>
-    History navigation (e.g., ``Back'', ``Forward'') are done similarly to
+    History navigation (e.g., <em>Back</em>, <em>Forward</em>) are done similarly to
     scrolling.
 </p>
 
@@ -194,12 +194,12 @@
 
 <p>
     So now you can navigate around in &appname;. But wait… how do you <em>open</em> a
-    page or tab linked in a web page? How do you ``click'' on all those links
+    page or tab linked in a web page? How do you <em>click</em> on all those links
     without your tailed friend?
 </p>
 
 <p>
-    The answer is ``hints''. Activating hints displays a number next to every link
+    The answer is <em>hints</em>. Activating hints displays a number next to every link
     &appname; can find. To follow the link, simply type the number corresponding
     to the hint, a white number inside a red square by default.
 </p>
@@ -218,18 +218,18 @@
 </p>
 
 <p>
-    The most common hint mode is called help:QuickHint mode[various.html,f].
+    The most common hint mode is called <t>quick-hints</t>.
     To activate QuickHint mode, press either <k>f</k> or <k>F</k>. The lower-case
     <k>f</k> will open the resulting link in the current tab, while the upper-case
     <k>F</k> will open it in a new tab.
 </p>
 
 <p>
-    To test it, try this link: http://vimperator.org/[&appname; Homepage].
+    To test it, try this link: <link target="http://vimperator.org/">&appname; Homepage</link>.
     Activate QuickHint mode with <k>f</k> or <k>F</k> to highlight all currently
     visible links. Then start typing the text of the link. The link should be
     uniquely identified soon, and &appname; will open it. Once you're done,
-    remember to use <k name="C-o"/> (``History Back'') or <k>d</k> (``Delete Buffer'')
+    remember to use <k name="C-o"/> (<em>History Back</em>) or <k>d</k> (<em>Delete Buffer</em>)
     to return here, depending on which key you used to activate QuickHint mode.
 </p>
 
@@ -248,7 +248,7 @@
     following:
 </p>
 
-<code><k name="Esc">Esc</k></code>
+<code><k name="Esc"/></code>
 
 <h2 tag="vimperatorrc">Saving for posterity - vimperatorrc</h2>
 
@@ -320,7 +320,7 @@
     remember to use the <k>gt</k>/<k>gT</k> mappings to get back to this page. If
     using the <ex>:open</ex> command, use the history keys (e.g., <k>H</k>) to return.
     If you get hopelessly lost, just type <ex>:help<key name="CR"/></ex> and click the
-    ``Tutorial'' link to return.
+    <em>Tutorial</em> link to return.
 </p>
 
 
@@ -352,9 +352,9 @@
     &appname; has an energetic and growing user base. If you've run into a problem
     that you can't seem to solve with &appname;, or if you think you might have
     found a bug, please let us know! There is support available on the
-    http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-vimperator[wiki],
+    <link target="http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-vimperator">wiki</link>
-    or in the <html:a href="irc://irc.freenode.net/vimperator">#vimperator</html:a> IRC
+    or in the <link target="irc://irc.freenode.net/vimperator">#vimperator</link> IRC
-    channel on http://freenode.net/[freenode].
+    channel on <link target="http://freenode.net/">freenode</link>.
 </p>
 
 <p>
@@ -362,7 +362,7 @@
     hear from you as well. Developers work on &appname; whenever possible, but we
     are neither infinite nor omnipotent; please bear with us. If you can't wait for
     us to get around to it, rest assured patches are welcome! See the
-    help:Developer[developer.html] page for more information.
+    <t>developer</t> page for more information.
 </p>
 
 </document>