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

1 files changed, 58 insertions, 26 deletions

diff --git a/man/man1/sisu-markup-samples.1 b/man/man1/sisu-markup-samples.1
index 2c8be50..90c207b 100644
--- a/man/man1/sisu-markup-samples.1
+++ b/man/man1/sisu-markup-samples.1
@@ -2,7 +2,7 @@
 
 .SH NAME
 \fBSiSU\fR - Structured information, Serialized Units - a document publishing
-system, complete dependency package
+system
 
 .SH DESCRIPTION
 \fBSiSU\fR is a lightweight markup based document structuring, publishing and
@@ -21,104 +21,133 @@ 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:
+Markup samples located in /usr/share/doc/sisu-markup-samples include the
+following texts, see the COPYRIGHT file for copyright and license details:
 .TP
 accelerando.charles_stross.sst
 .BR
-Accelerando, Charles Stross
+Accelerando, Charles Stross (2005)
+
+.TP
+alices_adventures_in_wonderland.lewis_carroll.sst
+.BR
+Alice's Adventures in Wonderland, Lewis Carroll (1865)
 
 .TP
 content.cory_doctorow.sst
 .BR
-CONTENT, Cory Doctorow
+.I CONTENT,
+Cory Doctorow (2008)
 
 .TP
 democratizing_innovation.eric_von_hippel.sst
 .BR
-Democratizing Innovation, Eric von Hippel
+.I Democratizing Innovation,
+Eric von Hippel (2005)
 
 .TP
 down_and_out_in_the_magic_kingdom.cory_doctorow.sst
 .BR
-Down and Out in the Magic Kingdom, Cory Doctorow
+.I Down and Out in the Magic Kingdom,
+Cory Doctorow (2003)
 
 .TP
 for_the_win.cory_doctorow.sst
 .BR
-For the Win, Cory Doctorow
+.I For the Win,
+Cory Doctorow (2010)
 
 .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
+.I Free as in Freedom - Richard Stallman's Crusade for Free Software,
+Sam Williams (2002)
 
 .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
+.I Free as in Freedom 2.0 - Richard Stallman and the Free Software Revolution,
+Sam Williams (2002), Richard M. Stallman (2010)
 
 .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
+.I Free Culture - How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity,
+Lawrence Lessig (2004)
 
 .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
+.I Free For All - How Linux and the Free Software Movement Undercut the High Tech Titans,
+Peter Wayner (2002)
 
 .TP
 gpl2.fsf.sst
 .BR
-GNU GENERAL PUBLIC LICENSE v2, Free Software Foundation
+.I GNU GENERAL PUBLIC LICENSE v2,
+Free Software Foundation (1991)
 
 .TP
 gpl3.fsf.sst
 .BR
-GNU GENERAL PUBLIC LICENSE v3, Free Software Foundation
+.I GNU GENERAL PUBLIC LICENSE v3,
+Free Software Foundation (2007)
+
+.TP
+gullivers_travels.jonathan_swift.sst
+.BR
+.I Gulliver's Travels,
+Jonathan Swift (1726 / 1735)
 
 .TP
 little_brother.cory_doctorow.sst
 .BR
-Little Brother, Cory Doctorow
+.I Little Brother,
+Cory Doctorow (2008)
 
 .TP
 the_cathedral_and_the_bazaar.eric_s_raymond.sst
 .BR
-The Cathederal and the Bazaar, Eric Raymond
+.I The Cathederal and the Bazaar,
+Eric Raymond (2000)
 
 .TP
 the_public_domain.james_boyle.sst
 .BR
-The Public Domain - Enclosing the Commons of the Mind, James Boyle
+.I The Public Domain - Enclosing the Commons of the Mind,
+James Boyle (2008)
 .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
+.I The Wealth of Networks - How Social Production Transforms Markets and Freedom,
+Yochai Benkler (2006)
+
+.TP
+through_the_looking_glass.lewis_carroll.sst
+.BR
+.I Through the Looking Glass,
+Lewis Carroll (1871)
 
 .TP
 two_bits.christopher_kelty.sst
 .BR
-Two Bits - The Cultural Significance of Free Software, Christopher Kelty
+.I Two Bits - The Cultural Significance of Free Software,
+Christopher Kelty (2008)
 
 .TP
 un_contracts_international_sale_of_goods_convention_1980.sst
 .BR
-UN Contracts for International Sale of Goods, UN
+.I UN Contracts for International Sale of Goods,
+UN (1980)
 
 .TP
 viral_spiral.david_bollier.sst
 .BR
-Viral Spiral, David Bollier
+.I Viral Spiral,
+David Bollier (2008)
 
 .SH SEE ALSO
 \fIsisu\fR(1),
@@ -127,5 +156,8 @@ Viral Spiral, David Bollier
 More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org\fR>
 <\fIhttp://www.jus.uio.no/sisu/\fR>.
 
+.SH SOURCE
+ <\fIhttp://sources.sisudoc.org\fR>
+
 .SH AUTHOR
 \fBSiSU\fR was written by Ralph Amissah <\fIralph@amissah.com\fR>.