[SCM] live-manual branch, debian, updated. debian/3.0_a9-1-42-gc85f6f4
chals
chals at altorricon.com
Mon Feb 6 22:41:52 UTC 2012
The following commit has been merged in the debian branch:
commit 013809bf800cccff8385e2f22678b672e15cad1c
Author: chals <chals at altorricon.com>
Date: Sat Dec 17 15:54:57 2011 +0100
Rearranging things to work with sisu3, thanks to Ben Armstrong and Ralph Amissah.
diff --git a/Makefile b/Makefile
index e5c8756..933a701 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ tidy:
sed -i -e 's|[ \t]*$$||' $${FILE}; \
done
-build:
+build: clean
#FIXME: do a proper dependency-based build
#FORMATS = epub html odf pdf txt
#...
@@ -28,52 +28,41 @@ build:
#etc.
@# FIXME: sisu-concordance sisu-pg sisu-sqlite
+ cd $(CURDIR)/manual; \
+ sisu --configure
for LANGUAGE in $(LANGUAGES); \
do \
- cd $(CURDIR)/manual/$${LANGUAGE}; \
- sisu-epub -v live-manual.ssm; \
- sisu-html -v live-manual.ssm; \
- sisu-odf -v live-manual.ssm; \
- sisu-pdf -v live-manual.ssm; \
- sisu-txt -v live-manual.ssm; \
- done
+ cd $(CURDIR)/manual; \
+ sisu-epub -v $${LANGUAGE}/live-manual.ssm; \
+ sisu-html -v $${LANGUAGE}/live-manual.ssm; \
+ sisu-odf -v $${LANGUAGE}/live-manual.ssm; \
+ sisu-pdf -v $${LANGUAGE}/live-manual.ssm; \
+ sisu-txt -v $${LANGUAGE}/live-manual.ssm; \
+ done; \
+ sisu --manifest -v $${LANGUAGE}/live-manual.ssm
# for FILE in build/manual/live-manual/*.$${LANGUAGE}.html; \
# do \
# ../bin/fix-sisu-html.rb $${FILE}; \
# ([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
# done; \
-autobuild: clean build
- rm -rf build
- cp -a html build
- cp -a manual/en/_sisu build
-
+autobuild: build
+
+ cp -a html/index.html build/manual;\
+ cd build/manual && rm -f toc.html; \
+
set +e; for LANGUAGE in $(LANGUAGES); \
do \
- FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/manual; \
- TODIR=$(CURDIR)/build; \
- mkdir -p $${TODIR}; \
+ FROMDIR=$(CURDIR)/manual/$${LANGUAGE}; \
+ TODIR=$(CURDIR)/build/manual/$${LANGUAGE}; \
+ rm -rf manifest;\
+ cp $${FROMDIR}/index.html.in $${TODIR};\
cd $${TODIR}; \
- mkdir -p epub; \
- cp $${FROMDIR}/epub/live-manual.$${LANGUAGE}.epub epub; \
- mkdir -p html; \
- cp $${FROMDIR}/live-manual/*.$${LANGUAGE}.html html; \
- mv html/scroll.$${LANGUAGE}.html html/live-manual.$${LANGUAGE}.html; \
- rm -f html/toc.$${LANGUAGE}.html html/sisu_manifest.$${LANGUAGE}.html html/metadata.$${LANGUAGE}.html; \
- mkdir -p odf; \
- cp $${FROMDIR}/live-manual/opendocument.$${LANGUAGE}.odt odf/live-manual.$${LANGUAGE}.odt; \
- mkdir -p pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
- mkdir -p txt; \
- cp $${FROMDIR}/live-manual/plain.$${LANGUAGE}.txt txt/live-manual.$${LANGUAGE}.txt; \
sed -e "s|@DATE_BUILD@|$(shell LC_ALL=C date -R)|" \
-e "s|@DATE_CHANGE@|$(shell LC_ALL=C git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's| ||g')|" \
- $${FROMDIR}/../../index.html.in > index.$${LANGUAGE}.html; \
+ $${TODIR}/index.html.in > index.html && rm $${TODIR}/index.html.in; \
done
-
+
commit: tidy test
$(MAKE) -C manual rebuild
@@ -91,37 +80,24 @@ commit: tidy test
@echo " * git push"
install:
-
- for LANGUAGE in $(LANGUAGES); \
- do \
- FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/manual; \
+ FROMDIR=$(CURDIR)/build/manual; \
TODIR=$(DESTDIR)/usr/share/doc/live-manual; \
- mkdir -p $${TODIR}; \
- cd $${TODIR}; \
- mkdir -p epub; \
- cp $${FROMDIR}/epub/live-manual.$${LANGUAGE}.epub epub; \
- mkdir -p html; \
- cp $${FROMDIR}/live-manual/*.$${LANGUAGE}.html html; \
- mv html/scroll.$${LANGUAGE}.html html/live-manual.$${LANGUAGE}.html; \
- rm -f html/toc.$${LANGUAGE}.html html/sisu_manifest.$${LANGUAGE}.html html/metadata.$${LANGUAGE}.html; \
- mkdir -p odf; \
- cp $${FROMDIR}/live-manual/opendocument.$${LANGUAGE}.odt odf/live-manual.$${LANGUAGE}.odt; \
- mkdir -p txt; \
- cp $${FROMDIR}/live-manual/plain.$${LANGUAGE}.txt txt/live-manual.$${LANGUAGE}.txt; \
- mkdir -p pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
+ DESTDIR=/usr/share/doc/live-manual; \
+ cp -ra $${FROMDIR} $${DESTDIR}; \
+ cd $${DESTDIR}; \
+ rm -f index.html toc.html; \
+ set +e; for LANGUAGE in $(LANGUAGES); \
+ do \
+ cd $${DESTDIR}/$${LANGUAGE} && rm -rf manifest; \
done
+
- cp -a manual/en/_sisu $(DESTDIR)/usr/share/doc/live-manual
uninstall:
rm -rf $(DESTDIR)/usr/share/doc/live-manual
clean:
- rm -rf manual/*/build
+ rm -rf build
distclean: clean
rm -rf build
diff --git a/html/index.html b/html/index.html
index 175f09d..2ffe3b3 100644
--- a/html/index.html
+++ b/html/index.html
@@ -10,13 +10,13 @@
<h3>Available Languages</h3>
<ul>
- <li><a href="index.de.html">Deutsch (German)</a></li>
- <li><a href="index.en.html">English</a></li>
- <li><a href="index.es.html">Español (Spanish)</a></li>
- <li><a href="index.fr.html">Français (French)</a></li>
- <li><a href="index.it.html">Italiano (Italian)</a></li>
- <li><a href="index.pt_BR.html">Português Brasil (Brazilian Portuguese)</a></li>
- <li><a href="index.ro.html">Româna (Romanian)</a></li>
+ <li><a href="de/index.html">Deutsch (German)</a></li>
+ <li><a href="en/index.html">English</a></li>
+ <li><a href="es/index.html">Español (Spanish)</a></li>
+ <li><a href="fr/index.html">Français (French)</a></li>
+ <li><a href="it/index.html">Italiano (Italian)</a></li>
+ <li><a href="pt_BR/index.html">Português Brasil (Brazilian Portuguese)</a></li>
+ <li><a href="ro/index.html">Româna (Romanian)</a></li>
<!-- <li><a href="ro">Român&acaron; (Romanian)</a></li> -->
</ul>
diff --git a/manual/Makefile b/manual/Makefile
index f2007e3..6266e7b 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -41,14 +41,15 @@ build: po4a.cfg
fi
po4a --keep 0 --no-backups --package-name live-manual $(PO4A_FLAGS) po4a.cfg
-
- for LANGUAGE in $(LANGUAGES); \
- do \
- cp -a en/_sisu $${LANGUAGE}; \
- done
+ #Somebody please delete these commented lines when cleaning the file.
+ #for LANGUAGE in $(LANGUAGES); \
+ #do \
+ # cp -a en/_sisu $${LANGUAGE}; \
+ #done
clean:
rm -f po/*/*.po~
+ rm -rf ../build
distclean: clean
rm -f po4a.cfg
diff --git a/manual/de/_sisu/.empty b/manual/_sisu/.empty
similarity index 100%
rename from manual/de/_sisu/.empty
rename to manual/_sisu/.empty
diff --git a/manual/de/_sisu/image/.empty b/manual/_sisu/image/.empty
similarity index 100%
rename from manual/de/_sisu/image/.empty
rename to manual/_sisu/image/.empty
diff --git a/manual/de/_sisu/sisurc.yml b/manual/_sisu/sisurc.yml
similarity index 95%
rename from manual/de/_sisu/sisurc.yml
rename to manual/_sisu/sisurc.yml
index 788cd67..b5a0828 100644
--- a/manual/de/_sisu/sisurc.yml
+++ b/manual/_sisu/sisurc.yml
@@ -15,7 +15,7 @@
# #all: 'image'
#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
webserv:
- path: 'build'
+ path: '../build'
url_root: 'http://live.debian.net/manual' #without dir stub
# images: '_sisu/image'
# man: 'man'
@@ -124,3 +124,7 @@ program_set:
# hyperestraier:
# flag: true
# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+#output_dir_structure_by: filename
+#output_dir_structure_by: filetype
+output_dir_structure_by: language
diff --git a/manual/de/_sisu/skin/doc/skin_debian-live.rb b/manual/_sisu/skin/doc/skin_debian-live.rb
similarity index 100%
rename from manual/de/_sisu/skin/doc/skin_debian-live.rb
rename to manual/_sisu/skin/doc/skin_debian-live.rb
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index acc1e36..5b6997d 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -27,15 +27,15 @@ beitragen</a> kann, können im Handbuch gefunden werden.
<h3>Verfügbare Formate</h3>
<ul>
- <li><a href="epub/live-manual.de.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.de.html">mehrere Seiten</a>, <a
-href="html/live-manual.de.html">einzelne Seite</a></li>
- <li><a href="odf/live-manual.de.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.de.pdf">A4 Hochformat</a>, <a
-href="pdf/live-manual.landscape-a4.de.pdf">A4 Querformat</a>, <a
-href="pdf/live-manual.portrait-letter.de.pdf">Letter Hochformat</a>, <a
-href="pdf/live-manual.landscape-letter.de.pdf">Letter Querformat</a></li>
- <li><a href="txt/live-manual.de.txt">Text</a></li>
+ <li><a href="epub/live-manual.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.html">multi page</a>, <a
+href="html/live-manual.html">single page</a></li>
+ <li><a href="odt/live-manual.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait.a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape.a4.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait.letter.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape.letter.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index b1444a1..4c14343 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 2011-12-07
+ :published: 2011-12-17
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/en/_sisu/.empty b/manual/en/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/en/_sisu/image/.empty b/manual/en/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/en/_sisu/sisurc.yml b/manual/en/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/en/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/en/_sisu/skin/doc/skin_debian-live.rb b/manual/en/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/en/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- 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}
- 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"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index 2c630f3..cda54a0 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -20,11 +20,11 @@
<h3>Available Formats</h3>
<ul>
- <li><a href="epub/live-manual.en.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.en.html">multi page</a>, <a href="html/live-manual.en.html">single page</a></li>
- <li><a href="odf/live-manual.en.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
- <li><a href="txt/live-manual.en.txt">Plain text</a></li>
+ <li><a href="epub/live-manual.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.html">multi page</a>, <a href="html/live-manual.html">single page</a></li>
+ <li><a href="odt/live-manual.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait.a4.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape.a4.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait.letter.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape.letter.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 1311759..6cd96a9 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-07
+ :published: 2011-12-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/_sisu/.empty b/manual/es/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/es/_sisu/image/.empty b/manual/es/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/es/_sisu/sisurc.yml b/manual/es/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/es/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/es/_sisu/skin/doc/skin_debian-live.rb b/manual/es/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/es/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- 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}
- 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"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/es/index.html.in b/manual/es/index.html.in
index ffc31ff..7a2257e 100644
--- a/manual/es/index.html.in
+++ b/manual/es/index.html.in
@@ -26,16 +26,15 @@ href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
<h3>Formatos Disponibles</h3>
<ul>
- <li><a href="epub/live-manual.es.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.es.html">una página por capítulo</a>, <a
-href="html/live-manual.es.html">todo el manual en una página</a></li>
- <li><a href="odf/live-manual.es.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.es.pdf">A4 vertical</a>, <a
-href="pdf/live-manual.landscape-a4.es.pdf">A4 apaisado</a>, <a
-href="pdf/live-manual.portrait-letter.es.pdf">Carta (letter) vertical</a>,
-<a href="pdf/live-manual.landscape-letter.es.pdf">Carta (letter)
-apaisado</a></li>
- <li><a href="txt/live-manual.es.txt">Texto sin formato</a></li>
+ <li><a href="epub/live-manual.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.html">multi page</a>, <a
+href="html/live-manual.html">single page</a></li>
+ <li><a href="odt/live-manual.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait.a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape.a4.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait.letter.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape.letter.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 275a046..4aa8458 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2011-12-07
+ :published: 2011-12-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/_sisu/.empty b/manual/fr/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/fr/_sisu/image/.empty b/manual/fr/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/fr/_sisu/sisurc.yml b/manual/fr/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/fr/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/fr/_sisu/skin/doc/skin_debian-live.rb b/manual/fr/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/fr/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- 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}
- 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"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index 2ecf6ad..0c215cf 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -26,15 +26,15 @@ contribuer</a> au manuel.
<h3>Formats disponibles</h3>
<ul>
- <li><a href="epub/live-manual.fr.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.fr.html">multi pages</a>, <a
-href="html/live-manual.fr.html">page unique</a></li>
- <li><a href="odf/live-manual.fr.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.fr.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.fr.pdf">A4 paysage</a>, <a
-href="pdf/live-manual.portrait-letter.fr.pdf">US portrait</a>, <a
-href="pdf/live-manual.landscape-letter.fr.pdf">US paysage</a></li>
- <li><a href="txt/live-manual.fr.txt">Texte brut</a></li>
+ <li><a href="epub/live-manual.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.html">multi page</a>, <a
+href="html/live-manual.html">single page</a></li>
+ <li><a href="odt/live-manual.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait.a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape.a4.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait.letter.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape.letter.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 8318e9f..e708116 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2011-12-07
+ :published: 2011-12-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/_sisu/.empty b/manual/it/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/it/_sisu/image/.empty b/manual/it/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/it/_sisu/sisurc.yml b/manual/it/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/it/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/it/_sisu/skin/doc/skin_debian-live.rb b/manual/it/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/it/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- 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}
- 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"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/it/index.html.in b/manual/it/index.html.in
index d2e2c94..59d7d7a 100644
--- a/manual/it/index.html.in
+++ b/manual/it/index.html.in
@@ -26,15 +26,15 @@ contribuire</a> al manuale.
<h3>Formati disponibili</h3>
<ul>
- <li><a href="epub/live-manual.it.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.it.html">multi-pagina</a>, <a
-href="html/live-manual.it.html">pagina unica</a></li>
- <li><a href="odf/live-manual.it.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.it.pdf">A4 verticale</a>, <a
-href="pdf/live-manual.landscape-a4.it.pdf">A4 orizzontale</a>, <a
-href="pdf/live-manual.portrait-letter.it.pdf">lettera verticale</a>, <a
-href="pdf/live-manual.landscape-letter.it.pdf">lettera orizzontale</a></li>
- <li><a href="txt/live-manual.it.txt">Testo semplice</a></li>
+ <li><a href="epub/live-manual.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.html">multi page</a>, <a
+href="html/live-manual.html">single page</a></li>
+ <li><a href="odt/live-manual.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait.a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape.a4.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait.letter.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape.letter.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index f674ede..7773f2f 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-12-07
+ :published: 2011-12-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index aa9d073..d87e1f2 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 3.0~a3-1\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -54,30 +54,44 @@ msgstr "Verfügbare Formate"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:23
-msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.de.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.en.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.de.html\">mehrere Seiten</a>, <a href=\"html/live-"
"manual.de.html\">einzelne Seite</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.de.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a "
+#| "href=\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href="
+#| "\"pdf/live-manual.portrait-letter.en.pdf\">letter portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-letter.en.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait.a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape.a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait.letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape.letter.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.de.pdf\">A4 Hochformat</a>, <a "
"href=\"pdf/live-manual.landscape-a4.de.pdf\">A4 Querformat</a>, <a href="
@@ -86,7 +100,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
-msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.de.txt\">Text</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 74560ec..7665017 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-12-07 22:14+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-07\n"
+" :published: 2011-12-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/index.html.in.po b/manual/po/es/index.html.in.po
index 92bae4a..82173e6 100644
--- a/manual/po/es/index.html.in.po
+++ b/manual/po/es/index.html.in.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-12-03 19:03+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -63,30 +63,44 @@ msgstr "Formatos Disponibles"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:23
-msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.es.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.en.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.es.html\">una página por capítulo</a>, <a href="
"\"html/live-manual.es.html\">todo el manual en una página</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.es.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a "
+#| "href=\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href="
+#| "\"pdf/live-manual.portrait-letter.en.pdf\">letter portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-letter.en.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait.a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape.a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait.letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape.letter.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.es.pdf\">A4 vertical</a>, <a href="
"\"pdf/live-manual.landscape-a4.es.pdf\">A4 apaisado</a>, <a href=\"pdf/live-"
@@ -95,7 +109,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
-msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.es.txt\">Texto sin formato</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 8ce62c2..87d21ea 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-12-07 22:14+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -53,7 +53,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-07\n"
+" :published: 2011-12-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index 1402d72..8cf80d6 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-12-03 19:04+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -58,30 +58,44 @@ msgstr "Formats disponibles"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:23
-msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.fr.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.en.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.fr.html\">multi pages</a>, <a href=\"html/live-"
"manual.fr.html\">page unique</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.fr.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a "
+#| "href=\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href="
+#| "\"pdf/live-manual.portrait-letter.en.pdf\">letter portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-letter.en.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait.a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape.a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait.letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape.letter.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.fr.pdf\">A4 portrait</a>, <a href="
"\"pdf/live-manual.landscape-a4.fr.pdf\">A4 paysage</a>, <a href=\"pdf/live-"
@@ -90,7 +104,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
-msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.fr.txt\">Texte brut</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index b238394..303441d 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-07 22:14+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-06-19 16:32+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-07\n"
+" :published: 2011-12-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/index.html.in.po b/manual/po/it/index.html.in.po
index 9e4ee21..ef6c58b 100644
--- a/manual/po/it/index.html.in.po
+++ b/manual/po/it/index.html.in.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-12-07 22:11+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -59,30 +59,44 @@ msgstr "Formati disponibili"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:23
-msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.it.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.en.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.it.html\">multi-pagina</a>, <a href=\"html/live-"
"manual.it.html\">pagina unica</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.it.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a "
+#| "href=\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href="
+#| "\"pdf/live-manual.portrait-letter.en.pdf\">letter portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-letter.en.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait.a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape.a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait.letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape.letter.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.it.pdf\">A4 verticale</a>, <a "
"href=\"pdf/live-manual.landscape-a4.it.pdf\">A4 orizzontale</a>, <a href="
@@ -91,7 +105,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
-msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.it.txt\">Testo semplice</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index c919e36..445d811 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-07 22:14+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-07\n"
+" :published: 2011-12-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/pt_BR/index.html.in.po
index 9155185..0f528e9 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-11-25 22:27+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -55,30 +55,44 @@ msgstr "Formatos Disponíveis"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:23
-msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.pt_BR.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.en.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.pt_BR.html\">Páginas multiplas</a>, <a href="
"\"html/live-manual.pt_BR.html\">Página única</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.pt_BR.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a "
+#| "href=\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href="
+#| "\"pdf/live-manual.portrait-letter.en.pdf\">letter portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-letter.en.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait.a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape.a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait.letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape.letter.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.pt_BR.pdf\">A4 retrato</a>, <a "
"href=\"pdf/live-manual.landscape-a4.pt_BR.pdf\">A4 paisagem</a>, <a href="
@@ -87,7 +101,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
-msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.pt_BR.txt\">Texto plano</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 133937b..504a9cb 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-07 22:14+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-07\n"
+" :published: 2011-12-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/index.html.in.po b/manual/po/ro/index.html.in.po
index e93290f..540a1c1 100644
--- a/manual/po/ro/index.html.in.po
+++ b/manual/po/ro/index.html.in.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2011-12-03 15:52+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -55,30 +55,44 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:23
-msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.ro.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.en.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.ro.html\">multi page</a>, <a href=\"html/live-"
"manual.ro.html\">single page</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.ro.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a "
+#| "href=\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href="
+#| "\"pdf/live-manual.portrait-letter.en.pdf\">letter portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-letter.en.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait.a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape.a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait.letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape.letter.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.ro.pdf\">A4 portrait</a>, <a href="
"\"pdf/live-manual.landscape-a4.ro.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
@@ -87,7 +101,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
-msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.ro.txt\">Plain text</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 558dc4b..ab95b76 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-07 22:14+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-07\n"
+" :published: 2011-12-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index 7ee9eb3..bfe68d1 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,33 +50,33 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:23
-msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.odt\">ODF</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait.a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape.a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait.letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape.letter.pdf\">letter landscape</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
-msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr ""
#. type: Content of: <html><body><p>
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index b816a11..608c471 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-12-07 22:14+0100\n"
+"POT-Creation-Date: 2011-12-17 15:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-07\n"
+" :published: 2011-12-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/_sisu/.empty b/manual/pt_BR/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/pt_BR/_sisu/image/.empty b/manual/pt_BR/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/pt_BR/_sisu/sisurc.yml b/manual/pt_BR/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/pt_BR/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb b/manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- 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}
- 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"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/pt_BR/index.html.in b/manual/pt_BR/index.html.in
index bf06a76..17873c3 100644
--- a/manual/pt_BR/index.html.in
+++ b/manual/pt_BR/index.html.in
@@ -26,15 +26,15 @@ contribuir</a> com o manual.
<h3>Formatos Disponíveis</h3>
<ul>
- <li><a href="epub/live-manual.pt_BR.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.pt_BR.html">Páginas multiplas</a>, <a
-href="html/live-manual.pt_BR.html">Página única</a></li>
- <li><a href="odf/live-manual.pt_BR.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pt_BR.pdf">A4 retrato</a>, <a
-href="pdf/live-manual.landscape-a4.pt_BR.pdf">A4 paisagem</a>, <a
-href="pdf/live-manual.portrait-letter.pt_BR.pdf">US retrato</a>, <a
-href="pdf/live-manual.landscape-letter.pt_BR.pdf">US paisagem</a></li>
- <li><a href="txt/live-manual.pt_BR.txt">Texto plano</a></li>
+ <li><a href="epub/live-manual.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.html">multi page</a>, <a
+href="html/live-manual.html">single page</a></li>
+ <li><a href="odt/live-manual.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait.a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape.a4.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait.letter.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape.letter.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 1311759..6cd96a9 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-07
+ :published: 2011-12-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/_sisu/.empty b/manual/ro/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/ro/_sisu/image/.empty b/manual/ro/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/ro/_sisu/sisurc.yml b/manual/ro/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/ro/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/ro/_sisu/skin/doc/skin_debian-live.rb b/manual/ro/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/ro/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- 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}
- 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"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/ro/index.html.in b/manual/ro/index.html.in
index 951cf9f..eea9f9a 100644
--- a/manual/ro/index.html.in
+++ b/manual/ro/index.html.in
@@ -26,15 +26,15 @@ contribute</a> to the manual.
<h3>Available Formats</h3>
<ul>
- <li><a href="epub/live-manual.ro.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.ro.html">multi page</a>, <a
-href="html/live-manual.ro.html">single page</a></li>
- <li><a href="odf/live-manual.ro.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.ro.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.ro.pdf">A4 landscape</a>, <a
-href="pdf/live-manual.portrait-letter.ro.pdf">letter portrait</a>, <a
-href="pdf/live-manual.landscape-letter.ro.pdf">letter landscape</a></li>
- <li><a href="txt/live-manual.ro.txt">Plain text</a></li>
+ <li><a href="epub/live-manual.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.html">multi page</a>, <a
+href="html/live-manual.html">single page</a></li>
+ <li><a href="odt/live-manual.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait.a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape.a4.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait.letter.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape.letter.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 1311759..6cd96a9 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-07
+ :published: 2011-12-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
--
live-manual
More information about the debian-live-changes
mailing list