Merge tag 'sisu-markup-samples_4.0.0' into debian/sid

1 files changed, 55 insertions, 8 deletions

diff --git a/data/README b/data/README
index 29eb91c..96eaafd 100644
--- a/data/README
+++ b/data/README
@@ -1,5 +1,6 @@
-The markup samples in sisu-markup-samples are installed to
-/usr/share/doc/sisu/markup-samples-non-free/samples
+These are samples of documents prepared for use by SiSU using SiSU markup. The
+markup samples in sisu-markup-samples are installed to
+/usr/share/doc/markup-samples
 
 Output in multiple formats can be generated running SiSU against the markup
 samples, e.g.:
@@ -7,8 +8,14 @@ samples, e.g.:
 sisu --html the_wealth_of_networks.yochai_benkler.sst
 sisu --html --epub --pdf viral_spiral.david_bollier.sst
 
+see:
+  man sisu
+  <http://www.sisudoc.org>
+  <http://www.jus.uio.no/sisu>
+
 The package sisu contains a few documents published under the GPL or that are
-Debian Free Software Guideline license compatible, notably:
+Debian Free Software Guideline license compatible, in the v4 and legacy v3
+directories below, notably:
 
   Text: Free as in Freedom - Richard Stallman's Crusade for Free Software
     URL: <http://faifzilla.org/>
@@ -34,15 +41,27 @@ Debian Free Software Guideline license compatible, notably:
     invariant sections URL: <http://www.gnu.org/copyleft/fdl.html>
   Markup: free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
 
+Output in multiple formats can be generated running SiSU against the markup
+samples, e.g.:
+
+sisu --html filename.sst
+sisu --html --epub --pdf filename.sst
+
+Online a few sample marked up documents, and their resulting outputs, can be
+found at:
+ <http://www.jus.uio.no/sisu>
+ <http://www.jus.uio.no/sisu/SiSU/examples.html>
+
 A few additional sample books prepared as sisu markup samples, output formats
 to be generated using SiSU are contained in a separate package
 sisu-markup-samples
 
-sisu-markup-samples contains gpl content and additional material released under
-various licenses mostly different Creative Commons licences that do not permit
-inclusion in the Debian Project as they do not meet the DFSG for various
-reasons, most commonly in that they require the original substantive text be
-maintained and often that the works be used only non-commercially
+sisu-markup-samples contains books (prepared using sisu markup), that were
+released by their authors various licenses mostly different Creative Commons
+licences that do not permit inclusion in the Debian Project as they have
+requirements that do not meet the Debian Free Software Guidelines for various
+reasons, most commonly that they require that the original substantive text
+remain unchanged, and sometimes that the works be used only non-commercially.
 
   Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam
   Williams, [as above]
@@ -149,6 +168,16 @@ maintained and often that the works be used only non-commercially
   License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
     URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
   Markup: little_brother.cory_doctorow.sst
+  Cover: cover_image_wordle_little_brother.png
+    URL: <http://craphound.com/littlebrother/2009/09/09/cool-free-cover-image-for-little-brother-from-wordle/>
+  Copyright: Wordle, Cory Doctorow, 2011
+  License: Attribution United States (CC BY) 3.0
+    URL: <http://creativecommons.org/licenses/by/3.0/us/>
+  Illustration: little_brother_doctorow.png
+    URL: <http://commons.wikimedia.org/wiki/File:Little_Brother_illustration_by_Richard_Wilkinson_04.jpg>
+  Copyright: Richard Wilkinson
+  License: Attribution United States (CC BY) 3.0
+    URL: <http://creativecommons.org/licenses/by/3.0/us/>
 
   Text: For the Win
     URL: <http://craphound.com/ftw>
@@ -169,6 +198,24 @@ maintained and often that the works be used only non-commercially
   Markup: accelerando.charles_stross.sst
     Note: The SiSU preparation (presentations) of Accelerando are done with the kind permission of the author Charles Stross
 
+  Text: Alice's Adventures in wonderland
+  Author: Lewis Carroll
+  Copyright: Lewis Carroll, 1865
+  License: Public Domain
+  Markup: alices_adventures_in_wonderland.lewis_carroll.sst
+
+  Text: Through The Looking Glass
+  Author: Lewis Carroll
+  Copyright: Lewis Carroll, 1871
+  License: Public Domain
+  Markup: through_the_looking_glass.lewis_carroll.sst
+
+  Text: Gulliver's Travels
+  Author: Jonathan Swift
+  Copyright: Jonathan Swift, 1776
+  License: Public Domain
+  Markup: gullivers_travels.jonathan_swift.sst
+
   Text: UN Contracts for International Sale of Goods
   Author: UN, UNCITRAL
     URL: <http://www.un.org/>