track, testing

27 files changed, 97 insertions, 33 deletions

diff --git a/markup/pod/.dr/config_local_site b/markup/pod/.dr/config_local_site
index 0f29813..80d293e 100644
--- a/markup/pod/.dr/config_local_site
+++ b/markup/pod/.dr/config_local_site
@@ -9,21 +9,20 @@ default:
   text_wrap:                   "80"
   digest:                      "sha256"
 webserv:
-  http:                        "http"
-  domain:                      "localhost"
-  data_http:                   "http"
-  data_domain:                 "localhost"
+  http:                        "https"
+  domain:                      "sisudoc.org"
+  data_http:                   "https"
+  data_domain:                 "sisudoc.org"
   data_root_url:               "https://sisudoc.org"
   data_root_path:              "/srv/www/spine"
-  data_root_part:              ""
+  data_root_part:              "/spine"
   images_root_part:            "image"
   cgi_search_form_title:       "≅ SiSU Spine search"
   cgi_http:                    "https"
   cgi_domain:                  "sisudoc.org"
-  cgi_bin_url:                 "http://sisudoc.org/cgi-bin"
   cgi_bin_part:                "cgi-bin"
   cgi_bin_path:                "/var/www/cgi/cgi-bin"
-  cgi_search_script:           "spine-search"
+  cgi_search_script:           "spine_search"
   cgi_search_script_raw_fn_d:  "spine_search.d"
   cgi_port:                    ""
   cgi_user:                    ""
diff --git a/markup/pod/.gitignore b/markup/pod/.gitignore
new file mode 100644
index 0000000..b280b51
--- /dev/null
+++ b/markup/pod/.gitignore
@@ -0,0 +1,60 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+*
+!.gitignore
+!COPYRIGHT
+!README
+!shell.nix
+!packages.nix
+!version.txt
+!*/
+!*/pod.manifest
+!*/conf/
+!*/conf/sisu_document_make
+!*/media/
+!*/media/text/
+!*/media/text/*/
+!*/media/text/*/*.sst
+!*/media/text/*/*.ssm
+!*/media/text/*/*.ssi
+!*/media/image/
+!*/media/image/*.png
+!*/media/image/*.jpg
+!*/media/image/*.PNG
+!*/media/image/*.JPG
+!*/tools/
+!*/tools/po4a/
+!*/tools/po4a/pot/
+!*/tools/po4a/pot/*.sst.pot
+!*/tools/po4a/pot/*.ssm.pot
+!*/tools/po4a/pot/*.ssi.pot
+!*/tools/po4a/po/
+!*/tools/po4a/po/*/
+!*/tools/po4a/po/*/*.sst.po
+!*/tools/po4a/po/*/*.ssm.po
+!*/tools/po4a/po/*/*.ssi.po
+.dub/**
+tmp/**
+*_.org
+*_.d
+*_.txt
+*_
+*~
+\#*
+*.\#*
+# *
+# !.gitignore
+# !pod.manifest
+# !*/
+# !*/conf/
+# !*/conf/sisu_document_make
+# !*/media/
+# !*/media/text/
+# !*/media/text/*/
+# !*/media/text/*/*.sst
+# !*/media/text/*/*.ssm
+# !*/media/text/*/*.ssi
+# !*/media/image/
+# !*/media/image/*.png
+# !*/media/image/*.jpg
+# !*/media/image/*.PNG
+# !*/media/image/*.JPG
diff --git a/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst b/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst
index f79517a..ab0cb29 100644
--- a/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst
+++ b/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst
@@ -17,7 +17,7 @@ original:
   source: http://www.accelerando.org/
 
 classify:
-  topic_register: "SiSU markup sample:book:novel;book:novel:fiction:science fiction|short stories;fiction:science fiction|artificial intelligence"
+  topic_register: "SiSU markup sample:book:novel;book:novel:fiction:science fiction|short stories;fiction:science fiction|artificial intelligence;artificial intelligence:science fiction"
   subject: "Science Fiction"
 
 identifier:
diff --git a/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst b/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst
index 646ddce..891f934 100644
--- a/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst
+++ b/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst
@@ -12,7 +12,7 @@ date:
   published: "2008-09-15"
 
 rights:
-  copyright: "Copyright (C) Cory Doctorow, 2008."
+  copyright: "Cory Doctorow, 2008."
   license: "This entire work (with the exception of the introduction by John Perry Barlow) is copyright 2008 by Cory Doctorow and released under the terms of a Creative Commons US Attribution-NonCommercial-ShareAlike license (http://creativecommons.org/licenses/by-nc-sa/3.0/us/). Some Rights Reserved. \\ The introduction is copyright 2008 by John Perry Barlow and released under the terms of a Creative Commons US Attribution-NonCommercial-ShareAlike license (http://creativecommons.org/licenses/by-nc-sa/3.0/us/). Some Rights Reserved."
 
 classify:
diff --git a/markup/pod/democratizing_innovation.eric_von_hippel/media/text/en/democratizing_innovation.eric_von_hippel.sst b/markup/pod/democratizing_innovation.eric_von_hippel/media/text/en/democratizing_innovation.eric_von_hippel.sst
index 167dceb..14dccfd 100644
--- a/markup/pod/democratizing_innovation.eric_von_hippel/media/text/en/democratizing_innovation.eric_von_hippel.sst
+++ b/markup/pod/democratizing_innovation.eric_von_hippel/media/text/en/democratizing_innovation.eric_von_hippel.sst
@@ -16,7 +16,7 @@ date:
   valid: "2005"
 
 rights:
-  copyright: "Copyright (C) 2005 Eric von Hippel. Exclusive rights to publish and sell this book in print form in English are licensed to The MIT Press. All other rights are reserved by the author. An electronic version of this book is available under a Creative Commons license."
+  copyright: "2005 Eric von Hippel. Exclusive rights to publish and sell this book in print form in English are licensed to The MIT Press. All other rights are reserved by the author. An electronic version of this book is available under a Creative Commons license."
   license= " Creative Commons US Attribution-NonCommercial-NoDerivs license 2.0. http://creativecommons.org/licenses/by-nc-nd/2.0/legalcode Some Rights Reserved. You are free to copy, distribute, display and perform the work, under the following conditions: Attribution, you must give the original author credit; you may not use this work for commercial purposes; No Derivative Works, you may not alter, transform, or build-upon this work. For reuse or distribution you must make clear to others the license terms of this work. Any conditions can be waived if you get permission from the copyright holder. Your fair use and other rights are in no way affected by the above."
 
 classify:
diff --git a/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst b/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
index dae92c2..4e19624 100644
--- a/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
+++ b/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
@@ -12,7 +12,7 @@ date:
 # published: "2003-01-09"
 
 rights:
-  copyright: "Copyright © 2003 Cory Doctorow"
+  copyright: "2003 Cory Doctorow"
   license: "Creative Commons, Attribution-NonCommercial-ShareAlike 1.0. That means, you are free: \\ to Share - to copy, distribute and transmit the work; \\ to Remix - to adapt the work; \\ Under the following conditions: \\ Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work); \\ Noncommercial - You may not use this work for commercial purposes; \\ Share Alike — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one. \\ For any reuse or distribution, you must make clear to others the license terms of this work. \\ The best way to do this is with a link http://craphound.com/down \\ Any of the above conditions can be waived if you get my permission. More info here: http://creativecommons.org/licenses/by-nc-sa/1.0/ See the end of this document for the complete legalese. \\ RELICENSED from Attribution-NoDerivs-NonCommercial 1.0 http://creativecommons.org/licenses/by-nd-nc/1.0/"
 
 classify:
diff --git a/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/media/text/en/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst b/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/media/text/en/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
index e5dcdd4..ff46fad 100644
--- a/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/media/text/en/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
+++ b/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/media/text/en/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
@@ -15,7 +15,7 @@ date:
   published: "2010"
 
 rights:
-  copyright: "Copyright (C) Sam Williams 2002; Copyright 2010 Richard M. Stallman"
+  copyright: "Sam Williams 2002; 2010 Richard M. Stallman"
   license: "Published under the GNU Free Documentation License. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled \"GNU Free Documentation License.\""
 
 classify:
diff --git a/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst b/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst
index dc8083a..9182759 100644
--- a/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst
+++ b/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst
@@ -16,7 +16,7 @@ date:
   modified: "2004-03-25"
 
 rights:
-  copyright: "Copyright (C) Lawrence Lessig, 2004."
+  copyright: "Lawrence Lessig, 2004."
   license: "Free Culture is Licensed under a Creative Commons License. This License permits non-commercial use of this work, so long as attribution is given. For more information about the license, visit http://creativecommons.org/licenses/by-nc/1.0/"
 
 classify:
