Merge branch 'upstream' into debian/sid

1 files changed, 88 insertions, 9 deletions

diff --git a/man/man1/sisu-markup-samples.1 b/man/man1/sisu-markup-samples.1
index 3acba36..aecd24e 100644
--- a/man/man1/sisu-markup-samples.1
+++ b/man/man1/sisu-markup-samples.1
@@ -6,25 +6,104 @@
 .SH DESCRIPTION
 \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections.
 .PP
-The sisu\-markup\-samples package contains \fBSiSU\fR examples that can be generated in multiple output document formats and made searchable using the package sisu.
+The sisu\-markup\-samples package contains \fBSiSU\fR examples that can be generated in multiple output document formats and made searchable using the package sisu. Markup samples located in /usr/share/doc/sisu/v2/markup-samples-non-free include the following texts, see the COPYRIGHT file for copyright and license details.
+
+.TP
+accelerando.charles_stross.sst
+.BR
+Accelerando, Charles Stross
+
+.TP
+content.cory_doctorow.sst
+.BR
+CONTENT, Cory Doctorow
+
+.TP
+democratizing_innovation.eric_von_hippel.sst
+.BR
+Democratizing Innovation, Eric von Hippel
+
+.TP
+free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+.BR
+Free as in Freedom \- Richard Stallman's Crusade for Free Software, Sam Williams
+
+.TP
+free_culture.lawrence_lessig.sst
+.BR
+Free Culture \- How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity, Lawrence Lessig
+
+.TP
+free_for_all.peter_wayner.sst
+.BR
+Free For All \- How Linux and the Free Software Movement Undercut the High Tech Titans, Peter Wayner
+
+.TP
+gpl2.fsf.sst
+.BR
+GNU GENERAL PUBLIC LICENSE v2, Free Software Foundation
+
+.TP
+gpl3.fsf.sst
+.BR
+GNU GENERAL PUBLIC LICENSE v3, Free Software Foundation
+
+.TP
+little_brother.cory_doctorow.sst
+.BR
+Little Brother, Cory Doctorow
+
+.TP
+the_cathedral_and_the_bazaar.eric_s_raymond.sst
+.BR
+The Cathederal and the Bazaar, Eric Raymond
+
+.TP
+the_wealth_of_networks.yochai_benkler.sst
+.BR
+The Wealth of Networks \- How Social Production Transforms Markets and Freedom, Yochai Benkler
+
+.TP
+two_bits.christopher_kelty.sst
+.BR
+Two Bits \- The Cultural Significance of Free Software, Christopher Kelty
+
+.TP
+un_contracts_international_sale_of_goods_convention_1980.sst
+.BR
+UN Contracts for International Sale of Goods, UN
 
 .SH SEE ALSO
 \fIsisu\fR(1),
-.br
+.BR
 \fIsisu\fR(8).
-.br
+.BR
+\fIsisu\-epub\fR(1),
+.BR
+\fIsisu\-html\fR(1),
+.BR
+\fIsisu\-odf\fR(1),
+.BR
+\fIsisu\-pdf\fR(1),
+.BR
+\fIsisu\-pg\fR(1),
+.BR
+\fIsisu\-sqlite\fR(1),
+.BR
+\fIsisu\-txt\fR(1).
+.BR
 \fIsisu_termsheet\fR(1).
-.br
+.BR
 \fIsisu_vim\fR(7),
-.br
-\fIsisu_webrick\fR(1),
 .PP
+\fIsisu_webrick\fR(1),
+.BR
 \fIsisu\-complete\fR(7),
-.br
+.BR
 \fIsisu\-pdf\fR(7),
-.br
+.BR
 \fIsisu\-postgresql\fR(7),
-.br
+.BR
 \fIsisu\-sqlite\fR(7).
 
 .SH HOMEPAGE