markup samples, debian, v2 branch, adjust headers, rights, creator, version

17 files changed, 102 insertions, 51 deletions

diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.adjusted.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.adjusted.sst
index 5be373c1..c67e267d 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.adjusted.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.adjusted.sst
@@ -1,11 +1,14 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debian Constitution
  :subtitle: Constitution for the Debian Project (v1.2) [This Document has been Superseded by v1.3]
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
-@rights: http://www.debian.org/license Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ). <br>"Debian" and the Debian Logo http://www.debian.org/logos/ are trademarks of Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license <br>"Debian" and the Debian Logo http://www.debian.org/logos/ are trademarks of Software in the Public Interest, Inc.
+ :license: This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy, the latest version is usually available at http://www.opencontent.org/openpub/).
 
 @classify:
  :type: information
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.sst
index 79b8d9ea..c59067d3 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debian Constitution
  :subtitle: Constitution for the Debian Project (v1.2) [This Document has been Superseded by v1.3]
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -28,7 +29,9 @@
  :skin: skin_debian
  :bold: Debian; DPL
 
-@rights: http://www.debian.org/license Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ). <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+ :license: This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/devel/constitution
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~da.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~da.sst
index 16f1360e..a8a2a274 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~da.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~da.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debians vedtægter
  :subtitle: Debian-projektets vedtægter (v1.2) [This Document has been Superseded by v1.3]
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @date:
  :published: 2003-10-29
@@ -13,7 +14,9 @@
  :available: 2003-10-29
  :modified: 2003-10-29
 
