Fix help file validation errors.

common/Makefile.doc

@@ -2,17 +2,17 @@
 
 #### configuration
 
-ASCIIDOC      = asciidoc
-AWK           = awk
+ASCIIDOC  = asciidoc
+AWK       = awk
 
-LOCALE   = $(shell basename `pwd`)
-DOCLANG  = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z][a-z]$$/) ? $$1 : "en" }')
+LOCALE    = $(shell basename `pwd`)
+DOCLANG   = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z][a-z]$$/) ? $$1 : "en" }')
 
 SRC_FILES = $(wildcard *.txt)
 FILES     = $(SRC_FILES:%.txt=%.html)
-DEPS      = $(wildcard asciidoc.conf lang-$(DOCLANG).conf)
+DEPS      = $(wildcard lang-$(DOCLANG).conf) ${BASE}/asciidoc.conf $(BASE)/Makefile.doc
 
-DOC_FILES     = $(FILES) version.html
+DOC_FILES = $(FILES) version.html
 
 .SILENT:
 
@@ -50,7 +50,9 @@ check-asciidoc:
 	@$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.4\./ }' || \
 		echo >&2 "Warning: asciidoc versions other than 8.4.x are unsupported"
 
-version.html: ../../NEWS $(BASE)/Makefile.doc $(DEPS)
+all.html: $(SRC_FILES)
+
+version.html: ../../NEWS $(DEPS)
 	@echo "DOC locale/$(LOCALE)/$@"
 	# NOTE: asciidoc doesn't source the conf file implicitly when processing stdin
 	sed -e '1i\
@@ -60,7 +62,7 @@ heading:Version{nbsp}information[version-information]' \
 /' ../../NEWS | \
 		${ASCIIDOC} -f $(BASE)/asciidoc.conf -a doctitle=version.html -o version.html -
 
-$(FILES): %.html: %.txt $(BASE)/Makefile.doc $(DEPS)
+$(FILES): %.html: %.txt $(DEPS)
 	@echo "DOC locale/$(LOCALE)/$@"
 	$(ASCIIDOC) -f $(BASE)/asciidoc.conf -a configname=$(NAME) --unsafe -a linkcss -a quirks! -a lang=$(DOCLANG) -a doctitle="$$(basename $@)" -o $@ $<
 

vimperator/locale/en-US/autocommands.txt

@@ -91,6 +91,6 @@ Enable _passthrough_ mode on *some* Google sites:
 Set the filetype to mail when editing email at Gmail:
 
 \{nbsp}[c]:autocmd LocationChange .* :set editor=gvim\ -f[c] +
-\{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c 'set ft=mail'"[c]
+\{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c $$'set ft=mail'$$"[c]
 
 // vim: set filetype=asciidoc:

vimperator/locale/en-US/buffer.txt

@@ -23,7 +23,7 @@ ________________________________________________________________________________
 |:pa| |:pageinfo| +
 ||:pa[geinfo]||
 ________________________________________________________________________________
-Show various page information. See [c]:help 'pageinfo'[c] for available options.
+Show various page information. See [c]:help $$'pageinfo'$$[c] for available options.
 ________________________________________________________________________________
 
 

vimperator/locale/en-US/developer.txt

@@ -30,8 +30,8 @@ is displayed as:
 class="hiddentag">:help</span> <span class="hiddentag">:h</span> <span
 class="hiddentag">help</span>
 
-<div class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></div><br />
-<div class="key">&lt;F1&gt;</div></p>
+<span class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></span><br />
+<span class="key">&lt;F1&gt;</span></p>
 <div class="quoteblock">
 <div class="quoteblock-content">
 <p>Open help window.

vimperator/locale/en-US/intro.txt

@@ -1,10 +1,12 @@
 logo:[]
 
-+++<div style="text-align: center;">+++
-*First there was a Navigator, then there was an Explorer.
+++++++
+<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 :)*
-+++</div>+++
+VIMperator :)
+</p>
+++++++
 
 heading::Introduction[intro]
 

vimperator/locale/en-US/map.txt

