markup samples, doc headers: urls & yaml style

3 files changed, 18 insertions, 15 deletions

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"