Merge branch 'upstream' into debian/sid

1 files changed, 27 insertions, 15 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9285442c..4dd3eccb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,35 +1,47 @@
-* See homepage at: http://www.jus.uio.no/sisu * &   http://www.jus.uio.no/sisu/SiSU/download * &   http://www.jus.uio.no/sisu/SiSU/changelog 
+* homepage at: <http://www.jus.uio.no/sisu >
+* <http://www.jus.uio.no/sisu/SiSU/download>
+* <http://www.jus.uio.no/sisu/SiSU/changelog>
+* <http://sisudoc.org/sisu/sisu_manual>
+* |data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm|@|^|
+* |data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi|@|^|
+
 Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.61.0.orig.tar.gz (2007-10-12:41/4)
+%% sisu_0.61.0.orig.tar.gz (2007-10-12:41/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
   sisu_0.61.0.orig.tar.gz
   sisu_0.61.0-1.dsc
   sisu_0.61.0-1.diff.gz
 
-  * dal, shortcut for available outputs, present as grouped text object, as
-    this makes more sense for search results - matches all versions of a
-    document [affects document objects and numbering where used, hence version
-    number bump]
+  * dal, markup shortcut for available outputs, present as grouped text object,
+    (as opposed to each available output being a separate object) this makes
+    more sense for search results - where matched returns all versions of a
+    document, (rather than just e.g. the document title) [affects document
+    objects and numbering where used, hence version number bump]
 
-  * html, pdf, text object switch off @markup: no_ocn (or command line flag
-    --no-ocn), in html objects are still named, (i.e. will still work with
-    searches though the meaning of the numbers returned is obscured)
+  * html, pdf, switch text object numbering off, may be set in: (a) document
+    header, @markup: no_ocn; (b) skin (for documents sharing that skin) "def
+    ocn_display_off" and set to true;  or (c) as a processing flag "sisu -hpv
+    --no-ocn [filename]". NOTE, now in html objects are still named, (i.e. will
+    still work with searches though the relevance of the numbers returned is
+    obscured)
 
-  * shared markup source, composite documents, look to processing directory
-    * text: share source
-    * binary: sisupod (make)
-    [fixes shared markup source bug, present in 0.60]
+  * shared markup source, composite documents, look to processing directory for
+    both text (share source) and binary (sisupod (make))
+    [fixes 0.60 shared markup source bug, introduced by falling out of step
+    with processing changes introduced in 0.60]
 
   * processing flag shortcuts,
     * sisurc.yml reduced -1 outputs [to -hwpoyv] (minimum output used in
       dynamic building of some documents)
     * sysenv (default) replaced (obsoleted) -A with -a
 
-  * sisu manual, download info, change links to source to archive, rather than
-    transient repo
+  * sisu manual, manpage, download info, change links to source to archive,
+    rather than transient repo
+
+  * special character exceptions, some fixes
 
 %% sisu_0.60.1.orig.tar.gz (2007-10-07:40/7)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.1.orig.tar.gz