@@ -129,7 +129,8 @@ Below is an overview of which modes each map command applies to:
 :imap  :inoremap  :iunmap  :imapclear - Insert mode
 :cmap  :cnoremap  :cunmap  :cmapclear - Command-line mode
 
-subsection::Key{nbsp}sequences[:<>,key-sequence]
+// |<>| breaks doc validation
+subsection::Key{nbsp}sequences[key-notation,key-sequence]
 
 For most keys, the key-sequence is the same as the character you see when you
 type that key, however there are some exceptions which allow for a much larger

vimperator/locale/en-US/tutorial.txt

@@ -2,10 +2,12 @@
 
 heading::Quick-start{nbsp}tutorial[tutorial]
 
-+++<div style="text-align: center;">+++
-*This is a quickstart tutorial to help get new users up and running in
-Vimperator. It is not intended as a full reference explaining all features.*
-+++</div>+++
+++++++
+<p style="text-align: center; font-weight: bold;">
+This is a quickstart tutorial to help get new users up and running in
+Vimperator. It is not intended as a full reference explaining all features.
+</p>
+++++++
 
 If you've started using Vimperator from scratch (i.e., without any
 customization), you should be looking at this help page in a relatively

vimperator/locale/en-US/xhtml11.css

@@ -304,7 +304,7 @@ td span.tag {
 	padding-top: 25px !important;
 }
 
-div.key {
+span.key {
     color: rgb(255, 0, 255); /* magenta */
     min-width: 120px; /* with 20px padding actually 140px */
 	/*padding-bottom: 5px;*/

xulmus/locale/en-US/autocommands.txt

@@ -100,6 +100,6 @@ Enable _passthrough_ mode on *some* Google sites:
 Set the filetype to mail when editing email at Gmail:
 
 \{nbsp}[c]:autocmd LocationChange .* :set editor=gvim\ -f[c] +
-\{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c 'set ft=mail'"[c]
+\{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c $$'set ft=mail'$$"[c]
 
 // vim: set filetype=asciidoc:

xulmus/locale/en-US/buffer.txt

@@ -23,7 +23,7 @@ ________________________________________________________________________________
 |:pa| |:pageinfo| +
 ||:pa[geinfo]||
 ________________________________________________________________________________
-Show various page information. See [c]:help 'pageinfo'[c] for available options.
+Show various page information. See [c]:help $$'pageinfo'$$[c] for available options.
 ________________________________________________________________________________
 
 

xulmus/locale/en-US/developer.txt

@@ -30,8 +30,8 @@ is displayed as:
 class="hiddentag">:help</span> <span class="hiddentag">:h</span> <span
 class="hiddentag">help</span>
 
-<div class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></div><br />
-<div class="key">&lt;F1&gt;</div></p>
+<span class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></span><br />
+<span class="key">&lt;F1&gt;</span></p>
 <div class="quoteblock">
 <div class="quoteblock-content">
 <p>Open help window.

xulmus/locale/en-US/intro.txt

@@ -1,4 +1,4 @@
-LOGO
+logo:[]
 
 section::Introduction[intro]
 

xulmus/locale/en-US/map.txt

@@ -141,7 +141,8 @@ Below is an overview of which modes each map command applies to:
 :imap  :inoremap  :iunmap  :imapclear - Insert mode
 :cmap  :cnoremap  :cunmap  :cmapclear - Command-line mode
 
-subsection::Key{nbsp}sequences[:<>,key-sequence]
+// |<>| breaks doc validation
+subsection::Key{nbsp}sequences[key-notation,key-sequence]
 
 For most keys, the key-sequence is the same as the character you see when you
 type that key, however there are some exceptions which allow for a much larger

xulmus/locale/en-US/xhtml11.css

@@ -304,7 +304,7 @@ td span.tag {
 	padding-top: 25px !important;
 }
 
-div.key {
+span.key {
     color: rgb(255, 0, 255); /* magenta */
     min-width: 120px; /* with 20px padding actually 140px */
 	/*padding-bottom: 5px;*/