diff --git a/common/Makefile.doc b/common/Makefile.doc index 571ec45a..6eba6b8d 100644 --- a/common/Makefile.doc +++ b/common/Makefile.doc @@ -1,4 +1,4 @@ -# Symlink or me to (or include me from) locale/*/Makefile +# Symlink me to (or include me from) locale/*/Makefile #### configuration @@ -12,7 +12,7 @@ ADC_SRC_FILES = $(wildcard *.txt) ADC_FILES = $(ADC_SRC_FILES:%.txt=%.html) ADC_DEPS = $(wildcard asciidoc.conf lang-$(LANG).conf) -DOC_FILES = $(ADC_FILES) +DOC_FILES = $(ADC_FILES) version.html .SILENT: @@ -44,7 +44,7 @@ distclean: clean #### asciidoc -asciidoc: check-asciidoc $(ADC_FILES) +asciidoc: check-asciidoc $(DOC_FILES) check-asciidoc: @$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.2\./ }' || \ @@ -54,3 +54,8 @@ $(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS) @echo "DOC locale/$(LOCALE)/$@" $(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(LANG) -a doctitle="$(shell basename $@)" -o $@ $< +version.html: ../../NEWS $(BASE)/Makefile.doc $(ADC_DEPS) + @echo "DOC locale/$(LOCALE)/$@" + # NOTE: asciidoc doesn't source the conf file implicitly when processing stdin + sed -e '1i\HEADER' -e '/^[0-9]/d' -e '/^ \+\* version /s/.*version \+\([0-9.]\+\).*/section:Version{nbsp}\1[version-\1]\ +/' ../../NEWS | ${ASCIIDOC} -f asciidoc.conf -a doctitle=version.html -o version.html - diff --git a/muttator/content/config.js b/muttator/content/config.js index 259d019d..6b1979bb 100644 --- a/muttator/content/config.js +++ b/muttator/content/config.js @@ -103,7 +103,8 @@ const config = { //{{{ ], // they are sorted by relevance, not alphabetically - helpFiles: ["intro.html"],/* "tutorial.html", "starting.html", + helpFiles: ["intro.html", "version.html"], + /* "tutorial.html", "starting.html", "browsing.html", "buffer.html", "pattern.html", "options.html", "tabs.html", "hints.html", "map.html", "eval.html", "marks.html", "repeat.html", "autocommands.html", "print.html", "developer.html", diff --git a/vimperator/NEWS b/vimperator/NEWS index 7a69e195..ab8479c5 100644 --- a/vimperator/NEWS +++ b/vimperator/NEWS @@ -1,4 +1,4 @@ -2008-XX-XX: +2009-XX-XX: * version 2.0 (probably) * IMPORTANT: For compatibility with vim, guioptions=b has been renamed 'B'. 'b' now represents the bottom scrollbar. @@ -7,7 +7,7 @@ * IMPORTANT: Due to much improved autocompletion, changed default 'complete' option value to 'sfl', listing intelligent Firefox location bar results. Removed possibility to use 'h' in 'complete'. - * IMPORTANT: AlwaysHint mode with ;F mode changed the semantics slightly + * IMPORTANT: AlwaysHint mode with ;F mode changed the semantics slightly. * IMPORTANT: command actions now take an args object, returned from commands.parseArgs, as their first argument. This will break any commands not using the args parser explicitly. The old string value is now @@ -15,10 +15,10 @@ * IMPORTANT: 'verbose' is now used for message levels. Logging is controlled by the extensions.liberator.loglevel preference. * IMPORTANT: :viusage and :exusage now jump to the help index, use the - special versions for the old behavior + special versions for the old behavior. * IMPORTANT: renamed Startup and Quit autocmd events to VimperatorEnter and - VimperatorLeave respectively - * IMPORTANT: 'verbose' is now by default at 1, set to 0 to not show any status messages + VimperatorLeave respectively. + * IMPORTANT: 'verbose' is now by default at 1, set to 0 to not show any status messages. * IMPORTANT: $VIMPERATOR_HOME is no longer used. * [count] now goes to the [count]th next tab rather than the [count]th tab. @@ -146,7 +146,7 @@ 2008-05-14: * version 1.0 - * THIS VERSION ONLY WORKS WITH FIREFOX 3.0 beta3 or newer + * IMPORTANT: THIS VERSION ONLY WORKS WITH FIREFOX 3.0 beta3 or newer * IMPORTANT: Major hints rewrite read up the new help for the f, F and ; commands for details removed the following hint options: 'hintchars' 'maxhints' @@ -205,7 +205,7 @@ 2007-12-21: * version 0.5.3 - * IMPORTANT! options are no longer automatically stored - use the + * IMPORTANT: options are no longer automatically stored - use the ~/.vimperatorrc file instead for persistent options * :tabnext and :tabprevious now accept an argument * the count to gT now specifies a relative tab motion like Vim @@ -374,7 +374,7 @@ * added 'n' and 'N' to repeat a search * many small bug fixes -17/04/2007: +2007-04-17: * version 0.3 * added Ctrl-v support to pass one key to firefox (patch by Muthu Kannan) * also 'I' will go to 'ignorekeys' mode until esc is pressed, presenting a workaround @@ -387,6 +387,6 @@ * ability to use shift and ctrl with special keys like F1 in mappings * small documentation and other fixes -11/04/2007: +2007-04-11: * version 0.2 * first public release diff --git a/vimperator/TODO b/vimperator/TODO index 25400f3a..6abd5099 100644 --- a/vimperator/TODO +++ b/vimperator/TODO @@ -50,8 +50,6 @@ FEATURES: 9 adaptive timeout for auto-completions, :set completions can be updated more often than :open foo 9 use the storage module for autocommands -9 the NEWS file should be more easily available for users, via :help news or something - at the moment you need to unzip the xpi or check the sources to view it, which isn't user friendly 8 support 'activate' in buffer.followLink? Leave this to the bookmarks.tabs.loadInBackground. Hint activation should be nearly equivalent to the corresponding mouse motion, and that diff --git a/vimperator/content/config.js b/vimperator/content/config.js index 7d4dd586..69cddbbb 100644 --- a/vimperator/content/config.js +++ b/vimperator/content/config.js @@ -117,7 +117,7 @@ const config = { //{{{ "pattern.html", "tabs.html", "hints.html", "map.html", "eval.html", "marks.html", "repeat.html", "autocommands.html", "print.html", "gui.html", "styling.html", "message.html", "developer.html", - "various.html", "index.html" + "various.html", "index.html", "version.html" ], scripts: [ diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf index 58a6eed9..8656b2dc 100644 --- a/vimperator/locale/en-US/asciidoc.conf +++ b/vimperator/locale/en-US/asciidoc.conf @@ -75,7 +75,7 @@ argument2=&\#123;|} argument3=[|] [specialwords] -warningwords=WARNING: Warning: +warningwords=WARNING: Warning: IMPORTANT: Important: infowords=NOTE: Note: [warningwords]