markup samples, doc headers: urls & yaml style

75 files changed, 632 insertions, 467 deletions

diff --git a/markup/.gitignore b/markup/.gitignore
index c6fb2e2..f3d5567 100644
--- a/markup/.gitignore
+++ b/markup/.gitignore
@@ -4,7 +4,6 @@
 # find . -name "*_" | xargs rm -rf
 # find . -name "*.o" | xargs rm -rf
 *
-*
 !.gitignore
 !COPYRIGHT
 !README
@@ -17,9 +16,9 @@
 # pod.manifest
 !pod/*/
 !pod/*/pod.manifest
-# conf/sisu_document_make
+# conf/document_make
 !pod/*/conf/
-!pod/*/conf/sisu_document_make
+!pod/*/conf/document_make
 # media/text
 !pod/*/media/
 !pod/*/media/text/
@@ -51,6 +50,8 @@
 !pod/*/tools/po4a/po/*/*.ssm.po
 !pod/*/tools/po4a/po/*/*.ssi.po
 !pod/*/tools/po4a/po/*/index.html.in.po
+!pod/.dr
+!pod/.dr/*
 # separate from media/text use tools
 !pod/*/media/text/Makefile
 !pod/*/media/text/bin/
diff --git a/markup/non-pod-samples/alices_adventures_in_wonderland.lewis_carroll.non-pod-sample.sst b/markup/non-pod-samples/alices_adventures_in_wonderland.lewis_carroll.non-pod-sample.sst
index 03678e1..8387955 100644
--- a/markup/non-pod-samples/alices_adventures_in_wonderland.lewis_carroll.non-pod-sample.sst
+++ b/markup/non-pod-samples/alices_adventures_in_wonderland.lewis_carroll.non-pod-sample.sst
@@ -1,4 +1,5 @@
 # SiSU 8.0
+
 title: "Alice's Adventures in Wonderland"
 
 creator:
@@ -19,10 +20,9 @@ rights:
 classify:
   topic_register: "SiSU markup sample:book:novel; book:novel:fiction:fantasy|children's fiction"
 
-links: [
-    "{ Alice in Wonderland @ Wikipedia }http://en.wikipedia.org/wiki/Alice%27s_Adventures_in_Wonderland",
-    "{ Lewis Carroll @ Wikipedia }http://en.wikipedia.org/wiki/Lewis_Carroll"
-  ]
+links:
+  - "{ Alice in Wonderland @ Wikipedia }http://en.wikipedia.org/wiki/Alice%27s_Adventures_in_Wonderland"
+  - "{ Lewis Carroll @ Wikipedia }http://en.wikipedia.org/wiki/Lewis_Carroll"
 
 make:
   doc_type: "book"
diff --git a/markup/non-pod-samples/democratizing_innovation.eric_von_hippel.non-pod-sample.sst b/markup/non-pod-samples/democratizing_innovation.eric_von_hippel.non-pod-sample.sst
index 686e8a2..9471000 100644
--- a/markup/non-pod-samples/democratizing_innovation.eric_von_hippel.non-pod-sample.sst
+++ b/markup/non-pod-samples/democratizing_innovation.eric_von_hippel.non-pod-sample.sst
@@ -29,18 +29,19 @@ identifier:
 # HC79.T4H558 2005
 # 338'.064-dc22 2004061060
 
-links: [
-    "{ Democratizing Innovation }https://web.mit.edu/evhippel/www/democ1.htm",
-    "{ Eric von Hippel }https://evhippel.mit.edu/",
-    "{ @ Wikipedia }https://en.wikipedia.org/wiki/Democratizing_Innovation",
-    "{ Democratizing Innovation @ Amazon.com }https://www.amazon.com/Democratizing-Innovation-Eric-Von-Hippel/dp/0262720477",
-    "{ Democratizing Innovation @ Barnes & Noble }https://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=9780262720472"
-  ]
+links:
+  - "{ Democratizing Innovation }https://web.mit.edu/evhippel/www/democ1.htm"
+  - "{ Eric von Hippel }https://evhippel.mit.edu/"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/Democratizing_Innovation"
+  - "{ Democratizing Innovation @ Amazon.com }https://www.amazon.com/Democratizing-Innovation-Eric-Von-Hippel/dp/0262720477"
+  - "{ Democratizing Innovation @ Barnes & Noble }https://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=9780262720472"
 
 make:
   breaks: "new=:B,C; break=1"
   texpdf_font: "Liberation Sans"
-  home_button_text: "{Original @ MIT Press}https://mitpress.mit.edu/9780262720472/democratizing-innovation/; {E. von Hippel}https://evhippel.mit.edu/"
+  home_button_text:
+    - "{Original @ MIT Press}https://mitpress.mit.edu/9780262720472/democratizing-innovation/"
+    - "{E. von Hippel}https://evhippel.mit.edu/"
   footer: "{Eric von Hippel}https://evhippel.mit.edu/"
 
 :A~ @title-author-date
diff --git a/markup/non-pod-samples/free_culture.lawrence_lessignon-pod-sample.sst b/markup/non-pod-samples/free_culture.lawrence_lessig.non-pod-sample.sst
index a9141fe..f561b61 100644
--- a/markup/non-pod-samples/free_culture.lawrence_lessignon-pod-sample.sst
+++ b/markup/non-pod-samples/free_culture.lawrence_lessig.non-pod-sample.sst
@@ -28,22 +28,26 @@ identifier:
 
 # :isbn="1594200068"
 
-links: [
-    "{Free Culture}http://www.free-culture.cc",
-    "{Remixes}http://www.free-culture.cc/remixes/",
-    "{@ Wikipedia}http://en.wikipedia.org/wiki/Free_Culture_%28book%29",
-    "{@ Amazon.com}http://www.amazon.com/gp/product/1594200068",
-    "{@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=1594200068"
-  ]
+links:
+  - "{Free Culture}http://www.free-culture.cc"
+  - "{Remixes}http://www.free-culture.cc/remixes/"
+  - "{@ Wikipedia}http://en.wikipedia.org/wiki/Free_Culture_%28book%29"
+  - "{@ Amazon.com}http://www.amazon.com/gp/product/1594200068"
+  - "{@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=1594200068"
 
 make:
   doc_type: "book"
   breaks: "new=:B; break=1"
-  home_button_image: "{freeculture.home.png }http://www.free-culture.cc"
-  home_button_text: "{Free Culture}http://www.free-culture.cc; {Lawrence Lessig}http://www.lessig.org"
-  footer: "{Free Culture}http://www.free-culture.cc; {Lawrence Lessig}http://www.lessig.org"
+  home_button_text:
+    - "{Free Culture}https://www.free-culture.cc"
+    - "{Lawrence Lessig}https://www.lessig.org"
+  footer:
+    - "{Free Culture}https://www.free-culture.cc"
+    - "{Lawrence Lessig}https://www.lessig.org"
   pot_master: "free_culture.lawrence_lessig.sst"
 
+# home_button_image: "{freeculture.home.png }http://www.free-culture.cc"
+
 :A~ @title-author-date
 
 1~attribution Attribution~#
diff --git a/markup/non-pod-samples/gullivers_travels.jonathan_swift.starter.non-pod-sample.sst b/markup/non-pod-samples/gullivers_travels.jonathan_swift.starter.non-pod-sample.sst
index 7ffe241..acdafe9 100644
--- a/markup/non-pod-samples/gullivers_travels.jonathan_swift.starter.non-pod-sample.sst
+++ b/markup/non-pod-samples/gullivers_travels.jonathan_swift.starter.non-pod-sample.sst
@@ -21,14 +21,17 @@ date:
   modified: "1735"
   added_to_site: "2005-10-30"
 
-links: [
-    "{ Gulliver's Travels }http://en.wikipedia.org/wiki/Gullivers_travels",
-    "{ Johnathan Swift }http://en.wikipedia.org/wiki/Jonathan_Swift"
-  ]
+links:
+  - "{ Gulliver's Travels }http://en.wikipedia.org/wiki/Gullivers_travels"
+  - "{ Johnathan Swift }http://en.wikipedia.org/wiki/Jonathan_Swift"
 
 make:
   doc_type: "book"
-  headings: "PART; none; none; CHAPTER;"
+  headings:
+    - PART
+    - none
+    - none
+    - CHAPTER
   breaks: "new=:B; break=1"
 
 A~ @title-author-date
diff --git a/markup/non-pod-samples/the_wealth_of_networks.yochai_benkler.non-pod-sample.sst b/markup/non-pod-samples/the_wealth_of_networks.yochai_benkler.non-pod-sample.sst
index 6ee9a44..348d35c 100644
--- a/markup/non-pod-samples/the_wealth_of_networks.yochai_benkler.non-pod-sample.sst
+++ b/markup/non-pod-samples/the_wealth_of_networks.yochai_benkler.non-pod-sample.sst
@@ -33,19 +33,24 @@ identifier:
 
 # created: "2006-01-27
 
-links: [
-    "{ The Wealth of Networks, dedicated wiki }http://cyber.law.harvard.edu/wealth_of_networks/Main_Page",
-    "{ Yochai Benkler, wiki }http://www.benkler.org/wealth_of_networks/index.php/Main_Page",
-    "{ @ Wikipedia}http://en.wikipedia.org/wiki/The_Wealth_of_Networks",
-    "{ WoN @ Amazon.com }http://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0300110561/",
-    "{ WoN @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0300110561"
-  ]
+links:
+  - "{ The Wealth of Networks, dedicated wiki }http://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
+  - "{ Yochai Benkler, wiki }http://www.benkler.org/wealth_of_networks/index.php/Main_Page"
+  - "{ @ Wikipedia}http://en.wikipedia.org/wiki/The_Wealth_of_Networks"
+  - "{ WoN @ Amazon.com }http://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0300110561/"
+  - "{ WoN @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0300110561"
 
 make:
   doc_type: "book"
   breaks: "new=:B; break=1"
-  home_button_image: "{won_benkler.png }http://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
-  footer: "{The Wealth of Networks}http://cyber.law.harvard.edu/wealth_of_networks/Main_Page; {Yochai Benkler}http://http://www.benkler.org"
+  home_button_text:
+    - "{The Wealth of Networks}https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
+    - "{Yochai Benkler}https://www.benkler.org"
+  footer:
+    - "{The Wealth of Networks}https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
+    - "{Yochai Benkler}https://www.benkler.org"
+
+# home_button_image: "{won_benkler.png }https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
 
 #% -- body ---
 
diff --git a/markup/non-pod-samples/through_the_looking_glass.lewis_carroll.non-pod-sample.sst b/markup/non-pod-samples/through_the_looking_glass.lewis_carroll.non-pod-sample.sst
index e9731a4..7778282 100644
--- a/markup/non-pod-samples/through_the_looking_glass.lewis_carroll.non-pod-sample.sst
+++ b/markup/non-pod-samples/through_the_looking_glass.lewis_carroll.non-pod-sample.sst
@@ -21,10 +21,9 @@ rights:
 classify:
   topic_register: "SiSU markup sample:book:novel;book:novel:fiction:fantasy|children's fiction"
 
-links: [
-    "{ Through the Looking Glass @ Wikipedia }http://en.wikipedia.org/wiki/Through_the_Looking-Glass",
-    "{ Lewis Carroll @ Wikipedia }http://en.wikipedia.org/wiki/Lewis_Carroll"
-  ]
+links:
+  - "{ Through the Looking Glass @ Wikipedia }http://en.wikipedia.org/wiki/Through_the_Looking-Glass"
+  - "{ Lewis Carroll @ Wikipedia }http://en.wikipedia.org/wiki/Lewis_Carroll"
 
 make:
   doc_type: "book"
diff --git a/markup/pod/.dr/document_make b/markup/pod/.dr/document_make
new file mode 100644
index 0000000..67c63bf
--- /dev/null
+++ b/markup/pod/.dr/document_make
@@ -0,0 +1,15 @@
+make:
+  breaks: "break=1"
+  home_button_text:
+    - "{sisudoc.org}https://sisudoc.org"
+    - "{doc-reform.org}https://doc-reform.org"
+    - "{sources / git}https://git.sisudoc.org/"
+  footer:
+    - "{sisudoc.org}https://sisudoc.org"
+    - "{sources / git}https://git.sisudoc.org/"
+links:
+  - "{sisudoc.org}https://sisudoc.org"
+  - "{doc-reform.org}https://doc-reform.org"
+  - "{sources / git}https://git.sisudoc.org/"
+# home_button_image "{sisu.png }https://sisudoc.org"
+# home_button_text: "{sisudoc.org}https://sisudoc.org; {doc-reform.org}https://doc-reform.org; {sources / git}https://git.sisudoc.org/"
diff --git a/markup/pod/accelerando.charles_stross/conf/document_make b/markup/pod/accelerando.charles_stross/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/accelerando.charles_stross/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/accelerando.charles_stross/conf/sisu_document_make b/markup/pod/accelerando.charles_stross/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/accelerando.charles_stross/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 5c6afdc..074c137 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
@@ -11,7 +11,7 @@ date:
 
 rights:
   copyright: "Charles Stross, 2005."
-  license:   "Creative Commons License, Attribution-NonCommercial-NoDerivs 2.0: * Attribution. You must attribute the work in the manner specified by the author or licensor; * Noncommercial. You may not use this work for commercial purposes; * No Derivative Works. You may not alter, transform, or build upon this work; * For any reuse or distribution, you must make clear to others the license terms of this work. (* For any reuse or distribution, you must make clear to others the license terms of this work. * Any of these conditions can be waived if you get permission from the copyright holder.) http://creativecommons.org/licenses/by-nc-nd/2.0/ These SiSU presentations of Accelerando are done with the kind permission of the author Charles Stross"
+  license:   "Creative Commons License, Attribution-NonCommercial-NoDerivs 2.0: * Attribution. You must attribute the work in the manner specified by the author or licensor; * Noncommercial. You may not use this work for commercial purposes; * No Derivative Works. You may not alter, transform, or build upon this work; * For any reuse or distribution, you must make clear to others the license terms of this work. (* For any reuse or distribution, you must make clear to others the license terms of this work. * Any of these conditions can be waived if you get permission from the copyright holder.) https://creativecommons.org/licenses/by-nc-nd/2.0/ These SiSU presentations of Accelerando are done with the kind permission of the author Charles Stross"
 
 original:
   source: http://www.accelerando.org/
@@ -24,19 +24,24 @@ identifier:
   oclc: "57682282"
   isbn: "9780441012848"
 
-links: [
-    "{ Accelerando home }http://www.accelerando.org/",
-    "{ @ Wikipedia }http://en.wikipedia.org/wiki/Accelerando_%28novel%29",
-    "{ @ Amazon.com}http://www.amazon.com/gp/product/0441014151",
-    "{ @ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0441014151"
-  ]
+links:
+  - "{ Accelerando, Charles Stross}https://www.antipope.org/charlie/blog-static/index.html"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/Accelerando_%28novel%29"
+  - "{ @ Amazon.com}https://www.amazon.com/gp/product/0441014151"
+  - "{ @ Barnes & Noble}https://www.barnesandnoble.com/w/accelerando-charles-stross/1100256512?ean=9780441014156"
 
 make:
   doc_type: "book"
   headings: "none; PART; none; Chapter;"
   breaks: "new=:A,:B; break=:C,1"
-  home_button_image: "{accelerando_stross.png }http://www.accelerando.org/"
-  footer: "{Accelerando}http://www.accelerando.org/; {Charles Stross}http://www.antipope.org/charlie/"
+  home_button_text:
+    - "{Accelerando}https://www.antipope.org/charlie/blog-static/index.html"
+    - "{Charles Stross}https://www.antipope.org/charlie/blog-static/index.html"
+  footer:
+    - "{Accelerando}https://www.antipope.org/charlie/blog-static/index.html"
+    - "{Charles Stross}https://www.antipope.org/charlie/blog-static/index.html"
+
+# home_button_image: "{accelerando_stross.png }http://www.accelerando.org/"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/alices_adventures_in_wonderland.lewis_carroll/conf/document_make b/markup/pod/alices_adventures_in_wonderland.lewis_carroll/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/alices_adventures_in_wonderland.lewis_carroll/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/alices_adventures_in_wonderland.lewis_carroll/conf/sisu_document_make b/markup/pod/alices_adventures_in_wonderland.lewis_carroll/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/alices_adventures_in_wonderland.lewis_carroll/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst b/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst
index 7f1bb04..3bc683d 100644
--- a/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst
+++ b/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst
@@ -1,4 +1,5 @@
 # SiSU 8.0
+
 title: "Alice's Adventures in Wonderland"
 
 creator:
@@ -19,10 +20,9 @@ rights:
 classify:
   topic_register: "SiSU markup sample:book:novel; book:novel:fiction:fantasy|children's fiction"
 
-links: [
-    "{ Alice in Wonderland @ Wikipedia }http://en.wikipedia.org/wiki/Alice%27s_Adventures_in_Wonderland",
-    "{ Lewis Carroll @ Wikipedia }http://en.wikipedia.org/wiki/Lewis_Carroll"
-  ]
+links:
+  - "{ Alice in Wonderland @ Wikipedia }https://en.wikipedia.org/wiki/Alice%27s_Adventures_in_Wonderland"
+  - "{ Lewis Carroll @ Wikipedia }https://en.wikipedia.org/wiki/Lewis_Carroll"
 
 make:
   doc_type: "book"
diff --git a/markup/pod/content.cory_doctorow/conf/document_make b/markup/pod/content.cory_doctorow/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/content.cory_doctorow/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/content.cory_doctorow/conf/sisu_document_make b/markup/pod/content.cory_doctorow/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/content.cory_doctorow/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 e18e5a5..046fac6 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
@@ -13,7 +13,7 @@ date:
 
 rights:
   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."
+  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 (https://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 (https://creativecommons.org/licenses/by-nc-sa/3.0/us/). Some Rights Reserved."
 
 classify:
   topic_register: "SiSU markup sample:book:discourse;book:discourse:copyright|content|creative commons|intellectual property;copyright;content;creative commons;intellectual property:copyright;intellectual property:copyright:creative commons;book:subject:culture|copyright|society|content|social aspects of technology;culture;society;technology:social aspects"
@@ -23,20 +23,24 @@ identifier:
   oclc: "268676051"
   isbn: "9781892391810"
 
-links: [
-    "{ CONTENT }http://craphound.com/content/",
-    "{ @ Wikipedia }http://en.wikipedia.org/wiki/Cory_Doctorow",
-    "{ @ Amazon.com }http://www.amazon.com/Content-Selected-Technology-Creativity-Copyright/dp/1892391813",
-    "{ @ Barnes & Noble }http://search.barnesandnoble.com/Content/Cory-Doctorow/e/9781892391810/?itm=1&USRI=content+cory+doctorow"
-  ]
+links:
+  - "{ CONTENT }https://craphound.com/content/"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/Cory_Doctorow"
+  - "{ @ Amazon.com }https://www.amazon.com/Content-Selected-Technology-Creativity-Copyright/dp/1892391813"
+  - "{ @ Barnes & Noble }https://www.barnesandnoble.com/w/content-cory-doctorow/1111384876?ean=2940169719970"
 
 make:
   doc_type: "book"
   breaks: "break=1"
   auto_num_top_at_level: "1"
   emphasis: "italics"
-  home_button_text: "{CONTENT}http://craphound.com/content; {Cory Doctorow}http://www.doctorow.com"
-  footer: "{CONTENT}http://craphound.com/content; {Cory Doctorow}http://www.doctorow.com"
+  home_button_text:
+    - "{CONTENT}https://craphound.com/content"
+    - "{Cory Doctorow}https://craphound.com/bio/"
+    - "{Craphound}https://craphound.com/"
+  footer:
+    - "{CONTENT}https://craphound.com/content"
+    - "{Cory Doctorow}https://craphound.com/"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/democratizing_innovation.eric_von_hippel/conf/document_make b/markup/pod/democratizing_innovation.eric_von_hippel/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/democratizing_innovation.eric_von_hippel/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/democratizing_innovation.eric_von_hippel/conf/sisu_document_make b/markup/pod/democratizing_innovation.eric_von_hippel/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/democratizing_innovation.eric_von_hippel/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 686e8a2..121afd8 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
@@ -17,7 +17,7 @@ date:
 
 rights:
   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."
+  license= " Creative Commons US Attribution-NonCommercial-NoDerivs license 2.0. https://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:
   topic_register: "SiSU markup sample:book:discourse;book:discourse:innovation|democracy|open source software;innovation;technological innovations:economic aspects;diffusion of innovations;democracy;open source software:innovation"
@@ -29,18 +29,19 @@ identifier:
 # HC79.T4H558 2005
 # 338'.064-dc22 2004061060
 
-links: [
-    "{ Democratizing Innovation }https://web.mit.edu/evhippel/www/democ1.htm",
-    "{ Eric von Hippel }https://evhippel.mit.edu/",
-    "{ @ Wikipedia }https://en.wikipedia.org/wiki/Democratizing_Innovation",
-    "{ Democratizing Innovation @ Amazon.com }https://www.amazon.com/Democratizing-Innovation-Eric-Von-Hippel/dp/0262720477",
-    "{ Democratizing Innovation @ Barnes & Noble }https://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=9780262720472"
-  ]
+links:
+  - "{ Democratizing Innovation }https://web.mit.edu/evhippel/www/democ1.htm"
+  - "{ Eric von Hippel }https://evhippel.mit.edu/"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/Democratizing_Innovation"
+  - "{ Democratizing Innovation @ Amazon.com }https://www.amazon.com/Democratizing-Innovation-Eric-Von-Hippel/dp/0262720477"
+  - "{ Democratizing Innovation @ Barnes & Noble }https://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=9780262720472"
 
 make:
   breaks: "new=:B,C; break=1"
   texpdf_font: "Liberation Sans"
-  home_button_text: "{Original @ MIT Press}https://mitpress.mit.edu/9780262720472/democratizing-innovation/; {E. von Hippel}https://evhippel.mit.edu/"
+  home_button_text:
+    - "{Original @ MIT Press}https://mitpress.mit.edu/9780262720472/democratizing-innovation/"
+    - "{E. von Hippel}https://evhippel.mit.edu/"
   footer: "{Eric von Hippel}https://evhippel.mit.edu/"
 
 :A~ @title-author-date
diff --git a/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/conf/document_make b/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/conf/sisu_document_make b/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 ca549cc..378426c 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
@@ -13,7 +13,7 @@ date:
 
 rights:
   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/"
+  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 https://craphound.com/down \\ Any of the above conditions can be waived if you get my permission. More info here: https://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 https://creativecommons.org/licenses/by-nd-nc/1.0/"
 
 classify:
   topic_register: "SiSU markup sample:book:novel;book:novel:fiction:counterculture|young adult|science fiction"
@@ -28,18 +28,22 @@ identifier:
 notes:
   description: "Realizing his boyhood dream of moving to the twentieth-century artistic creation of Disney World, Jules becomes incensed by a new group that would change the Hall of Presidents by replacing the audioanimatronics with brain interfaces."
 
-links: [
-    "{ Down and Out in the Magic Kingdom home }http://craphound.com/down",
-    "{ @ Wikipedia }http://en.wikipedia.org/wiki/Down_and_Out_in_the_Magic_Kingdom",
-    "{ @ Amazon.com }http://www.amazon.com/Down-Magic-Kingdom-Cory-Doctorow/dp/076530953X",
-    "{ @ Barnes & Noble }http://search.barnesandnoble.com/Down-and-Out-in-the-Magic-Kingdom/Cory-Doctorow/e/9780765309532"
-  ]
+links:
+  - "{ Down and Out in the Magic Kingdom home }https://craphound.com/down"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/Down_and_Out_in_the_Magic_Kingdom"
+  - "{ @ Amazon.com }https://www.amazon.com/Down-Magic-Kingdom-Cory-Doctorow/dp/076530953X"
+  - "{ @ Barnes & Noble }https://www.barnesandnoble.com/w/down-and-out-in-the-magic-kingdom-cory-doctorow/1100352901?ean=9781250196385"
 
 make:
   doc_type: "book"
   breaks: "break=1"
-  home_button_text: "{Down and Out in the Magic Kingdom}http://craphound.com/down; {Cory Doctorow}http://www.doctorow.com"
-  footer: "{Down and Out in the Magic Kingdom}http://craphound.com/down; {Cory Doctorow}http://www.doctorow.com"
+  home_button_text:
+    - "{Down and Out in the Magic Kingdom}https://craphound.com/down"
+    - "{Cory Doctorow}https://craphound.com/bio/"
+    - "{Craphound}https://craphound.com/"
+  footer:
+    - "{Down and Out in the Magic Kingdom}https://craphound.com/down"
+    - "{Cory Doctorow}https://craphound.com/"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/for_the_win.cory_doctorow/conf/document_make b/markup/pod/for_the_win.cory_doctorow/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/for_the_win.cory_doctorow/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/for_the_win.cory_doctorow/conf/sisu_document_make b/markup/pod/for_the_win.cory_doctorow/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/for_the_win.cory_doctorow/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst b/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst
index a68cdd8..10fa709 100644
--- a/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst
+++ b/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst
@@ -12,7 +12,7 @@ date:
 
 rights:
   copyright: "2010 Cory Doctorow"
-license: "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/ftw \\ 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/ See the end of this document for the complete legalese."
+license: "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 https://craphound.com/ftw \\ Any of the above conditions can be waived if you get my permission. More info here: https://creativecommons.org/licenses/by-nc-sa/3.0/ See the end of this document for the complete legalese."
 
 classify:
   topic_register: "SiSU markup sample:book:novel;book:novel:fiction:counterculture|young adult|science fiction"
@@ -25,19 +25,23 @@ identifier:
 notes:
   description: "A group of teens from around the world find themselves drawn into an online revolution arranged by a mysterious young woman known as Big Sister Nor, who hopes to challenge the status quo and change the world using her virtual connections."
 
-links: [
-    "{ For the Win home }http://craphound.com/ftw",
-    "{ @ Wikipedia }http://en.wikipedia.org/wiki/For_The_Win_(Cory_Doctorow_novel)",
-    "{ @ Amazon.com }http://www.amazon.com/Win-Cory-Doctorow/dp/0765322161",
-    "{ @ Barnes & Noble }http://search.barnesandnoble.com/For-the-Win/Cory-Doctorow/e/9780765322166"
-  ]
+links:
+  - "{ For the Win home }https://craphound.com/ftw"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/For_The_Win_(Cory_Doctorow_novel)"
+  - "{ @ Amazon.com }https://www.amazon.com/Win-Cory-Doctorow/dp/0765322161"
+  - "{ @ Barnes & Noble }https://www.barnesandnoble.com/w/for-the-win-cory-doctorow/1100353612?ean=9780765333841"
 
 make:
   doc_type: "book"
   breaks: "new=:B; break=1"
   auto_num_top_at_level: "1"
-  home_button_text: "{For the Win}http://craphound.com/ftw; {Cory Doctorow}http://www.doctorow.com"
-  footer: "{For the Win}http://craphound.com/ftw; {Cory Doctorow}http://www.doctorow.com"
+  home_button_text:
+    - "{For the Win}https://craphound.com/ftw"
+    - "{Cory Doctorow}https://craphound.com/bio/"
+    - "{Craphound}https://craphound.com/"
+  footer:
+    - "{For the Win}https://craphound.com/ftw"
+    - "{Cory Doctorow}https://craphound.com/"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/conf/document_make b/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/conf/sisu_document_make b/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 ff46fad..aa6cfea 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
@@ -21,17 +21,21 @@ rights:
 classify:
   topic_register: "SiSU markup sample:book:biography;book:biography;copyright;GNU/linux:GPL|copyleft|free software;free software;software:software libré;GPL;linux:GNU|software libré;programming"
 
-links: [
-    "{ Home and Source }http://faifzilla.org/",
-    "{ @ Wikipedia }http://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software",
-    "{ @ Amazon.com }http://www.amazon.com/gp/product/0596002874",
-    "{ @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0596002874"
-  ]
+links:
+  - "{Free as in Freedom 2.0}https://static.fsf.org/nosvn/faif-2.0.pdf"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software"
+  - "{ @ Amazon.com }https://www.amazon.com/gp/product/0596002874"
+  - "{ @ Barnes & Noble }https://www.barnesandnoble.com/w/free-as-in-freedom-sam-williams/1005014966?ean=9781449324643"
 
 make:
   breaks: "new=:A,:B,:C,1"
-  home_button_text: "{Free as in Freedom 2.0}http://stallman.org/; {Free Software Foundation}http://www.fsf.org"
-  footer: "{Free as in Freedom 2.0}http://stallman.org/; {Free Software Foundation}http://www.fsf.org"
+  home_button_text:
+    - "{Free as in Freedom 2.0}https://static.fsf.org/nosvn/faif-2.0.pdf"
+    - "{Free Software Foundation}https://www.fsf.org"
+    - "{Richard Stallman (RMS)}https://stallman.org/"
+  footer:
+    - "{Free Software Foundation}https://www.fsf.org"
+    - "{Richard Stallman (RMS)}https://stallman.org/"
 
 # http://static.fsf.org/nosvn/faif-2.0.pdf
 # http://www.scribd.com/doc/55232810/Free-as-in-Freedom-Richard-Stallman
diff --git a/markup/pod/free_culture.lawrence_lessig/conf/document_make b/markup/pod/free_culture.lawrence_lessig/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/free_culture.lawrence_lessig/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/free_culture.lawrence_lessig/conf/sisu_document_make b/markup/pod/free_culture.lawrence_lessig/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/free_culture.lawrence_lessig/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 a9141fe..361d757 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
@@ -17,7 +17,7 @@ date:
 
 rights:
   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/"
+  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 https://creativecommons.org/licenses/by-nc/1.0/"
 
 classify:
   topic_register: "SiSU markup sample:book:discourse;book:discourse:intellectual property|copyright|creative commons|free culture;copyright;free culture;creative commons;intellectual property:copyright|public domain;intellectual property:copyright:creative commons;book:subject:culture|copyright|society|public policy|mass media;culture;society"
@@ -28,22 +28,26 @@ identifier:
 
 # :isbn="1594200068"
 
-links: [
-    "{Free Culture}http://www.free-culture.cc",
-    "{Remixes}http://www.free-culture.cc/remixes/",
-    "{@ Wikipedia}http://en.wikipedia.org/wiki/Free_Culture_%28book%29",
-    "{@ Amazon.com}http://www.amazon.com/gp/product/1594200068",
-    "{@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=1594200068"
-  ]
+links:
+  - "{Free Culture}https://www.free-culture.cc"
+  - "{Remixes}https://www.free-culture.cc/remixes/"
+  - "{@ Wikipedia}https://en.wikipedia.org/wiki/Free_Culture_%28book%29"
+  - "{@ Amazon.com}https://www.amazon.com/gp/product/1594200068"
+  - "{@ Barnes & Noble}https://www.barnesandnoble.com/w/free-culture-lawrence-lessig/1111513556?ean=9780143034650"
 
 make:
   doc_type: "book"
   breaks: "new=:B; break=1"
-  home_button_image: "{freeculture.home.png }http://www.free-culture.cc"
-  home_button_text: "{Free Culture}http://www.free-culture.cc; {Lawrence Lessig}http://www.lessig.org"
-  footer: "{Free Culture}http://www.free-culture.cc; {Lawrence Lessig}http://www.lessig.org"
+  home_button_text:
+    - "{Free Culture}https://www.free-culture.cc"
+    - "{Lawrence Lessig}https://www.lessig.org"
+  footer:
+    - "{Free Culture}https://www.free-culture.cc"
+    - "{Lawrence Lessig}https://www.lessig.org"
   pot_master: "free_culture.lawrence_lessig.sst"
 
+# home_button_image: "{freeculture.home.png }http://www.free-culture.cc"
+
 :A~ @title-author-date
 
 1~attribution Attribution~#
diff --git a/markup/pod/free_for_all.peter_wayner/conf/document_make b/markup/pod/free_for_all.peter_wayner/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/free_for_all.peter_wayner/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/free_for_all.peter_wayner/conf/sisu_document_make b/markup/pod/free_for_all.peter_wayner/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/free_for_all.peter_wayner/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 5a9e0af..748f844 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
@@ -17,7 +17,7 @@ date:
 
 rights:
   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/"
+  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 https://creativecommons.org/licenses/by-nc/1.0/"
 
 classify:
     topic_register: "
@@ -34,19 +34,22 @@ identifier:
   oclc: "43520955"
   isbn: "9780066620503"
 
-links: [
-    "{ The Original Authoritative and Updated Version of the Text available in pdf }http://www.wayner.org/books/ffa",
-    "{ @ Amazon.com }http://www.amazon.com/gp/product/0066620503",
-    "{ @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0066620503"
-  ]
+links:
+  - "{ The Original Authoritative and Updated Version of the Text available in pdf }https://www.wayner.org/books/ffa"
+  - "{ @ Amazon.com }https://www.amazon.com/gp/product/0066620503"
 
 make:
   doc_type: "book"
   breaks: "new=:A,:B,:C,1"
   auto_num_top_at_level: "1"
-  home_button_image: "{wayner.home.png }http://www.wayner.org/books/ffa/"
-  home_button_text: "{Free For All}http://www.wayner.org/books/ffa/; {Peter Wayner}http://www.wayner.org"
-  footer: "{Free For All}http://www.wayner.org/books/ffa/; {Peter Wayner}http://www.wayner.org"
+  home_button_text:
+    - "{Free For All}https://www.wayner.org/books/ffa/"
+    - "{Peter Wayner}https://www.wayner.org"
+  footer:
+    - "{Free For All}https://www.wayner.org/books/ffa/"
+    - "{Peter Wayner}https://www.wayner.org"
+
+# home_button_image: "{wayner.home.png }http://www.wayner.org/books/ffa/"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/gpl2.fsf/conf/document_make b/markup/pod/gpl2.fsf/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/gpl2.fsf/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/gpl2.fsf/conf/sisu_document_make b/markup/pod/gpl2.fsf/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/gpl2.fsf/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 6cb7e8a..a602e93 100644
--- a/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
+++ b/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
@@ -15,10 +15,8 @@ rights:
 classify:
   topic_register: "SiSU markup sample:document;GPL;software:license;software:GPL;GNU/Linux:license:GPL"
 
-links: [
-    "{ Free Software Foundation }http://www.fsf.org",
-    "{ GPL @ SiSU }http://www.jus.uio.no/sisu/gpl2.fsf"
-  ]
+links:
+  - "{ Free Software Foundation }https://www.fsf.org"
 
 make:
   doc_type: "article"
diff --git a/markup/pod/gpl3.fsf/conf/document_make b/markup/pod/gpl3.fsf/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/gpl3.fsf/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/gpl3.fsf/conf/sisu_document_make b/markup/pod/gpl3.fsf/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/gpl3.fsf/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 b2b4059..891f751 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: "2007 Free Software Foundation, Inc. http://fsf.org/"
+  copyright: "2007 Free Software Foundation, Inc. https://fsf.org/"
   license: "Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed."
 
 classify:
@@ -23,11 +23,10 @@ classify:
 
 publisher: "SiSU on behalf of the Free Software Foundation"
 
-links: [
-    "{ Free Software Foundation }http://www.fsf.org",
-    "{ GPL3 @ FSF }http://gplv3.fsf.org/",
-    "{ GPL3 source text }http://www.gnu.org/licenses/gpl-3.0.txt"
-  ]
+links:
+  - "{ Free Software Foundation }https://www.fsf.org"
+  - "{ GPL3 @ FSF }https://gplv3.fsf.org/"
+  - "{ GPL3 source text }https://www.gnu.org/licenses/gpl-3.0.txt"
 
 make:
   doc_type: "article"
diff --git a/markup/pod/gullivers_travels.jonathan_swift/conf/document_make b/markup/pod/gullivers_travels.jonathan_swift/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/gullivers_travels.jonathan_swift/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/gullivers_travels.jonathan_swift/conf/sisu_document_make b/markup/pod/gullivers_travels.jonathan_swift/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/gullivers_travels.jonathan_swift/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst b/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst
index c26150c..9e9af13 100644
--- a/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst
+++ b/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst
@@ -21,10 +21,9 @@ date:
   modified: "1735"
   added_to_site: "2005-10-30"
 
-links: [
-    "{ Gulliver's Travels }http://en.wikipedia.org/wiki/Gullivers_travels",
-    "{ Johnathan Swift }http://en.wikipedia.org/wiki/Jonathan_Swift"
-  ]
+links:
+  - "{ Gulliver's Travels }https://en.wikipedia.org/wiki/Gullivers_travels"
+  - "{ Johnathan Swift }https://en.wikipedia.org/wiki/Jonathan_Swift"
 
 make:
   doc_type: "book"
diff --git a/markup/pod/little_brother.cory_doctorow/conf/document_make b/markup/pod/little_brother.cory_doctorow/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/little_brother.cory_doctorow/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/little_brother.cory_doctorow/conf/sisu_document_make b/markup/pod/little_brother.cory_doctorow/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/little_brother.cory_doctorow/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 6f3ba21..1dc2149 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
@@ -15,7 +15,7 @@ rights:
   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."
+  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 https://craphound.com/littlebrother \\ * Any of the above conditions can be waived if you get my permission \\ More info here: https://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."
 
 classify:
   topic_register: "SiSU markup sample:book:novel;book:novel:fiction:civil rights|counterculture|young adult|science fiction|computer hackers|terrorism;democracy"
@@ -29,19 +29,24 @@ identifier:
 notes:
   description: "After being interrogated for days by the Department of Homeland Security in the aftermath of a major terrorist attack on San Francisco, California, seventeen-year-old Marcus, released into what is now a police state, decides to use his expertise in computer hacking to set things right."
 
-links: [
-    "{ Little Brother home }http://craphound.com/littlebrother",
-    "{ @ Wikipedia }http://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)",
-    "{ @ Amazon.com }http://www.amazon.com/Little-Brother-Cory-Doctorow/dp/B002IT5OMA",
-    "{ @ Barnes & Noble}http://search.barnesandnoble.com/Little-Brother/Cory-Doctorow/e/9780765319852"
-  ]
+links:
+  - "{ Little Brother home }https://craphound.com/littlebrother"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)"
+  - "{ @ Amazon.com }https://www.amazon.com/Little-Brother-Cory-Doctorow/dp/B002IT5OMA"
+  - "{ @ Barnes & Noble}https://www.barnesandnoble.com/w/little-brother-cory-doctorow/1100352914?ean=9780765323118"
 
 make:
   doc_type: "book"
   cover_image: "{cover_image_wordle_little_brother.png 494x775 \"Little Brother\" }image"
-  home_button_image: "{little_brother_doctorow.png }http://craphound.com/littlebrother"
-  home_button_text: "{Little Brother}http://craphound.com/littlebrother; {Cory Doctorow}http://www.doctorow.com"
-  footer: "{Little Brother}http://craphound.com/littlebrother; {Cory Doctorow}http://www.doctorow.com"
+  home_button_text:
+    - "{Little Brother}https://craphound.com/littlebrother"
+    - "{Cory Doctorow}https://craphound.com/bio/"
+    - "{Craphound}https://craphound.com/"
+  footer:
+    - "{Little Brother}https://craphound.com/littlebrother"
+    - "{Cory Doctorow}https://craphound.com/"
+
+# home_button_image: "{little_brother_doctorow.png }http://craphound.com/littlebrother"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/live-manual/conf/document_make b/markup/pod/live-manual/conf/document_make
new file mode 100644
index 0000000..a123228
--- /dev/null
+++ b/markup/pod/live-manual/conf/document_make
@@ -0,0 +1,23 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+# bold = "/${stable}|${testing}|stretch|buster|sid/"
+# italics = "/live-boot|live-build|live-config|live-config-sysvinit|live-config-systemd|live-manual|live-tools|live-images|live-installer|debian-installer-launcher/"
+# substitute = "/${stable}/,'stretch' /${testing}/,'buster' /${project}/,'Live Systems Project'"
+
+# footer: "{sisudoc.org}https://sisudoc.org; {sources / git}https://git.sisudoc.org/"
+# home_button_image "{sisu.png }https://sisudoc.org"
+
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/live-manual/conf/sisu_document_make b/markup/pod/live-manual/conf/sisu_document_make
deleted file mode 100644
index b511eb8..0000000
--- a/markup/pod/live-manual/conf/sisu_document_make
+++ /dev/null
@@ -1,14 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# bold = "/${stable}|${testing}|stretch|buster|sid/"
-# italics = "/live-boot|live-build|live-config|live-config-sysvinit|live-config-systemd|live-manual|live-tools|live-images|live-installer|debian-installer-launcher/"
-# substitute = "/${stable}/,'stretch' /${testing}/,'buster' /${project}/,'Live Systems Project'"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/live-manual/media/text/_sisu/sisu_document_make b/markup/pod/live-manual/media/text/_sisu/sisu_document_make
deleted file mode 100644
index 99251f9..0000000
--- a/markup/pod/live-manual/media/text/_sisu/sisu_document_make
+++ /dev/null
@@ -1,3 +0,0 @@
-[make]
-home_button_text = "{ Live manual }http://live.debian.net/manual; { Live Systems }http://live.debian.net"
-
diff --git a/markup/pod/live-manual/media/text/conf/sisu_document_make b/markup/pod/live-manual/media/text/conf/sisu_document_make
deleted file mode 100644
index ea86d1c..0000000
--- a/markup/pod/live-manual/media/text/conf/sisu_document_make
+++ /dev/null
@@ -1,14 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-  bold: "/${stable}|${testing}|stretch|buster|sid/"
-  italics: "/live-boot|live-build|live-config|live-config-sysvinit|live-config-systemd|live-manual|live-tools|live-images|live-installer|debian-installer-launcher/"
-  substitute: "/${stable}/,'stretch' /${testing}/,'buster' /${project}/,'Live Systems Project'"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/conf/document_make b/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/conf/sisu_document_make b/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/sisu-manual/conf/document_make b/markup/pod/sisu-manual/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/sisu-manual/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/sisu-manual/conf/sisu_document_make b/markup/pod/sisu-manual/conf/sisu_document_make
deleted file mode 100644
index c15e8cd..0000000
--- a/markup/pod/sisu-manual/conf/sisu_document_make
+++ /dev/null
@@ -1,12 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{doc-reform}https://doc-reform.org; {SiSU}https://sisudoc.org; {sources / git}https://git.sisudoc.org/"
-
-# footer: "{SiSU}https://sisudoc.org; {sources / git}https://git.sisudoc.org/"
-# home_button_text "{sisu.png }https://sisudoc.org"
-
-links: [
-    "{doc-reform}https://doc-reform.org",
-    "{SiSU}https://sisudoc.org",
-    "{sources / git}https://git.sisudoc.org/"
-  ]
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 513788d..ae092ee 100644
--- a/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
+++ b/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
@@ -29,23 +29,21 @@ make:
   substitute: [
       [ "[$]{2}\\{sisudoc\\}", "www.sisudoc.org" ]
     ]
-#substitute: [ "[$]{2}\\{sisudoc\\}", "www.sisudoc.org" ]
   bold: "Debian|SiSU"
   italics: "Linux|GPL|LaTeX|SQL"
-  home_button_text: [
-      "{doc-reform}https://doc-reform.org",
-      "{sources / git}https://git.sisudoc.org/projects/",
-      "{SiSU}https://sisudoc.org"
-    ]
-  footer: [
-      "{SiSU}https://sisudoc.org",
-      "{git}https://git.sisudoc.org/projects"
-    ]
+  home_button_text:
+    - "{doc-reform}https://doc-reform.org"
+    - "{sources / git}https://git.sisudoc.org/projects/"
+    - "{SiSU}https://sisudoc.org"
+  footer:
+    - "{SiSU}https://sisudoc.org"
+    - "{git}https://git.sisudoc.org/projects"
 
 # home_button_text: "{SiSU}https://sisudoc.org; {sources / git}https://git.sisudoc.org/projects/"
 # footer: "{SiSU}https://sisudoc.org; {git}https://git.sisudoc.org/projects"
 # substitute: "/[$]{2}[{]sisudoc[}]/,'www.sisudoc.org'"
-#  substitute: "/${sisudoc}/,'www.sisudoc.org'"
+# substitute: "/${sisudoc}/,'www.sisudoc.org'"
+# substitute: [ "[$]{2}\\{sisudoc\\}", "www.sisudoc.org" ]
 # home_button_image: "{won_benkler.png }https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
 
 :A~ @title-author-date
diff --git a/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/conf/document_make b/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/conf/sisu_document_make b/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 8269d16..f3653ba 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
@@ -25,18 +25,21 @@ identifier:
 notes:
   abstract: "I anatomize a successful open-source project, fetchmail, that was run as a deliberate test of the surprising theories about software engineering suggested by the history of Linux. I discuss these theories in terms of two fundamentally different development styles, the \"cathedral\" model of most of the commercial world versus the \"bazaar\" model of the Linux world. I show that these models derive from opposing assumptions about the nature of the software-debugging task. I then make a sustained argument from the Linux experience for the proposition that \"Given enough eyeballs, all bugs are shallow\", suggest productive analogies with other self-correcting systems of selfish agents, and conclude with some exploration of the implications of this insight for the future of software."
 
-links: [
-    "{ The Cathedral and the Bazaar, Source }http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/",
-    "{ @ Wikipedia }http://en.wikipedia.org/wiki/The_Cathedral_and_the_Bazaar",
-    "{ CatB @ Amazon.com }http://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0596001088/",
-    "{ CatB @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0596001088"
-  ]
+links:
+  - "{ The Cathedral and the Bazaar, Source }https://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/"
+  - "{ @ Wikipedia }https://en.wikipedia.org/wiki/The_Cathedral_and_the_Bazaar"
+  - "{ CatB @ Amazon.com }https://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0596001088/"
+  - "{ CatB @ Barnes & Noble }https://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0596001088"
 
 make:
   doc_type: "article"
   breaks: "break=1"
-  home_button_text: "{The Cathedral and the Bazaar}http://www.catb.org/esr/writings/homesteading/; {Eric S. Raymond}http://www.catb.org/~esr/"
-  footer: "{The Cathedral and the Bazaar}http://www.catb.org/esr/writings/homesteading/; {Eric S. Raymond}http://www.catb.org/~esr/"
+  home_button_text:
+  - "{The Cathedral and the Bazaar}https://www.catb.org/esr/writings/homesteading/"
+  - "{Eric S. Raymond}https://www.catb.org/~esr/"
+  footer:
+  - "{The Cathedral and the Bazaar}https://www.catb.org/esr/writings/homesteading/"
+  - "{Eric S. Raymond}https://www.catb.org/~esr/"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/the_public_domain.james_boyle/conf/document_make b/markup/pod/the_public_domain.james_boyle/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/the_public_domain.james_boyle/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/the_public_domain.james_boyle/conf/sisu_document_make b/markup/pod/the_public_domain.james_boyle/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/the_public_domain.james_boyle/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst b/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst
index 7ffbe3e..d819050 100644
--- a/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst
+++ b/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst
@@ -12,13 +12,13 @@ date:
 
 rights:
   copyright: "2008, James Boyle"
-  license: "Creative Commons Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0 http://creativecommons.org/licenses/by-nc-sa/3.0/"
+  license: "Creative Commons Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0 https://creativecommons.org/licenses/by-nc-sa/3.0/"
 
 classify:
   topic_register: "SiSU markup sample:book:discourse;public domain;intellectual property:public domain"
 
 links: [
-    "{The Public Domain}http://www.thepublicdomain.org/",
+    "{The Public Domain}https://www.thepublicdomain.org/",
     "{James Boyle}http://james-boyle.com/"
   ]
 
@@ -26,8 +26,12 @@ make:
   doc_type: "book"
   breaks: "break=1"
   headings: "none; none; none; none;"
-  home_button_text: "{The Public Domain}http://www.thepublicdomain.org/; {James Boyle}http://james-boyle.com/"
-  footer: "{The Public Domain}http://www.thepublicdomain.org/; {James Boyle}http://james-boyle.com/"
+  home_button_text:
+    - "{The Public Domain}https://www.thepublicdomain.org/"
+    - "{James Boyle}http://james-boyle.com/"
+  footer:
+    - "{The Public Domain}https://www.thepublicdomain.org/"
+    - "{James Boyle}http://james-boyle.com/"
 
 :A~ @title-author-date
 
diff --git a/markup/pod/the_wealth_of_networks.yochai_benkler/conf/document_make b/markup/pod/the_wealth_of_networks.yochai_benkler/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/the_wealth_of_networks.yochai_benkler/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/the_wealth_of_networks.yochai_benkler/conf/sisu_document_make b/markup/pod/the_wealth_of_networks.yochai_benkler/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/the_wealth_of_networks.yochai_benkler/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
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 6ee9a44..7c13fb0 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
@@ -18,7 +18,7 @@ date:
 
 rights:
   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."
+  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. https://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 https://www.benkler.org."
 
 classify:
   topic_register: "SiSU markup sample:book:discourse;networks;Internet;intellectual property:patents|copyright;intellectual property:copyright:creative commons;economics;society;copyright;patents;book:subject:information society|information networks|economics|public policy|society|copyright|patents"
@@ -33,19 +33,24 @@ identifier:
 
 # created: "2006-01-27
 
-links: [
-    "{ The Wealth of Networks, dedicated wiki }http://cyber.law.harvard.edu/wealth_of_networks/Main_Page",
-    "{ Yochai Benkler, wiki }http://www.benkler.org/wealth_of_networks/index.php/Main_Page",
-    "{ @ Wikipedia}http://en.wikipedia.org/wiki/The_Wealth_of_Networks",
-    "{ WoN @ Amazon.com }http://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0300110561/",
-    "{ WoN @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0300110561"
-  ]
+links:
+  - "{ The Wealth of Networks, dedicated wiki }https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
+  - "{ Yochai Benkler }https://www.benkler.org"
+  - "{ @ Wikipedia}https://en.wikipedia.org/wiki/The_Wealth_of_Networks"
+  - "{ WoN @ Amazon.com }https://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0300110561/"
+  - "{ WoN @ Barnes & Noble }https://www.barnesandnoble.com/w/wealth-of-networks-yochai-benkler/1103855195?ean=9780300125771"
 
 make:
   doc_type: "book"
   breaks: "new=:B; break=1"
-  home_button_image: "{won_benkler.png }http://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
-  footer: "{The Wealth of Networks}http://cyber.law.harvard.edu/wealth_of_networks/Main_Page; {Yochai Benkler}http://http://www.benkler.org"
+  home_button_text:
+    - "{The Wealth of Networks}https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
+    - "{Yochai Benkler}https://www.benkler.org"
+  footer:
+    - "{The Wealth of Networks}https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
+    - "{Yochai Benkler}https://www.benkler.org"
+
+# home_button_image: "{won_benkler.png }https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
 
 #% -- body ---
 
diff --git a/markup/pod/through_the_looking_glass.lewis_carroll/conf/document_make b/markup/pod/through_the_looking_glass.lewis_carroll/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/through_the_looking_glass.lewis_carroll/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/through_the_looking_glass.lewis_carroll/conf/sisu_document_make b/markup/pod/through_the_looking_glass.lewis_carroll/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/through_the_looking_glass.lewis_carroll/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst b/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst
index 5d693ba..604827b 100644
--- a/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst
+++ b/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst
@@ -21,10 +21,9 @@ rights:
 classify:
   topic_register: "SiSU markup sample:book:novel;book:novel:fiction:fantasy|children's fiction"
 
-links: [
-    "{ Through the Looking Glass @ Wikipedia }http://en.wikipedia.org/wiki/Through_the_Looking-Glass",
-    "{ Lewis Carroll @ Wikipedia }http://en.wikipedia.org/wiki/Lewis_Carroll"
-  ]
+links:
+  - "{ Through the Looking Glass @ Wikipedia }https://en.wikipedia.org/wiki/Through_the_Looking-Glass"
+  - "{ Lewis Carroll @ Wikipedia }https://en.wikipedia.org/wiki/Lewis_Carroll"
 
 make:
   doc_type: "book"
diff --git a/markup/pod/two_bits.christopher_kelty/conf/document_make b/markup/pod/two_bits.christopher_kelty/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/two_bits.christopher_kelty/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/two_bits.christopher_kelty/conf/sisu_document_make b/markup/pod/two_bits.christopher_kelty/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/two_bits.christopher_kelty/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst b/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst
index e005da7..3b6c948 100644
--- a/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst
+++ b/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst
@@ -12,7 +12,7 @@ date:
 
 rights:
   copyright: "2008 Duke University Press \\ Printed in the United States of America on acid-free paper ∞ \\ Designed by C. H. Westmoreland \\ Typeset in Charis (an Open Source font) by Achorn International \\ Library of Congress Cataloging-in-Publication data and republication acknowledgments appear on the last printed pages of this book."
-  license: "Licensed under the Creative Commons Attribution-NonCommercial-Share Alike License, available at http://creativecommons.org/licenses/by-nc-sa/3.0/ or by mail from Creative Commons, 559 Nathan Abbott Way, Stanford, Calif. 94305, U.S.A. \"NonCommercial\" as defined in this license specifically excludes any sale of this work or any portion thereof for money, even if sale does not result in a profit by the seller or if the sale is by a 501(c)(3) nonprofit or NGO. \\ Duke University Press gratefully acknowledges the support of HASTAC (Humanities, Arts, Science, and Technology Advanced Collaboratory), which provided funds to help support the electronic interface of this book. \\ Two Bits is accessible on the Web at twobits.net."
+  license: "Licensed under the Creative Commons Attribution-NonCommercial-Share Alike License, available at https://creativecommons.org/licenses/by-nc-sa/3.0/ or by mail from Creative Commons, 559 Nathan Abbott Way, Stanford, Calif. 94305, U.S.A. \"NonCommercial\" as defined in this license specifically excludes any sale of this work or any portion thereof for money, even if sale does not result in a profit by the seller or if the sale is by a 501(c)(3) nonprofit or NGO. \\ Duke University Press gratefully acknowledges the support of HASTAC (Humanities, Arts, Science, and Technology Advanced Collaboratory), which provided funds to help support the electronic interface of this book. \\ Two Bits is accessible on the Web at twobits.net."
 
 classify:
   topic_register: "SiSU markup sample:book:discourse;open source software:social aspects;software:development:geeks;anthropology:geeks;book:subject:anthropology|information society|geeks;society;programming;society:information society;"
@@ -22,20 +22,22 @@ identifier:
 
 # isbn: "978082234264-9"
 
-links: [
-    "{ Two Bits home page }http://twobits.net/",
-    "{ Christopher M. Kelty }http://kelty.org/",
-    "{ Two Bits @ Amazon.com }http://www.amazon.com/Two-Bits-Cultural-Significance-Software/dp/0822342642",
-    "{ Two Bits @ Barnes & Noble }http://search.barnesandnoble.com/Two-Bits/Christopher-M-Kelty/e/9780822342649",
-    "{ Discussion @ Lambda the Ultimate }http://lambda-the-ultimate.org/node/3696"
-  ]
+links:
+  - "{ Two Bits home page }https://twobits.net/"
+  - "{ Christopher M. Kelty }https://kelty.org/"
+  - "{ Two Bits @ Amazon.com }https://www.amazon.com/Two-Bits-Cultural-Significance-Software/dp/0822342642"
+  - "{ Two Bits @ Barnes & Noble }https://www.barnesandnoble.com/w/two-bits-christopher-m-kelty/1100550480?ean=9780822389002"
 
 make:
   doc_type: "book"
   breaks: "new=:B; break=1"
   italics: "/Two Bits/i"
-  home_button_text: "{Two Bits}http://twobits.net; {Christopher M. Kelty}http://kelty.org/"
-  footer: "{Two Bits}http://twobits.net; {Christopher M. Kelty}http://kelty.org/"
+  home_button_text:
+    - "{Two Bits}https://twobits.net"
+    - "{Christopher M. Kelty}https://kelty.org/"
+  footer:
+    - "{Two Bits}https://twobits.net"
+    - "{Christopher M. Kelty}https://kelty.org/"
 
 # home_button_image = "{2bits.png }http://twobits.net"
 
diff --git a/markup/pod/viral_spiral.david_bollier/conf/document_make b/markup/pod/viral_spiral.david_bollier/conf/document_make
new file mode 100644
index 0000000..c1bd855
--- /dev/null
+++ b/markup/pod/viral_spiral.david_bollier/conf/document_make
@@ -0,0 +1,16 @@
+make:
+  breaks: "break=1"
+  home_button_text: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{doc-reform.org}https://doc-reform.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+  footer: [
+    "{sisudoc.org}https://sisudoc.org",
+    "{sources / git}https://git.sisudoc.org/"
+  ]
+links: [
+  "{sisudoc.org}https://sisudoc.org",
+  "{doc-reform.org}https://doc-reform.org",
+  "{sources / git}https://git.sisudoc.org/"
+]
diff --git a/markup/pod/viral_spiral.david_bollier/conf/sisu_document_make b/markup/pod/viral_spiral.david_bollier/conf/sisu_document_make
deleted file mode 100644
index 039537e..0000000
--- a/markup/pod/viral_spiral.david_bollier/conf/sisu_document_make
+++ /dev/null
@@ -1,11 +0,0 @@
-make:
-  breaks: "break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-
-# footer: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/"
-# home_button_text "{sisu.png }http://sisudoc.org"
-
-links: [
-    "{SiSU}http://sisudoc.org",
-    "{sources / git}http://git.sisudoc.org/"
-  ]
diff --git a/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst b/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst
index 973062a..502a71c 100644
--- a/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst
+++ b/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst
@@ -21,20 +21,23 @@ classify:
 identifier:
   oclc: "227016731"
 
-links: [
-    "{ Viral Spiral }http://viralspiral.cc/",
-    "{ David Bollier }http://www.bollier.org/",
-    "{ David Bollier @ Wikipedia }http://en.wikipedia.org/wiki/David_Bollier",
-    "{ Viral Spiral @ Amazon.com }http://www.amazon.com/Viral-Spiral-Commoners-Digital-Republic/dp/1595583963",
-    "{ Viral Spiral @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=1595583963"
-  ]
+links:
+  - "{Viral Spiral}https://www.bollier.org/viral-spiral-how-commoners-built-digital-republic-their-own"
+  - "{ David Bollier }https://www.bollier.org/"
+  - "{ David Bollier @ Wikipedia }https://en.wikipedia.org/wiki/David_Bollier"
+  - "{ Viral Spiral @ Amazon.com }https://www.amazon.com/Viral-Spiral-Commoners-Digital-Republic/dp/1595583963"
+  - "{ Viral Spiral @ Barnes & Noble }https://www.barnesandnoble.com/w/viral-spiral-david-bollier/1102505325?ean=9781595583963"
 
 make:
   doc_type: "book"
   breaks: "new=:B,C; break=1"
   texpdf_font: "Liberation Sans"
-  home_button_text: "{Viral Spiral}http://viralspiral.cc/; {David Bollier}http://www.bollier.org/"
-  footer: "{Viral Spiral}http://viralspiral.cc/; {David Bollier}http://www.bollier.org/"
+  home_button_text:
+    - "{Viral Spiral}https://www.bollier.org/viral-spiral-how-commoners-built-digital-republic-their-own"
+    - "{David Bollier}https://www.bollier.org/"
+  footer:
+    - "{Viral Spiral}https://www.bollier.org/viral-spiral-how-commoners-built-digital-republic-their-own"
+    - "{David Bollier}https://www.bollier.org/"
 
 :A~ @title-author-date
 
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 d2bc3b8..9c00f96 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
@@ -36,11 +36,8 @@ make:
     - none
     - CHAPTER
 
-#   headings: [ BOOK|FIRST|SECOND, none, none, CHAPTER ]
-
 links:
-  - \{Wikipedia entry \}http://en.wikipedia.org/wiki/War_and_peace
-  - \{ War and Peace @ SiSU \}http://www.jus.uio.no/sisu/war.and.peace.leo.tolstoy
+  - "{Wikipedia entry }https://en.wikipedia.org/wiki/War_and_peace"
 
 # SiSU: http://www.jus.uio.no/sisu
 # SiSU markup for 0.16 and later