Merge branch 'upstream' into debian/sid

6 files changed, 28 insertions, 28 deletions

diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
index 5bf3532b..ad1d42a6 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
@@ -57,7 +57,7 @@ module SiSU_Viz
     end
     #% text
     def text_hp
-    	' SiSU'
+      ' SiSU'
     end
     def text_home
       'SiSU'
@@ -71,7 +71,7 @@ module SiSU_Viz
     end
     #% banner
     def banner_home_button
-  	  %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
+      %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
     end
     def banner_home_and_index_buttons
       %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
@@ -82,13 +82,13 @@ module SiSU_Viz
   end
   class TeX
     def header_center
-	    "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
+      "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
     end
     def home_url
-	    "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
+      "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
     end
     def home
-	    "\\href{#{@vz.url_site}/}{Ralph Amissah}"
+      "\\href{#{@vz.url_site}/}{Ralph Amissah}"
     end
     def owner_chapter
       'Document owner details'
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
index a5ea67ec..e998624b 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
@@ -46,7 +46,7 @@ module SiSU_Viz
     end
     #% txt
     def txt_hp
-    	'Free Software Foundation'
+      'Free Software Foundation'
     end
     def txt_home                                                                     # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
       #"www.jus.uio.no/sisu/"
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
index 379fccee..47d2d28f 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
@@ -56,13 +56,13 @@ module SiSU_Viz
   end
   class TeX
     def header_center
-	    "\\chead{\\href{#{@vz.url_home}}{www.gutenberg.net}}"
+      "\\chead{\\href{#{@vz.url_home}}{www.gutenberg.net}}"
     end
     def home_url
-	    "\\href{#{@vz.url_home}}{www.gutenberg.net}"
+      "\\href{#{@vz.url_home}}{www.gutenberg.net}"
     end
     def home
-	    "\\href{#{@vz.url_home}}{Gutenberg Project}"
+      "\\href{#{@vz.url_home}}{Gutenberg Project}"
     end
     def owner_chapter
       "Document owner details"
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
index f4a7223f..d1f6a889 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
@@ -41,11 +41,11 @@ module SiSU_Viz
     end
     #% txt
     def txt_hp
-    	'Kdissert, Document Mapping'
+      'Kdissert, Document Mapping'
     end
     def txt_home                                                                     # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
       #"www.jus.uio.no/sisu/"
-    	'SiSU (document prepared using Kdissert)'
+      'SiSU (document prepared using Kdissert)'
     end
     #% icon
     def icon_home_button
@@ -56,10 +56,10 @@ module SiSU_Viz
     end
     #% banner
     def banner_home_button
-		  %{<table border="0" summary="home button" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/">#{png_home}</a></td></tr></table>\n}
+      %{<table border="0" summary="home button" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/">#{png_home}</a></td></tr></table>\n}
     end
     def banner_home_and_index_buttons
-	    %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
+      %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
     end
     def banner_band
       %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_hp}/" target="_top">#{png_home}</a>#{table_close}}
@@ -69,13 +69,13 @@ module SiSU_Viz
   end
   class TeX
     def header_center
-	    "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
+      "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
     end
     def home_url
-	    "\\href{#{@vz.url_site}/}{www.fsf.org}"
+      "\\href{#{@vz.url_site}/}{www.fsf.org}"
     end
     def home
-	    "\\href{#{@vz.url_site}/}{Free Software Foundation}"
+      "\\href{#{@vz.url_site}/}{Free Software Foundation}"
     end
     def owner_chapter
       "Document owner details"
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
index 593a2d45..95f936a8 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
@@ -50,11 +50,11 @@ module SiSU_Viz
     end
     #% txt
     def txt_hp
-    	'Free as in Freedom'
+      'Free as in Freedom'
     end
     def txt_home                                                                     # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
       #"www.jus.uio.no/sisu/"
-    	'Free as in Freedom'
+      'Free as in Freedom'
     end
     #% icon
     def icon_home_button
@@ -65,10 +65,10 @@ module SiSU_Viz
     end
     #% banner
     def banner_home_button
-		  %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
+      %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
     end
     def banner_home_and_index_buttons
-	    %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
+      %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
     end
     def banner_band
       %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
@@ -85,13 +85,13 @@ module SiSU_Viz
   end
   class TeX
     def header_center
-	    "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
+      "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
     end
     def home_url
-	    "\\href{#{@vz.url_site}/}{www.gnu.org}"
+      "\\href{#{@vz.url_site}/}{www.gnu.org}"
     end
     def home
-	    "\\href{#{@vz.url_site}/}{GNU - Free Software Foundation}"
+      "\\href{#{@vz.url_site}/}{GNU - Free Software Foundation}"
     end
     def owner_chapter
       "Document owner details"
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
index 5bf3532b..ad1d42a6 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
@@ -57,7 +57,7 @@ module SiSU_Viz
     end
     #% text
     def text_hp
-    	'&nbsp;SiSU'
+      '&nbsp;SiSU'
     end
     def text_home
       'SiSU'
@@ -71,7 +71,7 @@ module SiSU_Viz
     end
     #% banner
     def banner_home_button
-  	  %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
+      %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
     end
     def banner_home_and_index_buttons
       %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
@@ -82,13 +82,13 @@ module SiSU_Viz
   end
   class TeX
     def header_center
-	    "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
+      "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
     end
     def home_url
-	    "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
+      "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
     end
     def home
-	    "\\href{#{@vz.url_site}/}{Ralph Amissah}"
+      "\\href{#{@vz.url_site}/}{Ralph Amissah}"
     end
     def owner_chapter
       'Document owner details'