Merge branch 'upstream' into debian/sid

1 files changed, 24 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 19750853..aa90dcdf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,24 +9,30 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.62.0.orig.tar.gz (2007-10-18:42/4)
+%% sisu_0.62.0.orig.tar.gz (2007-10-19:42/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
   sisu_0.62.0.orig.tar.gz
   sisu_0.62.0-1.dsc
   sisu_0.62.0-1.diff.gz
 
-  * directory shunting ... [some resulting re-initialization necessary]
+  [NOTE/WARNING: some directories moved, as overwrites are not automatic, will
+  need manual adjustment of output locations (moving of a couple of
+  directories, and possible creation of another) for images and shared source
+  markup if any, see notes  below (on directory shunting)]
+
+  * directory shunting ... [some resulting re-setting/configuration up
+    necessary]
     * markup source directory (src), all shared markup source placed in a
       common directory (instead of being in output files generated
       sub-directory) [NOTE: New src directory for shared markup source output
-      required]
+      required at [output path]/src ]
     * images, output images used by html moved, now in image directory instead
       of image_local; system images moved from image to image_sys (to make sure
       they are always available, i.e. not written over (by subsequent images
       given same name)) [NOTE: Image directories moved and may need to be
-      tended to manually as existing directories are not overwritten,
-      _sisu/image_local is moved to _sisu/image (and old _sisu/image is now
-      _sisu/image_sys) ]
+      tended to manually as existing directories are not overwritten, [output
+      path]/_sisu/image_local is moved to [output path]/_sisu/image (and old
+      _sisu/image is now _sisu/image_sys) ]
 
   * remote, (put, get) placed in single file (consider separating later)
 
@@ -57,6 +63,18 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
   * debian/control, added depends on rsync, used extensively (now also
     internally)
 
+  * fictionbook, (-f) first pass at output, develop or drop?
+    fictionbook is interesting, links:
+      http://www.fictionbook.org/index.php/Eng:FictionBook
+      http://www.fictionbook.org/index.php/Eng:FictionBook_description
+      http://en.wikipedia.org/wiki/FictionBook
+
+  * NOTE: there appears to be a bug with String.strip in ruby 1.9.0 (2007-09-10
+    patchlevel 0) [i486-linux] ? [behaviour (current in Debian Sid) noted in
+    2007-09-18:38/2, confirmed again in irb1.9 today] (else is with my setup!)
+    ' apples, oranges'.strip #==> "apples," # expected "apples, oranges"
+    ' apples, oranges '.strip #does as expected
+
 %% 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
   3a2329726d49945247b1f4340482c895 1474630 sisu_0.61.0.orig.tar.gz