doc/sisu user_txt, minor update & pruning

3 files changed, 14 insertions, 132 deletions

diff --git a/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt b/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt
index 62a2ce02..d5fda20d 100644
--- a/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt
+++ b/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt
@@ -8,130 +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
 
-if sisu versions 1 and 2 are both in use, the v2 sisurc.yml can be placed a the
+and if sisu versions 2 and 3 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
-
-# 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'
-#% 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:      '-NhwepoabxXyYv'            # -m run by default; includes verbose
-  i:            '-hwpoay'                   # -m run by default
-  ii:           '-NhwepoabxXy'              # -m run by default
-  iii:          '-NhwepoabxXyY'             # -m run by default
-  iv:           '-NhwepoabxXYDy --update'   # -m run by default
-  v:            '-NhwepoabxXYDyv --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'
-  #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:
-#  -
-#    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:       "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-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:       'gvim -c :R -c :S'
-#  pdf_viewer:   'evince'
-#  web_browser:  'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-#  console_www_browser:  'links2' #'elinks'
-#  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
-#search:
-#  sisu:
-#    flag:              true
-##    action:            http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-#    action:            http://search.sisudoc.org
-#    db:                sisu
-#    title:             sample search form
-#  hyperestraier:
-#    flag:              true
-#    action:            http://search.sisudoc.org/cgi-bin/estseek.cgi?
+/etc/sisu/v3/sisurc.yml ~/.sisu/v3/sisurc.yml and ./_sisu/v3/sisurc.yml
diff --git a/data/doc/sisu/sisu_user_txt/markup_content.txt b/data/doc/sisu/sisu_user_txt/markup_content.txt
index 326fabe1..edac0170 100644
--- a/data/doc/sisu/sisu_user_txt/markup_content.txt
+++ b/data/doc/sisu/sisu_user_txt/markup_content.txt
@@ -180,10 +180,10 @@ To link text or an image to a url the markup is as follows
 
 Where it is wished to include the url for the linked text in a footnote, the
 long form of markup would be:
-{ SiSU }http://www.jus.uio.no/sisu/ ~{ http://www.jus.uio.no/sisu/ }~
+{ SiSU }http://www.sisudoc.org/ ~{ http://www.sisudoc.org/ }~
 
 A short form is provided for achieving the same:
- {~^ SiSU }http://www.jus.uio.no/sisu/
+ {~^ SiSU }http://www.sisudoc.org/
 
 %% images ----------------------------------------------------------------------
 
@@ -194,9 +194,9 @@ The following are examples of links to images
 
 { tux.png 64x80 }image
 
-{tux.png 64x80 "Gnu/Linux - a better way" }http://www.jus.uio.no/sisu/
+{tux.png 64x80 "Gnu/Linux - a better way" }http://www.sisudoc.org/
 
-{GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.jus.uio.no/sisu/
+{GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
 
 The 64x80 in the first example is the image dimension, (width x height). This
 may be omitted if imagemagick or graphicsmagick are installed, as they will
diff --git a/data/doc/sisu/sisu_user_txt/markup_headers_metadata.txt b/data/doc/sisu/sisu_user_txt/markup_headers_metadata.txt
index c24789c8..3dd42444 100644
--- a/data/doc/sisu/sisu_user_txt/markup_headers_metadata.txt
+++ b/data/doc/sisu/sisu_user_txt/markup_headers_metadata.txt
@@ -27,8 +27,13 @@
  :modified: 2010-05-25
 
 @links:
- { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
- { Book Samples and Markup Examples }http://www.jus.uio.no/SiSU/examples.html
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
+ { SiSU Homepage }http://www.sisudoc.org/
+ { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
+ { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
  { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
  { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
+ { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
+ { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
+ { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
+ { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
+ { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU