diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-05-11 21:46:25 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-05-11 21:46:25 -0400 |
commit | 9a865ebe339f6e2cf8c18e53e5834081fe15c187 (patch) | |
tree | 4f4e81d33e6700683489e58c595bdf32edb24d1e /data/doc/sisu/sisu_user_txt | |
parent | debian/changelog (4.0.21-1) (diff) | |
parent | v5 dev branch opened (starts as copy of v4 stable branch); v3 branch closed (diff) |
Merge tag 'sisu_4.1.0' into debian/sid
SiSU 4.1.0
Diffstat (limited to 'data/doc/sisu/sisu_user_txt')
-rw-r--r-- | data/doc/sisu/sisu_user_txt/configuration_sisurc.txt | 6 | ||||
-rw-r--r-- | data/doc/sisu/sisu_user_txt/configuration_skin.txt | 15 |
2 files changed, 3 insertions, 18 deletions
diff --git a/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt b/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt index d5fda20d..e123734f 100644 --- a/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt +++ b/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt @@ -8,7 +8,7 @@ be modified in sisurc.yml sisurc.yml can be located in one of the following locations: /etc/sisu/sisurc.yml ~/.sisu/sisurc.yml and ./_sisu/sisurc.yml -and if sisu versions 2 and 3 are both in use, the v2 sisurc.yml can be placed a the +and if sisu versions 4 and 5 are both in use, the v2 sisurc.yml can be placed a the following locations: -/etc/sisu/v2/sisurc.yml ~/.sisu/v2/sisurc.yml and ./_sisu/v2/sisurc.yml -/etc/sisu/v3/sisurc.yml ~/.sisu/v3/sisurc.yml and ./_sisu/v3/sisurc.yml +/etc/sisu/v4/sisurc.yml ~/.sisu/v4/sisurc.yml and ./_sisu/v4/sisurc.yml +/etc/sisu/v5/sisurc.yml ~/.sisu/v5/sisurc.yml and ./_sisu/v5/sisurc.yml diff --git a/data/doc/sisu/sisu_user_txt/configuration_skin.txt b/data/doc/sisu/sisu_user_txt/configuration_skin.txt deleted file mode 100644 index 2695dda8..00000000 --- a/data/doc/sisu/sisu_user_txt/configuration_skin.txt +++ /dev/null @@ -1,15 +0,0 @@ - index.txt - configuration.txt -%% skin ------------------------------------------------------------------------ - -skins can be used to modify the appearance of output - -[provide information] - -%% css ------------------------------------------------------------------------ - -the default css may be replaced for the site or particular processing -directories - -[provide information] - |