diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-05-03 19:14:10 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-05-03 19:14:10 -0400 |
| commit | 65124198251d6e0ac59294f76c30644ad4fac6d5 (patch) | |
| tree | dc50da8382c66172f740cd233517c7f7243be23e /conf | |
| parent | debian/changelog (2.3.1-1) (diff) | |
| parent | update: changelog, version (2.3.2) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/sisu/v2/sisurc.yml | 3 | ||||
| -rw-r--r-- | conf/sisu/v2/version.yml | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml index 418cdfd1..a5c13293 100644 --- a/conf/sisu/v2/sisurc.yml +++ b/conf/sisu/v2/sisurc.yml @@ -64,10 +64,13 @@ flag: #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal default: papersize: 'A4,letter' + #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: # - diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml index cce6eb57..2879bb8a 100644 --- a/conf/sisu/v2/version.yml +++ b/conf/sisu/v2/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.3.1 -:date_stamp: 2010w17/3 -:date: "2010-04-28" +:version: 2.3.2 +:date_stamp: 2010w18/1 +:date: "2010-05-03" :project: SiSU |