Merge tag 'sisu-markup-samples_7.1.0' into debian/sid

SiSU markup samples 7.1.0

1 files changed, 35 insertions, 32 deletions

diff --git a/data/samples/current/_sisu/sisurc_SAMPLE.yml b/data/samples/current/_sisu/sisurc_SAMPLE.yml
index 049acbe..e816175 100644
--- a/data/samples/current/_sisu/sisurc_SAMPLE.yml
+++ b/data/samples/current/_sisu/sisurc_SAMPLE.yml
@@ -9,7 +9,8 @@
 #     ./_sisu/config #per local directory settings
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 webserv:
-#  #url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
+#  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
+#  path:         '~/sisu_www' # /srv/www #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
 #  #path:         './tested' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
 #  #images:       'sisu/image'
 #  #man:          'man'
@@ -20,12 +21,12 @@ webserv_cgi:
 #  base_path:    ~
 #  port:         '8081'
 #  user:         ~
-#  file_links:   webserv #  www.sisudoc.org
+#  file_links:   www.sisudoc.org
 #show_output_on: 'filesystem_url'
 #% processing directories, main path and subdirectories
 processing:
-## path:         '~'
-##  dir:         '_sisu_processing~'
+# path:         '~'
+#  dir:         '_sisu_processing~'
 ##  metaverse:    'metaverse'
 ##  tune:         'tune'
 ##  latex:        'tex'
@@ -53,7 +54,7 @@ flag:
 
 #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 default:
-  papersize:    'A4,letter' #'A4,letter,b5,a5'
+  papersize:    'a4,letter' #'a4,letter,b5,a5,legal'
 #  #texpdf_font:       'Liberation Sans'
 #  #texpdf_font_sans:  'Liberation Sans'
 #  #texpdf_font_serif: 'Liberation Serif'
@@ -65,9 +66,9 @@ default:
 #  digest:       'sha' #sha is sha256, default is md5
 #% settings used by ssh scp
 #remote:
-#  #user:         'ralph'
-#  #host:         'sisudoc.org'
-#  #path:         '.' #no trailing slash eg 'sisu/www'
+#  user:         'ralph'
+#  host:         'www.sisudoc.org'
+#  path:         '/srv/www' # '/srv/sisudoc/web' # '.' #no trailing slash eg 'sisu/www'
 #% webrick information
 #% sql database info, postgresql
 #db:
@@ -89,33 +90,35 @@ default:
 ##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:               true
-#  css_modify:        true
-#  remote_base_site:  true
+#  zap:                 true
+#  css_modify:          true
+#  remote_base_site:    true
 #program_set:
-#  rmagick:           true
-#  wc:                true
-#  editor:            true
-#  postgresql:        true
-#  sqlite:            true
-#  tidy:              true
-#  rexml:             true
-#  pdflatex:          true
+#  rmagick:             true
+#  wc:                  true
+#  editor:              true
+#  postgresql:          true
+#  sqlite:              true
+#  tidy:                true
+#  rexml:               true
+#  pdflatex:            true
 #program_select:
-#  editor:            'vim' #'gvim -c :R'
-#  pdf_viewer:        'evince'
-#  web_browser:       'iceweasel'
-#  console_web_browser: 'links2'
-#  epub_viewer:       'ebook-viewer' #'calibre' 'fbreader'
-#  odf_viewer:        'lowriter'
-#  xml_viewer:        'xml-viewer'
+#  editor:              'vim' #'gvim -c :R'
+#  pdf_viewer:          'evince'
+#  web_browser:         'iceweasel'
+#  console_web_browser: 'w3m' #'links2' #'elinks' #'w3m' #'lynx' #'links'
+#  odf_viewer:          'lowriter' #'oowriter' #'abiword'
+#  xml_viewer:          'xml-viewer'
+#  epub_viewer:         'ebook-viewer' #'calibre' #'fbreader' #'okular'
 #search:
 #  sisu:
-#    flag:            true
-#    action:          http://search.sisudoc.org
-#    db:              sisu
-#    title:           'SiSU search form (sample)'
+#    flag:              true
+#    action:            http://www.sisudoc.org/cgi-bin/sisu_lng_pgsql.cgi
+#   #action:            http://www.sisudoc.org/cgi-bin/sisu_pgsql.cgi
+#   #action:            http://search.sisudoc.org
+#    db:                current
+#    title:             'SiSU search form (sample)'
 #html:
-#  minitoc:           true
+#  minitoc:             true
 #manifest:
-#  minitoc:           true
+#  minitoc:             true