Merge branch 'upstream' into debian/sid

4 files changed, 141 insertions, 54 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index b373eea7..dc024147 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,27 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.2.orig.tar.gz (2011-04-20:16/3) [see 3.0.7]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1
+
+  * options, maintenance -M (--maintenance, new alias --keep-processing-files)
+    * new alias --keep-processing-files (see Bug#622902)
+    * minor rearrangement of regex
+
+  * cgi, sample-search-form
+    * results still not right, (ruby1.9.2 libraries? double check script)
+    * not yet done variable directory path fixing for result links
+
+  * vim colors colorscheme Slate reviewed, cterm 8 colors, & frugal added
+    * Slate, review conflicting group colors
+    * 8, cterm colors to work with
+    * frugal, cterm colors ... my term oddly has 8 colors plus 242 for
+      dark grey possibly more but odd numbers to set
+
+  * sisu-mode.el header notes copyright assignment to FSF 2011-04-08
+    (GNU EMACS)
+    * url to sisu git repo source (when possible also track GNU EMACS location)
+
 %% 2.9.1.orig.tar.gz (2011-03-30:13/3) [see 3.0.6]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8660f162..d69759ef 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,78 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.7.orig.tar.gz (2011-04-20:16/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
+  sisu_3.0.7.orig.tar.gz
+  sisu_3.0.7-1.dsc
+  sisu_3.0.7-1.debian.tar.gz
+
+  * param, md remove md.cmd and md.mod shortcut methods, use use md.opt
+    (md.opt.cmd md.opt.mod)
+    * affects many files that now use @md.opt.cmd & @md.opt.mod
+      (instead of @md.cmd & @md.mod)
+
+  * options
+    * new alias (for -M / --maintenance) --keep-processing-files (see Bug#622902)
+    * introduce opt.act booleans made up of opt.cmd and opt.mod, more flexible
+      than overused cmd characters
+    * where possible move option setting from hub to options
+    * separate out a few methods
+
+  * odf:odt
+    * maintenance, processing in separate subdirectories, that can be
+      kept
+    * odt.zip (bin) directory renamed odt from odf
+
+  * hub
+    * some option setting moved to options
+    * favor use of opt.act over opt.cmd where appropriate
+
+  * sysenv
+    * variable directory path fixing (language, filetype, filname), making
+      the stub for at least manifest and html available early for processing
+      that do not or should not need to process individual markup files
+      completely, such as the cgi search form and harvest
+    * odf:odt paths adjusted for changes in maintenance and odt.zip
+
+  * harvest
+    * place with document manifests
+    * variable directory path fixing (language, filetype, filname)
+
+  * cgi, sample-search-form
+    * results still not right, (ruby1.9.2 libraries? double check script)
+    * not yet done variable directory path fixing for result links
+
+  * vim colors colorscheme Slate reviewed, cterm 8 colors, & frugal added
+    * Slate, review conflicting group colors
+    * 8, cterm colors to work with
+    * frugal, cterm colors ... my term oddly has 8 colors plus 242 for
+      dark grey possibly more but odd numbers to set
+
+  * sisu-mode.el header notes copyright assignment to FSF 2011-04-08
+    (GNU EMACS)
+    * url to sisu git repo source (when possible also track GNU EMACS location)
+
+  * screen_text_color (ansi colors) touched, consider reviewing later
+
+  * urls, report output locations
+    * fix show all urls -U
+    * share/reuse code
+    * fix maintenance urls -M (where processing files are kept for examination)
+    * odf maintenance added
+    * html_tune maintenance fix
+
+  * documentation, sisu-markup-samples, man page, html
+    * document existence of new alias for -M (--maintenance)
+      --keep-maintenance-files (see Bug#622902)
+
 %% 3.0.6.orig.tar.gz (2011-03-30:13/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.6-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
-  sisu_3.0.6.orig.tar.gz
-  sisu_3.0.6-1.dsc
-  sisu_3.0.6-1.debian.tar.gz
+  daa6671a08dd4eeb5848f73b3ecff23b05b7fa0e338b91cd9992dee8a005441e 1923985 sisu_3.0.6.orig.tar.gz
+  a0ca253a6d9b8254f1acaf73d771e5afea12418d971a10d394e20c76c840ef7e 1216 sisu_3.0.6-1.dsc
+  9710bf09eb70fc6e456d7ee0fba746a5fe3486fa14a59001d7e17fcddc608aa8 284254 sisu_3.0.6-1.debian.tar.gz
 
   * (ruby 1.9.2 (transition related) fixes)
     * dal_doc_str
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html
index 357adb3b..b982a989 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/html/sisu.1.html
@@ -317,99 +317,96 @@ file (scroll.html). Alias -h
 <dd>see --manpage
 <p> </dd>
 
+<dt><b>--keep-processing-files [filename/wildcard/url]</b>
+</dt>
+<dd>
+<p>see --maintenance
+<p> </dd>
+
 <dt><b>-L</b> </dt>
 <dd>prints license information.
-
 <p> </dd>
 
 <dt><b>--machine [filename/wildcard/url]</b> </dt>
 <dd>see --dal (document abstraction level/layer)
-
 <p> </dd>
 
 <dt><b>--maintenance [filename/wildcard/url]</b> </dt>
-<dd>maintenance mode files created for
-processing preserved and their locations indicated. (also see -V). Alias -M
-
+<dd>maintenance mode, interim processing files are preserved and their locations
+indicated. (also see -V). Aliases -M and --keep-processing-files
 <p> </dd>
 
 <dt><b>--manpage [filename/wildcard]</b> </dt>
-<dd>produces man page of file, not suitable for
-all outputs. Alias -i
+<dd>produces man page of file, not suitable for all outputs. Alias -i
 <p> </dd>
 
 <dt><b>-M [filename/wildcard/url]</b> </dt>
 <dd>see --maintenance
 <p> </dd>
 
-<dt><b>-m [filename/wildcard/url]</b>
-</dt>
-<dd>see --dal (document abstraction level/layer)
+<dt><b>-m [filename/wildcard/url]</b> </dt>
+<dd>see --dal (document abstraction
+level/layer)
 <p> </dd>
 
 <dt><b>--no-ocn</b> </dt>
-<dd>[with &nbsp;--html &nbsp;--pdf &nbsp;or &nbsp;--epub]
-switches off object citation numbering. Produce output without identifying
-numbers in margins of html or LaTeX/pdf output.
+<dd>[with &nbsp;--html &nbsp;--pdf &nbsp;or &nbsp;--epub] switches off object citation
+numbering. Produce output without identifying numbers in margins of html
+or LaTeX/pdf output.
 <p> </dd>
 
-<dt><b>-N [filename/wildcard/url]</b>
-</dt>
-<dd>document digest or document content certificate ( DCC ) as md5 digest tree
-of the document: the digest for the document, and digests for each object
-contained within the document (together with information on software versions
-that produced it) (digest.txt). -NV for verbose digest output to screen.
+<dt><b>-N [filename/wildcard/url]</b> </dt>
+<dd>document digest or document
+content certificate ( DCC ) as md5 digest tree of the document: the digest
+for the document, and digests for each object contained within the document
+(together with information on software versions that produced it) (digest.txt).
+-NV for verbose digest output to screen.
 <p> </dd>
 
-<dt><b>-n
-[filename/wildcard/url]</b> </dt>
-<dd>skip the creation of intermediate processing files
-(document abstraction) if they already exist, this skips the equivalent
-of -m which is otherwise assumed by most processing flags.
+<dt><b>-n [filename/wildcard/url]</b> </dt>
+<dd>skip the creation of intermediate processing files (document abstraction) if
+they already exist, this skips the equivalent of -m which is otherwise assumed
+by most processing flags.
 <p> </dd>
 
-<dt><b>--odf [filename/wildcard/url]</b>
-</dt>
-<dd>
-<p>see --odt
+<dt><b>--odf [filename/wildcard/url]</b> </dt>
+<dd>see --odt
 <p> </dd>
 
 <dt><b>--odt [filename/wildcard/url]</b> </dt>
-<dd>output basic document in opendocument
-file format (opendocument.odt). Alias -o
+<dd>output basic document in opendocument file format (opendocument.odt). Alias
+-o
 <p> </dd>
 
 <dt><b>-o [filename/wildcard/url]</b> </dt>
 <dd>see --odt
-
 <p> </dd>
 
 <dt><b>--pdf [filename/wildcard]</b> </dt>
-<dd>produces LaTeX pdf (portrait.pdf &amp; landscape.pdf).
-Default paper size is set in config file, or document header, or provided
-with additional command line parameter, e.g. --papersize-a4 preset sizes include:
-&rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and
+<dd>produces
+LaTeX pdf (portrait.pdf &amp; landscape.pdf). Default paper size is set in config
+file, or document header, or provided with additional command line parameter,
+e.g. --papersize-a4 preset sizes include: &rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and
 <p> </dd>
 
-<dt><b>--pg [instruction] [filename]</b> </dt>
-<dd>database postgresql ( --pgsql
-may be used instead) possible instructions, include: --createdb; --create;
---dropall; --import [filename]; --update [filename]; --remove [filename]; see database
-section below. Alias -D
+<dt><b>--pg [instruction]
+[filename]</b> </dt>
+<dd>database postgresql ( --pgsql may be used instead) possible instructions,
+include: --createdb; --create; --dropall; --import [filename]; --update [filename];
+--remove [filename]; see database section below. Alias -D
 <p> </dd>
 
-<dt><b>--po [language_directory/filename &nbsp;language_directory]</b>
-</dt>
-<dd>
-<p>see --po4a
+<dt><b>--po [language_directory/filename
+&nbsp;language_directory]</b> </dt>
+<dd>see --po4a
 <p> </dd>
 
-<dt><b>--po4a [language_directory/filename &nbsp;language_directory]</b> </dt>
-<dd>produces
-.pot and po files for the file in the languages specified by the language
-directory. <b>SiSU</b> markup is placed in subdirectories named with the language
-code, e.g. en/ fr/ es/. The sisu config file must set the output directory
-structure to multilingual. v3, experimental
+<dt><b>--po4a [language_directory/filename &nbsp;language_directory]</b>
+</dt>
+<dd>produces .pot and po files for the file in the languages specified by the
+language directory. <b>SiSU</b> markup is placed in subdirectories named with the
+language code, e.g. en/ fr/ es/. The sisu config file must set the output
+directory structure to multilingual. v3, experimental
 <p> </dd>
 
 <dt><b>-P [language_directory/filename
diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
index eb01a388..4994663c 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
@@ -123,6 +123,9 @@ see --texinfo
 !_ -i [filename/wildcard] <br>
 see --manpage
 
+!_ --keep-processing-files [filename/wildcard/url] <br>
+see --maintenance
+
 !_ -L <br>
 prints license information.
 
@@ -130,7 +133,7 @@ prints license information.
 see --dal (document abstraction level/layer)
 
 !_ --maintenance [filename/wildcard/url] <br>
-maintenance mode files created for processing preserved and their locations indicated. (also see -V). Alias -M
+maintenance mode, interim processing files are preserved and their locations indicated. (also see -V). Aliases -M and --keep-processing-files
 
 !_ --manpage [filename/wildcard] <br>
 produces man page of file, not suitable for all outputs. Alias -i