diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-06-11 22:06:53 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-06-11 22:06:53 -0400 |
| commit | e4932393ec8cce24b7d3390d08a3dc0b5296c261 (patch) | |
| tree | c3fc610766a7d211460a5ffba338f05e540605c7 /conf | |
| parent | debian/changelog (2.4.3-1) (diff) | |
| parent | debian/changelog (2.5.0-1) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/sisu/v2/sisurc.yml | 4 | ||||
| -rw-r--r-- | conf/sisu/v2/version.yml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml index d4b1503d..8b1c71e6 100644 --- a/conf/sisu/v2/sisurc.yml +++ b/conf/sisu/v2/sisurc.yml @@ -55,6 +55,7 @@ flag: #% 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 @@ -107,7 +108,8 @@ program_set: # editor: 'gvim -c :R -c :S' # pdf_viewer: 'evince' # web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase' -# console_www_browser: 'links2' #'elinks' +# 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' diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml index 8446c9e5..0b5ed396 100644 --- a/conf/sisu/v2/version.yml +++ b/conf/sisu/v2/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.4.3 -:date_stamp: 2010w22/6 -:date: "2010-06-05" +:version: 2.5.0 +:date_stamp: 2010w23/5 +:date: "2010-06-11" :project: SiSU |