diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-07-08 19:05:56 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-07-08 19:05:56 -0400 |
| commit | d59668cafd209324a758e727b5f931eb86ee4703 (patch) | |
| tree | d56524b75f82431110a153fb5ec50337670c5c6b | |
| parent | install to /usr/share/doc/sisu (diff) | |
| parent | README minor edits (diff) | |
Merge branch 'upstream' into debian/sid
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | data/README | 15 |
2 files changed, 12 insertions, 7 deletions
@@ -17,5 +17,5 @@ author or original publisher's license, and the substantive texts of the document is to be kept un-altered, which falls outside the debian free software guidelines -(c) this package would be placed in /usr/share/doc/sisu-markup-samples as -reference material on how to markup documents +(c) this package would be placed in /usr/share/doc/sisu/v2/ +markup-samples-non-free as reference material on how to markup documents diff --git a/data/README b/data/README index fcb0113..8528fe0 100644 --- a/data/README +++ b/data/README @@ -1,3 +1,7 @@ +The markup samples in sisu-markup-samples are installed to +/usr/share/doc/sisu/v2/markup-samples-non-free and +/usr/share/doc/sisu/v1/markup-samples-non-free respectively + The package sisu contains a few documents published under the GPL or that are Debian Free Software Guideline license compatible, notably: @@ -14,15 +18,16 @@ Debian Free Software Guideline license compatible, notably: 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 -sisu_markup_samples contains gpl content and additional material released under +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 me +reasons, most commonly in that they require the original substantive text be maintained and often that the works be used only non-commercially - Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam Williams, [as above] + Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam + Williams, [as above] Text: Free Culture - How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity URL: <http://www.free-culture.cc> @@ -103,7 +108,7 @@ maintained and often that the works be used only non-commercially Copyright: License: -Most additional material contained in sisu_markup_samples were published under +Most additional material contained in sisu-markup-samples were published under various Creative Commons licenses, check the rights section of each document for the copyright and license, or the COPYRIGHT file associated with the package for a listing of material and their associated licenses. |