diff --git a/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst b/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst
index 34e341a..252cad1 100644
--- a/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst
+++ b/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst
@@ -16,7 +16,7 @@ date:
   valid: "2002-12-22"
 
 rights:
-  copyright: "Copyright (C) Peter Wayner, 2000."
+  copyright: "Peter Wayner, 2000."
   license: "Free For All is Licensed under a Creative Commons License. This License permits non-commercial use of this work, so long as attribution is given. For more information about the license, visit http://creativecommons.org/licenses/by-nc/1.0/"
 
 classify:
diff --git a/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst b/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
index 24cf9e3..37a1c91 100644
--- a/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
+++ b/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
@@ -9,7 +9,7 @@ date:
   published: "1991"
 
 rights:
-  copyright: "Copyright 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+  copyright: "1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
   license: "Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed."
 
 classify:
diff --git a/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst b/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst
index 83378e3..bdcf318 100644
--- a/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst
+++ b/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst
@@ -15,7 +15,7 @@ date:
   valid: "2007-06-29"
 
 rights:
-  copyright: "Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/"
+  copyright: "2007 Free Software Foundation, Inc. http://fsf.org/"
   license: "Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed."
 
 classify:
diff --git a/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst b/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst
index be9c9be..71a267a 100644
--- a/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst
+++ b/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst
@@ -12,7 +12,7 @@ date:
   published: "2008-04-29"
 
 rights:
-  copyright: "Copyright (C) Cory Doctorow, 2008"
+  copyright: "Cory Doctorow, 2008"
   illustrations: "Richard Wilkinson, 2009"
   cover: "Wordle & Cory Doctorow"
   license: "This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means: \\ You are free: \\ * to Share - to copy, distribute and transmit the work \\ * to Remix - to adapt the work \\ Under the following conditions: \\ * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work). \\ * Noncommercial. You may not use this work for commercial purposes. \\ * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one. \\ * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother \\ * Any of the above conditions can be waived if you get my permission \\ More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/us/ \\ See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License] \\ Cover image: Wordle, Attribution United States (CC BY) 3.0 \\ Illustration: Richard Wilkinson, Creative Commons Attribution-Share Alike 2.0 Generic license."
diff --git a/markup/pod/live-manual/media/text/ca/live-manual.ssm b/markup/pod/live-manual/media/text/ca/live-manual.ssm
index d8abfab..32eba0f 100644
--- a/markup/pod/live-manual/media/text/ca/live-manual.ssm
+++ b/markup/pod/live-manual/media/text/ca/live-manual.ssm
@@ -6,7 +6,7 @@ creator:
   author: "Projecte Live Systems <debian-live@lists.debian.org>"
 
 rights:
-  copyright: "Copyright (C) 2006-2015 Live Systems Project"
+  copyright: "2006-2015 Live Systems Project"
   license: "Aquest programa és un programari lliure: es pot redistribuir i/o modificar sota els termes de la Llicència Pública General de la GNU com és publicada per la Free Software Foundation, ja sigui la versió 3 de la Llicència, o (si ho preferiu) qualsevol versió posterior. \\ \\ Aquest programa es distribueix amb l'esperança que sigui útil, però sense cap garantia, fins i tot sense la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ PER A PROPÒSITS DETERMINATS. Vegeu la Llicència General Pública de la GNU per a més detalls. \\ \\ Haurieu de rebre una còpia de la Llicència Pública General de la GNU amb aquest programa. Si no és així, consulteu http://www.gnu.org/licenses/. \\ \\ El text complet de la Llicència Pública General de la GNU es pot trobar a /usr/share/common-licenses/GPL-3."
 
 date:
diff --git a/markup/pod/live-manual/media/text/de/live-manual.ssm b/markup/pod/live-manual/media/text/de/live-manual.ssm
index 6a130f9..ba983b4 100644
--- a/markup/pod/live-manual/media/text/de/live-manual.ssm
+++ b/markup/pod/live-manual/media/text/de/live-manual.ssm
@@ -6,7 +6,7 @@ creator:
   author: "Live Systems Projekt <debian-live@lists.debian.org>"
 
 rights:
