Merge tag 'sisu-markup-samples_3.0.1' into debian/sid

1 files changed, 44 insertions, 41 deletions

diff --git a/man/man1/sisu-markup-samples.1 b/man/man1/sisu-markup-samples.1
index 3869a32..2c8be50 100644
--- a/man/man1/sisu-markup-samples.1
+++ b/man/man1/sisu-markup-samples.1
@@ -1,13 +1,29 @@
-.TH SISU\-MARKUP\-SAMPLES 7 2010\-10\-11 2.7.6 SiSU
+.TH SISU-MARKUP-SAMPLES 7 2012-04-23 3.0.1 SiSU
 
 .SH NAME
-\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system, complete dependency package
+\fBSiSU\fR - Structured information, Serialized Units - a document publishing
+system, complete dependency package
 
 .SH DESCRIPTION
-\fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections.
+\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. 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.
-
+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. For content run sisu against the markup from the content
+directory, e.g.:
+.BR
+sisu --html -v the_wealth_of_networks.yochai_benkler.sst
+.BR
+sisu --epub -v viral_spiral.david_bollier.sst
+.BR
+sisu --pdf -v the_wealth_of_networks.yochai_benkler.sst
+.BR
+sisu --html --epub --pdf -v democratizing_innovation.eric_von_hippel.sst
+.BR
+Markup samples are located in
+/usr/share/doc/sisu/markup-samples-non-free/samples include the following
+texts, see the COPYRIGHT file for copyright and license details:
 .TP
 accelerando.charles_stross.sst
 .BR
@@ -36,17 +52,25 @@ For the Win, Cory Doctorow
 .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
+Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam Williams
+
+.TP
+free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
+.BR
+Free as in Freedom 2.0 - Richard Stallman and the Free Software Revolution, Sam
+Williams, Richard M. Stallman
 
 .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
+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
+Free For All - How Linux and the Free Software Movement Undercut the High Tech
+Titans, Peter Wayner
 
 .TP
 gpl2.fsf.sst
@@ -69,14 +93,22 @@ the_cathedral_and_the_bazaar.eric_s_raymond.sst
 The Cathederal and the Bazaar, Eric Raymond
 
 .TP
+the_public_domain.james_boyle.sst
+.BR
+The Public Domain - Enclosing the Commons of the Mind, James Boyle
+.BR
+(the book index has not yet been included)
+
+.TP
 the_wealth_of_networks.yochai_benkler.sst
 .BR
-The Wealth of Networks \- How Social Production Transforms Markets and Freedom, Yochai Benkler
+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
+Two Bits - The Cultural Significance of Free Software, Christopher Kelty
 
 .TP
 un_contracts_international_sale_of_goods_convention_1980.sst
@@ -90,39 +122,10 @@ Viral Spiral, David Bollier
 
 .SH SEE ALSO
 \fIsisu\fR(1),
-.BR
-\fIsisu\fR(8).
-.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
-\fIsisu_vim\fR(7),
-.PP
-\fIsisu_webrick\fR(1),
-.BR
-\fIsisu\-complete\fR(7),
-.BR
-\fIsisu\-pdf\fR(7),
-.BR
-\fIsisu\-postgresql\fR(7),
-.BR
-\fIsisu\-sqlite\fR(7).
 
 .SH HOMEPAGE
-More information about \fBSiSU\fR can be found at <\fIhttp://www.jus.uio.no/sisu/\fR>.
+More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org\fR>
+<\fIhttp://www.jus.uio.no/sisu/\fR>.
 
 .SH AUTHOR
 \fBSiSU\fR was written by Ralph Amissah <\fIralph@amissah.com\fR>.