-@rights: http://www.debian.org/license.da.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Dette materiale må kun distribueres i henhold til vilkårene beskrevet i Open Publication License, udkast (draft) v1.0 eller senere (du kan læse vores lokale kopi http://www.debian.org/opl, den seneste version er normalt tilgængelig på http://www.opencontent.org/openpub/ ).<br>"Debian" og Debians logo http://www.debian.org/logos/ er varemærker tilhørende Software in the Public Interest, Inc.<br>Dette er en oversættelse af det originale engelsksprogede dokument http://www.debian.org/license.en.html.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.da.html <br>"Debian" og Debians logo http://www.debian.org/logos/ er varemærker tilhørende Software in the Public Interest, Inc.<br>Dette er en oversættelse af det originale engelsksprogede dokument http://www.debian.org/license.en.html.
+ :license: Dette materiale må kun distribueres i henhold til vilkårene beskrevet i Open Publication License, udkast (draft) v1.0 eller senere (du kan læse vores lokale kopi http://www.debian.org/opl, den seneste version er normalt tilgængelig på http://www.opencontent.org/openpub/ ).
 
 @classify:
  :type: information
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~de.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~de.sst
index d0ab2afb..d1609629 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~de.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~de.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debian-Verfassung
  :subtitle: Verfassung für das Debian-Projekt (v1.2) [This Document has been Superseded by v1.3]
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @date:
  :published: 2003-10-29
@@ -13,7 +14,9 @@
  :available: 2003-10-29
  :modified: 2003-10-29
 
-@rights: http://www.debian.org/license.de.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Dieses Material darf nur unter den Bestimmungen, die in der Open Publication License, Draft v1.0 oder später (Sie können unsere lokale Kopie lesen http://www.debian.org/opl, die neuste Version ist normalerweise unter unter http://www.opencontent.org/openpub/ verfügbar) festgehalten sind, weitergegeben werden.<br>"Debian" und das Debian-Logo http://www.debian.org/logos/ sind Warenzeichen von Software in the Public Interest, Inc.<br>Dies ist die deutsche Übersetzung von "Debian's license" http://www.debian.org/license.en.html. In Zweifelsfällen ist das englische Original maßgeblich.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.de.html <br>"Debian" und das Debian-Logo http://www.debian.org/logos/ sind Warenzeichen von Software in the Public Interest, Inc.<br>Dies ist die deutsche Übersetzung von "Debian's license" http://www.debian.org/license.en.html. In Zweifelsfällen ist das englische Original maßgeblich.
+ :license: Dieses Material darf nur unter den Bestimmungen, die in der Open Publication License, Draft v1.0 oder später (Sie können unsere lokale Kopie lesen http://www.debian.org/opl, die neuste Version ist normalerweise unter unter http://www.opencontent.org/openpub/ verfügbar) festgehalten sind, weitergegeben werden.
 
 @classify:
  :type: information
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~es.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~es.sst
index 1fd77bc7..e64c4d63 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~es.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~es.sst
@@ -1,13 +1,16 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Constitución de Debian
  :subtitle: Constitución del Proyecto Debian
  :edition: v1.2
  :note: [This Document has been Superseded by v1.3]
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
-@rights: http://www.debian.org/license.es.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>OJO: Esta es una traducción de la licencia original, y no tiene ningún valor jurídico http://www.debian.org/license.en.html. Si desea ver la versión verdadera debe acudir a la licencia original, en este mismo servidor.<br>Este material sólo puede ser distribuido sujeto a los términos y condiciones indicados en la Licencia de publicaciones abiertas, borrador v1.0 o posterior (puede consultar nuestra copia local http://www.debian.org/opl ; la última versión suele estar disponible en http://www.opencontent.org/openpub/ ). <br>"Debian" y el logotipo de Debian http://www.debian.org/logos/ son marcas registradas de Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, http://www.spi-inc.org/ Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.es.html <br>"Debian" y el logotipo de Debian http://www.debian.org/logos/ son marcas registradas de Software in the Public Interest, Inc.
+ :license: OJO: Esta es una traducción de la licencia original, y no tiene ningún valor jurídico http://www.debian.org/license.en.html. Si desea ver la versión verdadera debe acudir a la licencia original, en este mismo servidor.<br>Este material sólo puede ser distribuido sujeto a los términos y condiciones indicados en la Licencia de publicaciones abiertas, borrador v1.0 o posterior (puede consultar nuestra copia local http://www.debian.org/opl ; la última versión suele estar disponible en http://www.opencontent.org/openpub/ ).
 
 @classify:
  :type: information
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~fr.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~fr.sst
index 8d0b98cf..66856755 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~fr.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.2~fr.sst
@@ -1,4 +1,4 @@
-% SiSU 0.72
+% SiSU 2.0
 
 % Dernière modification : jeudi 2 novembre 2006 06:33:05 UTC
 % Copyright © 1997-2006 SPI; voir les termes de la licence.
@@ -12,9 +12,12 @@
  :edition: v1.2
  :note: [This Document has been Superseded by v1.3]
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
-@rights: http://www.debian.org/license.da.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Ce matériel ne peut être distribué que conformément aux termes et conditions présentés dans la Licence de Publication Ouverte (Open Publication License), Draft v.1.0 ou suivantes. (Vous pouvez lire notre copie locale http://www.debian.org/opl, dont la version la plus récente est généralement disponible à http://www.opencontent.org/ ).<br>« Debian » et le logo Debian sont des marques déposées appartenant à Software in the Public Interest, Inc.<br>En cas de litige, seule la version originale de cette page a valeur au regard de la loi http://www.debian.org/license.en.html.
+@rights: 
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.da.html <br>« Debian » et le logo Debian sont des marques déposées appartenant à Software in the Public Interest, Inc.<br>En cas de litige, seule la version originale de cette page a valeur au regard de la loi http://www.debian.org/license.en.html.
+ :license: Ce matériel ne peut être distribué que conformément aux termes et conditions présentés dans la Licence de Publication Ouverte (Open Publication License), Draft v.1.0 ou suivantes. (Vous pouvez lire notre copie locale http://www.debian.org/opl, dont la version la plus récente est généralement disponible à http://www.opencontent.org/ ).
 
 @date:
  :published: 2003-10-29
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.adjusted.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.adjusted.sst
index 7b3b9d3e..51a047b8 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.adjusted.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.adjusted.sst
@@ -1,4 +1,4 @@
-% SiSU 0.72
+% SiSU 2.0
 
 % Last Modified: Tue, Nov 14 15:39:52 UTC 2006
 % Copyright © 1997-2006 SPI; See license terms
@@ -8,7 +8,8 @@
  :subtitle: Constitution for the Debian Project
  :edition: v1.3
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -33,7 +34,9 @@
  :skin: skin_debian
  :bold: Debian; DPL
 
-@rights: http://www.debian.org/license Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ). <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+ :license: This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/devel/constitution
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.sst
index 4de62a58..fdf0d91e 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3.sst
@@ -1,4 +1,4 @@
-% SiSU 0.72
+% SiSU 2.0
 
 % Last Modified: Tue, Nov 14 15:39:52 UTC 2006
 % Copyright © 1997-2006 SPI; See license terms
@@ -7,7 +7,8 @@
 @title: Debian Constitution
  :subtitle: Constitution for the Debian Project (v1.3)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -28,7 +29,9 @@
 
 % @italics:
 
-@rights: http://www.debian.org/license Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ). <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+ :license: This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/devel/constitution
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~da.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~da.sst
index 72e29704..3ddb7708 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~da.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~da.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debians vedtægter
  :subtitle: Debian-projektets vedtægter (v1.3)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -22,7 +23,9 @@
  :document: Danish
  :original: English
 
-@rights: http://www.debian.org/license.da.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Dette materiale må kun distribueres i henhold til vilkårene beskrevet i Open Publication License, udkast (draft) v1.0 eller senere (du kan læse vores lokale kopi http://www.debian.org/opl, den seneste version er normalt tilgængelig på http://www.opencontent.org/openpub/ ).<br>"Debian" og Debians logo http://www.debian.org/logos/ er varemærker tilhørende Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.da.html <br>"Debian" og Debians logo http://www.debian.org/logos/ er varemærker tilhørende Software in the Public Interest, Inc.
+ :license: Dette materiale må kun distribueres i henhold til vilkårene beskrevet i Open Publication License, udkast (draft) v1.0 eller senere (du kan læse vores lokale kopi http://www.debian.org/opl, den seneste version er normalt tilgængelig på http://www.opencontent.org/openpub/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/devel/constitution
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~de.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~de.sst
index 434365c1..4ff0812c 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~de.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_constitution_v1.3~de.sst
@@ -1,4 +1,4 @@
-% SiSU 0.72
+% SiSU 2.0
 
 % Zuletzt geändert: Mittwoch den 15. Nov 2006 um 22:29:40 Uhr UTC
 % Copyright © 1997-2006 SPI; Hier die Lizenzbestimmungen
@@ -8,7 +8,8 @@
  :subtitle: Verfassung für das Debian-Projekt
  :edition: v1.3
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -27,7 +28,9 @@
  :document: German
  :original: English
 
-@rights: http://www.debian.org/license.de.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Dieses Material darf nur unter den Bestimmungen, die in der Open Publication License, Draft v1.0 oder später (Sie können unsere lokale Kopie lesen http://www.debian.org/opl, die neuste Version ist normalerweise unter unter http://www.opencontent.org/openpub/ verfügbar) festgehalten sind, weitergegeben werden.<br> "Debian" und das Debian-Logo http://www.debian.org/logos/ sind Warenzeichen von Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.de.html <br> "Debian" und das Debian-Logo http://www.debian.org/logos/ sind Warenzeichen von Software in the Public Interest, Inc.
+ :license: Dieses Material darf nur unter den Bestimmungen, die in der Open Publication License, Draft v1.0 oder später (Sie können unsere lokale Kopie lesen http://www.debian.org/opl, die neuste Version ist normalerweise unter unter http://www.opencontent.org/openpub/ verfügbar) festgehalten sind, weitergegeben werden.
 
 @links:
  {Authoritative Source Document}http://www.debian.org/devel/constitution
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1.sst
index c444a78e..2add6ea9 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debian Social Contract
  :subtitle: (v1.1)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -22,7 +23,9 @@
  :document: English
  :original: English
 
-@rights: http://www.debian.org/license Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ). <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+ :license: This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/social_contract
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~da.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~da.sst
index d3d17a2d..c22f142b 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~da.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~da.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debians sociale kontrakt
  :subtitle: Debian Social Contract (v1.1)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -22,7 +23,9 @@
  :document: Danish
  :original: English
 
-@rights: http://www.debian.org/license.da.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ). <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.da.html <br>"Debian" and the Debian Logo are trademarks of Software in the Public Interest, Inc.
+ :license: This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our local copy http://www.debian.org/opl, the latest version is usually available at http://www.opencontent.org/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/social_contract
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~de.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~de.sst
index 19bbaefc..c0db5758 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~de.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~de.sst
@@ -1,10 +1,11 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debian-Gesellschaftsvertrag
  :subtitle: Debian Social Contract
  :edition: v1.1
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -23,7 +24,9 @@
  :document: German
  :original: English
 
-@rights: http://www.debian.org/license.de.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Dieses Material darf nur unter den Bestimmungen, die in der Open Publication License, Draft v1.0 oder später (Sie können unsere lokale Kopie lesen http://www.debian.org/opl, die neuste Version ist normalerweise unter unter http://www.opencontent.org/openpub/ verfügbar) festgehalten sind, weitergegeben werden.<br>"Debian" und das Debian-Logo http://www.debian.org/logos/ sind Warenzeichen von Software in the Public Interest, Inc.<br>Dies ist die deutsche Übersetzung von "Debian's license" http://www.debian.org/license.en.html. In Zweifelsfällen ist das englische Original maßgeblich.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.de.html <br>Dieses Material darf nur unter den Bestimmungen, die in der Open Publication License, Draft v1.0 oder später (Sie können unsere lokale Kopie lesen http://www.debian.org/opl, die neuste Version ist normalerweise unter unter http://www.opencontent.org/openpub/ verfügbar) festgehalten sind, weitergegeben werden. <br>Dies ist die deutsche Übersetzung von "Debian's license" http://www.debian.org/license.en.html. In Zweifelsfällen ist das englische Original maßgeblich.
+ :license: "Debian" und das Debian-Logo http://www.debian.org/logos/ sind Warenzeichen von Software in the Public Interest, Inc.
 
 @links:
  {Authoritative Source Document}http://www.debian.org/social_contract
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~es.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~es.sst
index 0177449b..8625fce9 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~es.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~es.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Contrato social de Debian
  :subtitle: Debian Social Contract (v1.1)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -22,7 +23,9 @@
  :document: Spanish
  :original: English
 
-@rights: http://www.debian.org/license.es.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>OJO: Esta es una traducción de la licencia original, y no tiene ningún valor jurídico http://www.debian.org/license.en.html. Si desea ver la versión verdadera debe acudir a la licencia original, en este mismo servidor.<br>Este material sólo puede ser distribuido sujeto a los términos y condiciones indicados en la Licencia de publicaciones abiertas, borrador v1.0 o posterior (puede consultar nuestra copia local http://www.debian.org/opl ; la última versión suele estar disponible en http://www.opencontent.org/openpub/ ). <br>"Debian" y el logotipo de Debian http://www.debian.org/logos/ son marcas registradas de Software in the Public Interest, Inc.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.es.html <br>"Debian" y el logotipo de Debian http://www.debian.org/logos/ son marcas registradas de Software in the Public Interest, Inc.
+ :license: OJO: Esta es una traducción de la licencia original, y no tiene ningún valor jurídico http://www.debian.org/license.en.html. Si desea ver la versión verdadera debe acudir a la licencia original, en este mismo servidor.<br>Este material sólo puede ser distribuido sujeto a los términos y condiciones indicados en la Licencia de publicaciones abiertas, borrador v1.0 o posterior (puede consultar nuestra copia local http://www.debian.org/opl ; la última versión suele estar disponible en http://www.opencontent.org/openpub/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/social_contract
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fi.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fi.sst
index 8bbda3ab..0f66e192 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fi.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fi.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Debianin yhteisösopimus
  :subtitle: Debian Social Contract (v1.1)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -22,7 +23,9 @@
  :document: Finnish
  :original: English
 
-@rights: http://www.debian.org/license.fi.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Tätä materiaalia voidaan levittää ainoastaan Open Publication License, vedos v1.0 (paikallinen kopiomme luettavaksesi http://www.debian.org/opl ) tai myöhemmän määräysten ja ehtojen mukaisesti. Uusin versio on saatavilla yleensä osoitteesta http://www.opencontent.org/. <br>"Debian" ja Debian-logo http://www.debian.org/logos/ ovat Software in the Public Interest, Inc.:n tavaramerkkejä.<br> http://www.debian.org/license.en.html
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.fi.html <br>"Debian" ja Debian-logo http://www.debian.org/logos/ ovat Software in the Public Interest, Inc.:n tavaramerkkejä.<br> http://www.debian.org/license.en.html
+ :license: Tätä materiaalia voidaan levittää ainoastaan Open Publication License, vedos v1.0 (paikallinen kopiomme luettavaksesi http://www.debian.org/opl ) tai myöhemmän määräysten ja ehtojen mukaisesti. Uusin versio on saatavilla yleensä osoitteesta http://www.opencontent.org/.
 
 @links:
  {Authoritative Source Document}http://www.debian.org/social_contract
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fr.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fr.sst
index 96526f86..deb46db2 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fr.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~fr.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Le contrat social Debian
  :subtitle: Debian Social Contract (v1.1)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -22,7 +23,9 @@
  :document: French
  :original: English
 
-@rights: http://www.debian.org/license.da.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Ce matériel ne peut être distribué que conformément aux termes et conditions présentés dans la Licence de Publication Ouverte (Open Publication License), Draft v.1.0 ou suivantes. (Vous pouvez lire notre copie locale http://www.debian.org/opl, dont la version la plus récente est généralement disponible à http://www.opencontent.org/ ).<br>« Debian » et le logo Debian sont des marques déposées appartenant à Software in the Public Interest, Inc.<br>En cas de litige, seule la version originale de cette page a valeur au regard de la loi http://www.debian.org/license.en.html.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.da.html <br>« Debian » et le logo Debian sont des marques déposées appartenant à Software in the Public Interest, Inc.<br>En cas de litige, seule la version originale de cette page a valeur au regard de la loi http://www.debian.org/license.en.html.
+ :license: Ce matériel ne peut être distribué que conformément aux termes et conditions présentés dans la Licence de Publication Ouverte (Open Publication License), Draft v.1.0 ou suivantes. (Vous pouvez lire notre copie locale http://www.debian.org/opl, dont la version la plus récente est généralement disponible à http://www.opencontent.org/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/social_contract
diff --git a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~it.sst b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~it.sst
index b9a4b877..a4a4f5c2 100644
--- a/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~it.sst
+++ b/debian/data/doc/sisu/v2/markup-samples/samples/debian_social_contract_v1.1~it.sst
@@ -1,9 +1,10 @@
-% SiSU 0.72
+% SiSU 2.0
 
 @title: Contrato social de Debian
  :subtitle: Debian Social Contract (v1.1)
 
-@creator: Debian Project
+@creator:
+ :author: Debian Project
 
 @classify:
  :type: information
@@ -22,7 +23,9 @@
  :document: Italian
  :original: English
 
-@rights: http://www.debian.org/license.it.html Copyright © 1997-2006 Software in the Public Interest, Inc., P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.spi-inc.org/ <br>Questo materiale può essere distribuito solo ai termini e sotto le consizioni poste nel “Open Publication License”, Bozza v1.0 o successiva (si può leggere la nostra copia http://www.debian.org/opl o l’ultima versione normalmente disponibile presso http://www.opencontent.org/openpub/ ).<br>“Debian” e il Logo Debian http://www.debian.org/logos/ sono trademark di Software in the Public Interest, Inc.<br>N.d.T.: Questa è una traduzione della licenza originale in inglese. In tutti in casi in cui il significato della traduzione differisca da quello dell’originale, la versione corretta è da considerarsi quella originale http://www.debian.org/license.en.html.
+@rights:
+ :copyright: Copyright © 1997-2006 Software in the Public Interest, Inc., http://www.spi-inc.org/ P.O. Box 501248, Indianapolis, IN 46250-6248, United States, http://www.debian.org/license.it.html <br>“Debian” e il Logo Debian http://www.debian.org/logos/ sono trademark di Software in the Public Interest, Inc.<br>N.d.T.: Questa è una traduzione della licenza originale in inglese. In tutti in casi in cui il significato della traduzione differisca da quello dell’originale, la versione corretta è da considerarsi quella originale http://www.debian.org/license.en.html.
+ :license: Questo materiale può essere distribuito solo ai termini e sotto le consizioni poste nel “Open Publication License”, Bozza v1.0 o successiva (si può leggere la nostra copia http://www.debian.org/opl o l’ultima versione normalmente disponibile presso http://www.opencontent.org/openpub/ ).
 
 @links:
  {Authoritative Source Document}http://www.debian.org/social_contract