-  copyright: "Copyright (C) 2006-2015 Live Systems Project"
+  copyright: "2006-2015 Live Systems Project"
   license: "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. \\ \\ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. \\ \\ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. \\ \\ The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file."
 
 date:
diff --git a/markup/pod/live-manual/media/text/en/live-manual.ssm b/markup/pod/live-manual/media/text/en/live-manual.ssm
index 67dadbf..35d8893 100644
--- a/markup/pod/live-manual/media/text/en/live-manual.ssm
+++ b/markup/pod/live-manual/media/text/en/live-manual.ssm
@@ -6,7 +6,7 @@ creator:
   author: "Live Systems Project <debian-live@lists.debian.org>"
 
 rights:
-  copyright: "Copyright (C) 2006-2015 Live Systems Project"
+  copyright: "2006-2015 Live Systems Project"
   license: "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. \\  \\ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. \\  \\ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.  \\  \\ The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file."
 
 date:
diff --git a/markup/pod/live-manual/media/text/es/live-manual.ssm b/markup/pod/live-manual/media/text/es/live-manual.ssm
index dc7fccf..9c7b996 100644
--- a/markup/pod/live-manual/media/text/es/live-manual.ssm
+++ b/markup/pod/live-manual/media/text/es/live-manual.ssm
@@ -6,7 +6,7 @@ creator:
   author: "Proyecto Live Systems <debian-live@lists.debian.org>"
 
 rights:
-  copyright: "Copyright (C) 2006-2015 Live Systems Project"
+  copyright: "2006-2015 Live Systems Project"
   license: "Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. \\ \\ Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. \\ \\ Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. \\ \\ El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3"
 
 date:
diff --git a/markup/pod/live-manual/media/text/fr/live-manual.ssm b/markup/pod/live-manual/media/text/fr/live-manual.ssm
index 06a7e33..e6b7b78 100644
--- a/markup/pod/live-manual/media/text/fr/live-manual.ssm
+++ b/markup/pod/live-manual/media/text/fr/live-manual.ssm
@@ -6,7 +6,7 @@ creator:
   author: "Projet Live Systems <debian-live@lists.debian.org>"
 
 rights:
-  copyright: "Copyright (C) 2006-2015 Live Systems Project"
+  copyright: "2006-2015 Live Systems Project"
   license: "Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure. \\  \\ Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails. \\  \\ Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/.  \\  \\ Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3"
 
 date:
diff --git a/markup/pod/live-manual/media/text/it/live-manual.ssm b/markup/pod/live-manual/media/text/it/live-manual.ssm
index 6eba785..b401b21 100644
--- a/markup/pod/live-manual/media/text/it/live-manual.ssm
+++ b/markup/pod/live-manual/media/text/it/live-manual.ssm
@@ -6,7 +6,7 @@ creator:
   author: "Live Systems Project <debian-live@lists.debian.org>"
 
 rights:
-  copyright: "Copyright (C) 2006-2015 Live Systems Project"
+  copyright: "2006-2015 Live Systems Project"
   license: "Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva. \\  \\ Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli. \\  \\ Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. \\ \\ Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3."
 
 date:
diff --git a/markup/pod/live-manual/media/text/ja/live-manual.ssm b/markup/pod/live-manual/media/text/ja/live-manual.ssm
index d8a6e0d..4c41f9d 100644
--- a/markup/pod/live-manual/media/text/ja/live-manual.ssm
+++ b/markup/pod/live-manual/media/text/ja/live-manual.ssm
@@ -6,7 +6,7 @@ creator:
   author: "Live システムプロジェクト <debian-live@lists.debian.org>"
 
 rights:
-  copyright: "Copyright (C) 2006-2015 Live Systems Project"
+  copyright: "2006-2015 Live Systems Project"
   license: "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. \\  \\ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. \\  \\ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. \\ \\ The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file."
 
 date:
diff --git a/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst b/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst
index 24c129f..757bca2 100644
--- a/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst
+++ b/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst
@@ -11,7 +11,7 @@ date:
   published: "1997-02-22"
 
 rights:
-  copyright: "Copyright (C) Ralph Amissah"
+  copyright: "1997 Ralph Amissah"
 
 classify:
   topic_register: "SiSU markup sample:article;Internet:paper"
diff --git a/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst b/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst
index e30bc55..ec8a080 100644
--- a/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst
+++ b/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst
@@ -5,7 +5,7 @@ creator:
   author: "Linne, Anna"
 
 rights:
