aboutsummaryrefslogtreecommitdiffhomepage
path: root/conf
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-05-26 15:40:01 -0400
committerRalph Amissah <ralph@amissah.com>2010-05-26 15:40:01 -0400
commitc142eedb1854395c4b31bbb4852ca5e10fbaea70 (patch)
tree05f582c5129f7c82be2ae2b42317a5c68f1f770b /conf
parentdebian/changelog (2.3.5-1) (diff)
parentupdate: changelog, version (2.4.0) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'conf')
-rw-r--r--conf/sisu/v2/sisurc.yml13
-rw-r--r--conf/sisu/v2/version.yml6
2 files changed, 5 insertions, 14 deletions
diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml
index 0703e0f4..d4b1503d 100644
--- a/conf/sisu/v2/sisurc.yml
+++ b/conf/sisu/v2/sisurc.yml
@@ -3,21 +3,13 @@
# Description: Site wide envionment defaults set here
# system environment info / resource configuration file, for sisu
# License: GPL v3 or later
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu/config #per local directory settings
-# $Date$
-# $Id$
-# Notes: implemented 2004w03
-# Site environment configuration file
+# 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: 'grotto/theatre/working'
# path: 'sisu_working'
# public: '_sisu/image'
# #all: 'image'
@@ -27,7 +19,6 @@
# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
# images: '_sisu/image'
# man: 'man'
-# php: 'php'
# cgi: '/usr/lib/cgi-bin'
# feed: 'feed'
# sqlite: 'sisu/sqlite'
@@ -117,7 +108,7 @@ program_set:
# pdf_viewer: 'evince'
# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
# console_www_browser: 'links2' #'elinks'
-# odf_viewer: 'oowriter'
+# 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
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 5b2fb44f..99085d62 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.3.5
-:date_stamp: 2010w20/2
-:date: "2010-05-18"
+:version: 2.4.0
+:date_stamp: 2010w21/3
+:date: "2010-05-26"
:project: SiSU