From 6811ac91f21a434fc7d967c11e1b20f33918c6ea Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 19 Mar 2012 22:07:29 -0400 Subject: v3: 3.2 branch is main (v3dv --> v3); dev (v3dv) branch directories removed * v3dv (3.2) "merged" into v3 (previously 3.1) (& removed) * conf/sisu/v3dv --> conf/sisu/v3 * data/sisu/v3dv --> data/sisu/v3 * lib/sisu/v3dv --> lib/sisu/v3 * bin/sisu* (v3dv references changed to v3) * (--dev modifier (superfluous for the time being) runs main v3 branch) --- conf/sisu/v3/sisurc.yml | 10 ++-- conf/sisu/v3dv/sisurc.yml | 146 ---------------------------------------------- 2 files changed, 5 insertions(+), 151 deletions(-) delete mode 100644 conf/sisu/v3dv/sisurc.yml (limited to 'conf') diff --git a/conf/sisu/v3/sisurc.yml b/conf/sisu/v3/sisurc.yml index 0d95d4c6..de2288f9 100644 --- a/conf/sisu/v3/sisurc.yml +++ b/conf/sisu/v3/sisurc.yml @@ -49,11 +49,11 @@ show_output_on: 'filesystem_url' #% 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: '-NhewpotbxXyYv' # -m run by default; includes verbose + default: '-NhewpotbxXyYdv' # -m run by default; includes verbose i: '-Nhewpoty' # -m run by default - ii: '-NhewpotbxX' # -m run by default - iii: '-NhewpotbxXY' # -m run by default - iv: '-NhewpotbxXiIY' # -m run by default + ii: '-NhewpotbxXd' # -m run by default + iii: '-NhewpotbxXYd' # -m run by default + iv: '-NhewpotbxXiIYd' # -m run by default v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal @@ -142,5 +142,5 @@ program_set: # action: http://search.sisudoc.org # db: sisu # title: sample search form - #promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby +#omit: minitoc diff --git a/conf/sisu/v3dv/sisurc.yml b/conf/sisu/v3dv/sisurc.yml deleted file mode 100644 index de2288f9..00000000 --- a/conf/sisu/v3dv/sisurc.yml +++ /dev/null @@ -1,146 +0,0 @@ -# Name: SiSU - Simple information Structuring Universe -# Author: Ralph@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: -# url_root: 'http://www.your.url' #without dir stub -# 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' -# 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: '-NhewpotbxXyYdv' # -m run by default; includes verbose - i: '-Nhewpoty' # -m run by default - ii: '-NhewpotbxXd' # -m run by default - iii: '-NhewpotbxXYd' # -m run by default - iv: '-NhewpotbxXiIYd' # -m run by default - v: '-NhewpotbxXYDv --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' - #language: 'en' - #texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif' - #texpdf_font_mono: 'Liberation Mono' #'Inconsolata' - #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 -#% 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: "**" - -#html: -# quick_ref: true #default false -# seg_title_banner: true #default false -#odt: -# ocn: true -#plaintext: -# ocn: true - -#% 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 - -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: 'vim' -# pdf_viewer: 'evince' -# web_browser: 'iceweasel' -# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' -# odf_viewer: 'lowriter' #'oowriter' #'abiword' -# xml_viewer: 'xml-viewer' -# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' -# info_viewer: 'pinfo -f' -# man: 'man' #'groff -man -Tascii' # 'nroff -man' - -#search: -# sisu: -# flag: true -## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi -# action: http://search.sisudoc.org -# db: sisu -# title: sample search form -#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby -#omit: minitoc -- cgit v1.2.3