From 9ccfd45405e11016bb28fc6d8ff290dff8f5c83d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 25 Aug 2013 01:20:49 -0400
Subject: v4: merge v5, syntax additions, block text related (version bump to
 4.2.*)

* syntax add
  * switch ocn off and on for a block of content, line containing only
    off: "--~#" (omit headings where possible) "---#" on: "--+#"
  * alternative open and close for blocks using line starting with "```", e.g.
    open code block:  "``` code"; close code block: "```"
    start poem:       "``` poem"; end poem:         "```"
  * remove need for an empty line between opening & closing of a text block
  [ note further refinements will be required;
    use of tildes "~~" considered but more problematic, tics not used elsewhere]
---
 data/doc/sisu/CHANGELOG_v4 | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'data')

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index fe6577d0..81b5c534 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -30,6 +30,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.0.orig.tar.xz
   sisu_4.2.0.orig.tar.xz
   sisu_4.2.0-1.dsc
 
+* merge v5
+  * syntax add
+    * switch ocn off and on for a block of content, line containing only
+      off: "--~#" (omit headings where possible) "---#" on: "--+#"
+    * alternative open and close for blocks using line starting with "```", e.g.
+      open code block:  "``` code"; close code block: "```"
+      start poem:       "``` poem"; end poem:         "```"
+    * remove need for an empty line between opening & closing of a text block
+  [note use of "~~" considered but more problematic, (tics not used elsewhere)]
+
 * css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic,
   review further)
 
-- 
cgit v1.2.3