-  copyright: "Copyright (C) Anna Linne"
+  copyright: "2021 Anna Linne"
   license:   "Creative Commons License, Attribution 4.0 International (CC-BY-4.0)"
 
 date:
diff --git a/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst b/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst
index fbde620..57e5005 100644
--- a/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst
+++ b/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst
@@ -11,7 +11,7 @@ date:
   published: "2000-08-27"
 
 rights:
-  copyright: "Copyright (C) Ralph Amissah"
+  copyright: "2000 Ralph Amissah"
 
 classify:
   topic_register: "SiSU markup sample:article:law;SiSU markup sample:scholarly writing:law;law:international:commercial arbitration|uniform law|harmonization;private law;arbitration:international commercial"
diff --git a/markup/pod/sisu-manual/media/text/en/sisu_markup.sst b/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
index 838f99c..24f9729 100644
--- a/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
+++ b/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
@@ -15,7 +15,7 @@ date:
   modified: "2012-10-03"
 
 rights:
-  copyright: "Copyright (C) Ralph Amissah 2007"
+  copyright: "2007 Ralph Amissah"
   license: "GPL 3 (part of SiSU documentation)"
 
 classify:
diff --git a/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst b/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst
index 4f04b36..183491c 100644
--- a/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst
+++ b/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst
@@ -11,7 +11,7 @@ date:
   published: "1997-10-07"
 
 rights:
-  copyright: "Copyright (C) Ralph Amissah"
+  copyright: "1997 Ralph Amissah"
 
 classify:
   topic_register: "SiSU markup sample:article:law;SiSU markup sample:scholarly writing:law;law:international:commercial arbitration|uniform law|harmonization;private law;arbitration:international commercial"
diff --git a/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index 8fa6da9..d796953 100644
--- a/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst
@@ -13,7 +13,7 @@ date:
   modified: "2002-08-02"
 
 rights:
-  copyright: "Copyright © 2000 Eric S. Raymond."
+  copyright: "© 2000 Eric S. Raymond."
   license: "Permission is granted to copy, distribute and/or modify this document under the terms of the Open Publication License, version 2.0."
 
 classify:
diff --git a/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst b/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst
index 125efe9..13f9310 100644
--- a/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst
+++ b/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst
@@ -17,7 +17,7 @@ date:
   valid: "2006-04-03"
 
 rights:
-  copyright: "Copyright (C) 2006 Yochai Benkler."
+  copyright: "2006 Yochai Benkler."
   license: "All rights reserved. Subject to the exception immediately following, this book may not be reproduced, in whole or in part, including illustrations, in any form (beyond that copying permitted by Sections 107 and 108 of the U.S. Copyright Law and except by reviewers for the public press), without written permission from the publishers. http://creativecommons.org/licenses/by-nc-sa/2.5/ The author has made an online version of the book available under a Creative Commons Noncommercial Sharealike license; it can be accessed through the author's website at http://www.benkler.org."
 
 classify:
diff --git a/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst b/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst
index b95fc5c..405a88d 100644
--- a/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst
+++ b/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst
@@ -9,6 +9,10 @@ creator:
 classify:
   topic_register: "SiSU:markup sample:book;book:novel:historical romance|war novel;Russian:original text;original text language:Russian"
 
+rights:
+  copyright: "Leo Tolstoy 1869, translated by Aylmer Maude, Louise Shanks Maude"
+  license: "Public Domain"
+
 date:
   published: "1869"
   created: "1865"
@@ -30,6 +34,7 @@ make:
     - none
     - none
     - CHAPTER
+
 #   headings: [ BOOK|FIRST|SECOND, none, none, CHAPTER ]
 
 links:
@@ -41,7 +46,7 @@ links:
 # SiSU markup: http://www.jus.uio.no/sisu/sample
 # Output: http://www.jus.uio.no/sisu/war_and_peace.leo_tolstoy
 
-:A~ @title-creator-date
+:A~ @title-author-date
 
 BOOK ONE: 1805
 
@@ -29406,7 +29411,7 @@ Tendre melancholie, ah, viens me consoler,
 Viens calmer les tourments de ma sombre retraite,
 Et mele une douceur secrete
 A ces pleurs que je sens couler.~{ Poisonous nourishment of a too sensitive soul, }~
-``` block
+```
 
 _1 Thou, without whom happiness would for me be impossible,