summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2015-05-22 01:10:53 +0000
committerRalph Amissah <ralph@amissah.com>2015-05-22 01:10:53 +0000
commit37c3c28012b2a2f676afb58480da54dfaaa5eeea (patch)
treed692c4086d1efec5ebf1cf147391f95ead53d575
parentdebian/changelog (7.1.0-1) (diff)
parent.gitignore added (diff)
downloadsisu-markup-samples-37c3c28012b2a2f676afb58480da54dfaaa5eeea.zip
sisu-markup-samples-37c3c28012b2a2f676afb58480da54dfaaa5eeea.tar.xz
Merge tag 'sisu-markup-samples_7.1.1' into debian/sid
SiSU markup samples 7.1.1
-rw-r--r--.gitignore15
-rw-r--r--CHANGELOG9
-rw-r--r--data/samples/current/en/two_bits.christopher_kelty.sst2
3 files changed, 23 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..327d5c6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+*~
+*_
+\#*
+*.\#*
+*.tmp
+*_tmp
+*.gem
+*.gemspec
+*_.rb
+*.rb_
+.pc
+0???-*.patch
+*.gz
+*.xz
diff --git a/CHANGELOG b/CHANGELOG
index 73e45d8..c820b7c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,13 @@ Source: <http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary>
Reverse Chronological:
+* sisu-markup-samples_7.1.1.orig.tar.xz (2015-05-21:20/4) [version follows sisu]
+ http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=log;h=refs/tags/sisu-markup-samples_7.1.1
+
+ * Bibliography example, Two Bits, Kelty, note the importance of
+ the exclamation mark in naming the section 1~!bibliography or 1~!biblio
+ (left out for Two Bits on previous upload)
+
* sisu-markup-samples_7.1.0.orig.tar.xz (2015-05-15:19/5) [version follows sisu]
http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=log;h=refs/tags/sisu-markup-samples_7.1.0
@@ -13,8 +20,6 @@ Reverse Chronological:
* Democratizing Innovation, von Hippel, minor markup fixes
* The Public Domain, James Boyle, name non chapter sections/headings
* Bibliography
- * manual bibliography markup, remove object numbering & bold authors
- (Democratizing Innovation, von Hippel & Two Bits, Kelty)
* provide examples using tags (sisu-7.1.0)
(Democratizing Innovation, von Hippel; Two Bits, Kelty;
Free For All, Wayner)
diff --git a/data/samples/current/en/two_bits.christopher_kelty.sst b/data/samples/current/en/two_bits.christopher_kelty.sst
index 84801e6..57c6249 100644
--- a/data/samples/current/en/two_bits.christopher_kelty.sst
+++ b/data/samples/current/en/two_bits.christopher_kelty.sst
@@ -4442,7 +4442,7 @@ Understanding how Free Software works and how it has developed along with the In
:B~ Bibliography
-1~bibliography Bibliography
+1~!bibliography Bibliography
% ,{[pg 349]},