aboutsummaryrefslogtreecommitdiffhomepage
path: root/data/sisu
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-06-29 03:25:41 +0200
committerRalph Amissah <ralph@amissah.com>2010-07-02 13:56:08 -0400
commit77d84aafc9d1f3df4b3988e48cbf2ce06d315d7b (patch)
tree78edb5d90ef5f7b9ce44f97f33fd4f8734f5d31a /data/sisu
parentprovide alternatives for producing single output types (diff)
Removing useless whitespaces from upstream files at EOL.
Diffstat (limited to 'data/sisu')
-rw-r--r--data/sisu/v1/conf/convert/kdissert_to_sisu10
-rw-r--r--data/sisu/v1/conf/editor-syntax-etc/diakonos/diakonos.conf32
-rw-r--r--data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu46
-rw-r--r--data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu_www46
-rw-r--r--data/sisu/v2/conf/convert/kdissert_to_sisu10
-rw-r--r--data/sisu/v2/conf/editor-syntax-etc/diakonos/diakonos.conf32
-rw-r--r--data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu46
-rw-r--r--data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu_www46
8 files changed, 134 insertions, 134 deletions
diff --git a/data/sisu/v1/conf/convert/kdissert_to_sisu b/data/sisu/v1/conf/convert/kdissert_to_sisu
index daa7fd11..35921c3e 100644
--- a/data/sisu/v1/conf/convert/kdissert_to_sisu
+++ b/data/sisu/v1/conf/convert/kdissert_to_sisu
@@ -33,7 +33,7 @@
http://www.fsf.org/licenses/gpl.html
http://www.gnu.org/copyleft/gpl.html
http://www.jus.uio.no/sisu/gpl3.fsf
-
+
© Ralph Amissah 1997, current 2006.
All Rights Reserved.
@@ -88,7 +88,7 @@ unless argv.empty?
@top=id
end
end
- end
+ end
@doc=Array.new
@title=@el[@top][:sum]
p @el[@top][:sum]
@@ -117,7 +117,7 @@ unless argv.empty?
# if x: puts "#{i}: lev: #{x[:lev]}, id: #{x[:id]}, ma: #{x[:ma]}, ch: #{x[:ch].join(',')}"
# end
#end
-# regexs strip most kdissert markup, and provide minimal info for sisu markup -->
+# regexs strip most kdissert markup, and provide minimal info for sisu markup -->
@doc.each do |c,idx|
c.gsub!(/<\/summary>/,'')
c.gsub!(/<html>.+?\n|<\/body>|<\/html>|<p>/m,'')
@@ -132,7 +132,7 @@ unless argv.empty?
c.gsub!(/&quot;/,'"')
c.gsub!(/ \s+/,' ')
@sisu_base << c.strip + "\n\n"
- end
+ end
else puts ".kdi extension expected, filename not recognised: << #{kdi} >>"
end
end
@@ -149,7 +149,7 @@ sisu_head=<<WOK
@base_program: kdissert
-% @date:
+% @date:
@rcs: $Id$
diff --git a/data/sisu/v1/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/v1/conf/editor-syntax-etc/diakonos/diakonos.conf
index 5b7a049a..a3c3afe4 100644
--- a/data/sisu/v1/conf/editor-syntax-etc/diakonos/diakonos.conf
+++ b/data/sisu/v1/conf/editor-syntax-etc/diakonos/diakonos.conf
@@ -459,7 +459,7 @@ lang.xml.tokens.comments.open (<!--)
lang.xml.tokens.comments.close (-->)
lang.xml.tokens.comments.format 8
lang.xml.tokens.comments.change_to xml_comment
-lang.xml.comment_string <!--
+lang.xml.comment_string <!--
lang.xml.comment_close_string " -->"
lang.xml.tokens.template.open \[@--
lang.xml.tokens.template.close --@\]
@@ -527,7 +527,7 @@ lang.html.tokens.comments.open (<!--)
lang.html.tokens.comments.close (-->)
lang.html.tokens.comments.format 8
lang.html.tokens.comments.change_to html_comment
-lang.html.comment_string <!--
+lang.html.comment_string <!--
lang.html.comment_close_string " -->"
lang.html.closers.tag.regexp <([^/> ]*)
lang.html.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
@@ -581,7 +581,7 @@ lang.css.tokens.colours.format yellow bold
lang.css.tokens.long_comments.open \/\*
lang.css.tokens.long_comments.close \*\/
lang.css.tokens.long_comments.format 8 bold
-lang.css.comment_string /*
+lang.css.comment_string /*
lang.css.comment_close_string " */"
lang.css.tokens.numbers \b([0-9]+\.[0-9]+|[0-9]+)
lang.css.tokens.numbers.format blue bold
@@ -612,7 +612,7 @@ lang.ruby.tokens.instance_variables (@[A-Za-z_][A-Za-z_0-9]*)
lang.ruby.tokens.instance_variables.format white bold
lang.ruby.tokens.comments (#.*)
lang.ruby.tokens.comments.format 8 bold
-lang.ruby.comment_string #
+lang.ruby.comment_string #
lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/)
lang.ruby.tokens.regular_expressions.format red bold
lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\})
@@ -679,7 +679,7 @@ lang.php.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.php.tokens.constants.format yellow bold
lang.php.tokens.comments (\/\/.*)
lang.php.tokens.comments.format 8 bold
-lang.php.comment_string //
+lang.php.comment_string //
lang.php.tokens.preprocessor (^\s*#.*)
lang.php.tokens.preprocessor.format yellow bold
lang.php.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -714,7 +714,7 @@ lang.perl.format.selection inverse
lang.perl.format.found yellow inverse
lang.perl.tokens.comments (#.*)
lang.perl.tokens.comments.format 8 bold
-lang.perl.comment_string #
+lang.perl.comment_string #
lang.perl.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.perl.tokens.constants.format yellow bold
lang.perl.tokens.non_alphanum [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
@@ -761,7 +761,7 @@ lang.python.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~]
lang.python.tokens.non_alphanum.format white
lang.python.tokens.comments (#.*)
lang.python.tokens.comments.format 8 bold
-lang.python.comment_string #
+lang.python.comment_string #
lang.python.tokens.doublequoted_strings (\".*?[^\\]\")
lang.python.tokens.doublequoted_strings.format green bold
lang.python.tokens.singlequoted_strings ('.*?[^\\]')
@@ -796,7 +796,7 @@ lang.java.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.java.tokens.constants.format yellow bold
lang.java.tokens.comments (\/\/.*)
lang.java.tokens.comments.format 8 bold
-lang.java.comment_string //
+lang.java.comment_string //
lang.java.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
lang.java.tokens.non_alphanum.format white
lang.java.tokens.long_comments.open \/\*
@@ -833,7 +833,7 @@ lang.c.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.c.tokens.constants.format yellow bold
lang.c.tokens.comments (\/\/.*)
lang.c.tokens.comments.format 8 bold
-lang.c.comment_string //
+lang.c.comment_string //
lang.c.tokens.preprocessor (^\s*#.*)
lang.c.tokens.preprocessor.format yellow bold
lang.c.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -861,7 +861,7 @@ lang.conf.tokens.commands ^\s*([^\s=]+)
lang.conf.tokens.commands.format cyan bold
lang.conf.tokens.comments (^\s*#.*)
lang.conf.tokens.comments.format yellow bold
-lang.conf.comment_string #
+lang.conf.comment_string #
lang.conf.tokens.doublequoted_strings (\".*?[^\\]\")
lang.conf.tokens.doublequoted_strings.format green bold
lang.conf.tokens.singlequoted_strings ('.*?[^\\]')
@@ -879,7 +879,7 @@ lang.crontab.format.selection inverse
lang.crontab.format.found yellow inverse
lang.crontab.tokens.comments (^\s*#.*)
lang.crontab.tokens.comments.format yellow bold
-lang.crontab.comment_string #
+lang.crontab.comment_string #
lang.crontab.tokens.schedule ^((?:[0-9\/*,-]+\s+){5})
lang.crontab.tokens.schedule.format cyan bold
lang.crontab.tokens.commands ^(\S+=.+)
@@ -895,7 +895,7 @@ lang.fstab.format.selection inverse
lang.fstab.format.found yellow inverse
lang.fstab.tokens.comments (^\s*#.*)
lang.fstab.tokens.comments.format yellow bold
-lang.fstab.comment_string #
+lang.fstab.comment_string #
lang.fstab.indent.size 4
lang.fstab.indent.auto true
lang.fstab.indent.roundup true
@@ -920,7 +920,7 @@ lang.sql.tokens.data_types.case_insensitive \b(BIT|BOOLEAN|CHAR|CHARACTER|DATE|D
lang.sql.tokens.data_types.format brown
lang.sql.tokens.comments (--.*)
lang.sql.tokens.comments.format 8 bold
-lang.sql.comment_string --
+lang.sql.comment_string --
lang.sql.tokens.singlequoted_strings ('.*?[^\\]')
lang.sql.tokens.singlequoted_strings.format green bold
lang.sql.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -946,7 +946,7 @@ lang.bash.indent.roundup true
lang.bash.tabsize 4
lang.bash.tokens.comments (^\s*#.*)
lang.bash.tokens.comments.format 8 bold
-lang.bash.comment_string #
+lang.bash.comment_string #
lang.bash.tokens.singlequoted_strings ('.*?[^\\]')
lang.bash.tokens.singlequoted_strings.format green bold
lang.bash.tokens.doublequoted_strings (\".*?[^\\]\")
@@ -972,7 +972,7 @@ lang.tcl.indent.roundup true
lang.tcl.tabsize 4
lang.tcl.tokens.comments (^\s*#.*)
lang.tcl.tokens.comments.format 8 bold
-lang.tcl.comment_string #
+lang.tcl.comment_string #
lang.tcl.tokens.reserved_words \b(encoding|incr|pid|tcl_endOfWord|Tcl|eof|info|tcl_findLibrary|after|error|interp|pkg_mkIndex|tcl_startOfNextWord|append|eval|join|proc|tcl_startOfPreviousWord|array|exec|lappend|puts|tcl_wordBreakAfter|auto_execok|exit|lassign|pwd|tcl_wordBreakBefore|auto_import|expr|lindex|re_syntax|tcltest|auto_load|fblocked|linsert|read|tclvars|auto_mkindex|fconfigure|list|regexp|tell|auto_mkindex_old|fcopy|llength|registry|time|auto_qualify|file|load|regsub|trace|auto_reset|fileevent|lrange|rename|unknown|bgerror|filename|lrepeat|resource|unload|binary|flush|lreplace|return|unset|break|for|lsearch|scan|update|catch|foreach|lset|seek|uplevel|cd|format|lsort|set|upvar|clock|gets|memory|socket|variable|close|glob|msgcat|source|vwait|concat|global|namespace|split|while|continue|history|open|string|dde|http|package|subst|dict|if|parray|switch)\b
lang.tcl.tokens.reserved_words.format white
lang.tcl.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -1045,7 +1045,7 @@ lang.yaml.tokens.directive_indicator ^(%.*)
lang.yaml.tokens.directive_indicator.format 10
lang.yaml.tokens.comment_indicator (#.+)
lang.yaml.tokens.comment_indicator.format 8 bold
-lang.yaml.comment_string #
+lang.yaml.comment_string #
lang.yaml.tokens.anchor_indicator (&\w+)
lang.yaml.tokens.anchor_indicator.format red bold
lang.yaml.tokens.alias_indicator (\*\w+)
diff --git a/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu
index a8819e3c..6647de9f 100644
--- a/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu
+++ b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu
@@ -1,15 +1,15 @@
# lighttpd configuration file
-#
+#
# use a it as base for lighttpd 1.0.0 and above
#
#%% Options you really have to take care of
-#%
+#%
# modules to load
# at least mod_access and mod_accesslog should be loaded
# all other module should only be loaded if really neccesary
# - saves some time
# - saves memory
-server.dir-listing = "disable"
+server.dir-listing = "disable"
server.modules = ( "mod_rewrite",
"mod_access",
"mod_fastcgi",
@@ -17,14 +17,14 @@ server.modules = ( "mod_rewrite",
"mod_accesslog")
#%% a static document-root, for virtual-hosting take look at the
#% server.virtual-* options
-server.document-root = "/var/www/"
-#server.document-root = "/home/*username*/web/public/"
+server.document-root = "/var/www/"
+#server.document-root = "/home/*username*/web/public/"
## 'Parent' domain on any server except davie.
-#server.document-root = "/home/*username*/public_html/"
-##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
+#server.document-root = "/home/*username*/public_html/"
+##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
#server.document-root = "/home/*username*/web/public/"
#% where to send error-messages to
-server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
+server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
#% files to check for if .../ is requested
server.indexfiles = ( "index.php", "index.html",
"index.htm", "index.rb")
@@ -56,13 +56,13 @@ mimetype.assign = (
".odt" => "application/vnd.oasis.opendocument.text",
".bz2" => "application/x-bzip",
".tbz" => "application/x-bzip-compressed-tar",
- ".tar.bz2" => "application/x-bzip-compressed-tar"
+ ".tar.bz2" => "application/x-bzip-compressed-tar"
)
# text/x-server-parsed-html
#%Server ID Header
-server.tag = "lighttpd | TextDriven"
+server.tag = "lighttpd | TextDriven"
#%### accesslog module
-accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
#% deny access the file-extensions
#
# ~ is for backupfiles from vi, emacs, joe, ...
@@ -76,16 +76,16 @@ server.port = 81
#server.port = 8111
#server.port = 8965
##% bind to localhost (default: all interfaces)
-server.bind = "localhost"
-#server.bind = "corundum"
-##server.bind = "grisu.home.kneschke.de"
+server.bind = "localhost"
+#server.bind = "corundum"
+##server.bind = "grisu.home.kneschke.de"
##% to help the rc.scripts
-server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
+server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
#$HTTP["host"] =~ "\.corundum\.(name|com|net|org)" {
$HTTP["host"] == "localhost" {
- server.document-root = "/var/www/"
- server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
- accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+ server.document-root = "/var/www/"
+ server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
+ accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
url.rewrite-repeat = (
"^.*/$" => "index.html",
"^(.*/(landscape|portrait))$" => "$1.pdf",
@@ -93,7 +93,7 @@ $HTTP["host"] == "localhost" {
"^(.*/(sax|dom))$" => "$1.xml",
"^([^.]+)$" => "$1.html"
)
- server.error-handler-404 = "/dispatch.fcgi"
+ server.error-handler-404 = "/dispatch.fcgi"
# fastcgi.server = ( ".fcgi" =>
# ( "localhost" =>
# (
@@ -105,11 +105,11 @@ $HTTP["host"] == "localhost" {
# )
# )
# )
-}
+}
#% change uid to <uid> (default: don't care)
-server.username = "[*username*]"
+server.username = "[*username*]"
#% change uid to <uid> (default: don't care)
-server.groupname = "[*username*]"
+server.groupname = "[*username*]"
#%## compress module
-compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
+compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
diff --git a/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu_www b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu_www
index d23c12ce..0dd16c94 100644
--- a/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu_www
+++ b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu_www
@@ -1,15 +1,15 @@
# lighttpd configuration file
-#
+#
# use a it as base for lighttpd 1.0.0 and above
#
#%% Options you really have to take care of
-#%
+#%
# modules to load
# at least mod_access and mod_accesslog should be loaded
# all other module should only be loaded if really neccesary
# - saves some time
# - saves memory
-server.dir-listing = "disable"
+server.dir-listing = "disable"
server.modules = ( "mod_rewrite",
"mod_access",
"mod_fastcgi",
@@ -17,14 +17,14 @@ server.modules = ( "mod_rewrite",
"mod_accesslog")
#%% a static document-root, for virtual-hosting take look at the
#% server.virtual-* options
-server.document-root = "/home/[user home]/sisu_www/"
-#server.document-root = "/home/*username*/web/public/"
+server.document-root = "/home/[user home]/sisu_www/"
+#server.document-root = "/home/*username*/web/public/"
## 'Parent' domain on any server except davie.
-#server.document-root = "/home/*username*/public_html/"
-##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
+#server.document-root = "/home/*username*/public_html/"
+##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
#server.document-root = "/home/*username*/web/public/"
#% where to send error-messages to
-server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
+server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
#% files to check for if .../ is requested
server.indexfiles = ( "index.php", "index.html",
"index.htm", "index.rb")
@@ -56,13 +56,13 @@ mimetype.assign = (
".odt" => "application/vnd.oasis.opendocument.text",
".bz2" => "application/x-bzip",
".tbz" => "application/x-bzip-compressed-tar",
- ".tar.bz2" => "application/x-bzip-compressed-tar"
+ ".tar.bz2" => "application/x-bzip-compressed-tar"
)
# text/x-server-parsed-html
#%Server ID Header
-server.tag = "lighttpd | TextDriven"
+server.tag = "lighttpd | TextDriven"
#%### accesslog module
-accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
#% deny access the file-extensions
#
# ~ is for backupfiles from vi, emacs, joe, ...
@@ -76,16 +76,16 @@ server.port = 8111
#server.port = 8111
#server.port = 8965
##% bind to localhost (default: all interfaces)
-server.bind = "localhost"
-#server.bind = "corundum"
-##server.bind = "grisu.home.kneschke.de"
+server.bind = "localhost"
+#server.bind = "corundum"
+##server.bind = "grisu.home.kneschke.de"
##% to help the rc.scripts
-server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
+server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
#$HTTP["host"] =~ "\.corundum\.(name|com|net|org)" {
$HTTP["host"] == "localhost" {
- server.document-root = "/home/[*username*]/sisu_www/"
- server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
- accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+ server.document-root = "/home/[*username*]/sisu_www/"
+ server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
+ accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
url.rewrite-repeat = (
"^.*/$" => "index.html",
"^(.*/(landscape|portrait))$" => "$1.pdf",
@@ -93,7 +93,7 @@ $HTTP["host"] == "localhost" {
"^(.*/(sax|dom))$" => "$1.xml",
"^([^.]+)$" => "$1.html"
)
- server.error-handler-404 = "/dispatch.fcgi"
+ server.error-handler-404 = "/dispatch.fcgi"
# fastcgi.server = ( ".fcgi" =>
# ( "localhost" =>
# (
@@ -105,11 +105,11 @@ $HTTP["host"] == "localhost" {
# )
# )
# )
-}
+}
#% change uid to <uid> (default: don't care)
-server.username = "[*username*]"
+server.username = "[*username*]"
#% change uid to <uid> (default: don't care)
-server.groupname = "[*username*]"
+server.groupname = "[*username*]"
#%## compress module
-compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
+compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
diff --git a/data/sisu/v2/conf/convert/kdissert_to_sisu b/data/sisu/v2/conf/convert/kdissert_to_sisu
index daa7fd11..35921c3e 100644
--- a/data/sisu/v2/conf/convert/kdissert_to_sisu
+++ b/data/sisu/v2/conf/convert/kdissert_to_sisu
@@ -33,7 +33,7 @@
http://www.fsf.org/licenses/gpl.html
http://www.gnu.org/copyleft/gpl.html
http://www.jus.uio.no/sisu/gpl3.fsf
-
+
© Ralph Amissah 1997, current 2006.
All Rights Reserved.
@@ -88,7 +88,7 @@ unless argv.empty?
@top=id
end
end
- end
+ end
@doc=Array.new
@title=@el[@top][:sum]
p @el[@top][:sum]
@@ -117,7 +117,7 @@ unless argv.empty?
# if x: puts "#{i}: lev: #{x[:lev]}, id: #{x[:id]}, ma: #{x[:ma]}, ch: #{x[:ch].join(',')}"
# end
#end
-# regexs strip most kdissert markup, and provide minimal info for sisu markup -->
+# regexs strip most kdissert markup, and provide minimal info for sisu markup -->
@doc.each do |c,idx|
c.gsub!(/<\/summary>/,'')
c.gsub!(/<html>.+?\n|<\/body>|<\/html>|<p>/m,'')
@@ -132,7 +132,7 @@ unless argv.empty?
c.gsub!(/&quot;/,'"')
c.gsub!(/ \s+/,' ')
@sisu_base << c.strip + "\n\n"
- end
+ end
else puts ".kdi extension expected, filename not recognised: << #{kdi} >>"
end
end
@@ -149,7 +149,7 @@ sisu_head=<<WOK
@base_program: kdissert
-% @date:
+% @date:
@rcs: $Id$
diff --git a/data/sisu/v2/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/v2/conf/editor-syntax-etc/diakonos/diakonos.conf
index 5b7a049a..a3c3afe4 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/diakonos/diakonos.conf
+++ b/data/sisu/v2/conf/editor-syntax-etc/diakonos/diakonos.conf
@@ -459,7 +459,7 @@ lang.xml.tokens.comments.open (<!--)
lang.xml.tokens.comments.close (-->)
lang.xml.tokens.comments.format 8
lang.xml.tokens.comments.change_to xml_comment
-lang.xml.comment_string <!--
+lang.xml.comment_string <!--
lang.xml.comment_close_string " -->"
lang.xml.tokens.template.open \[@--
lang.xml.tokens.template.close --@\]
@@ -527,7 +527,7 @@ lang.html.tokens.comments.open (<!--)
lang.html.tokens.comments.close (-->)
lang.html.tokens.comments.format 8
lang.html.tokens.comments.change_to html_comment
-lang.html.comment_string <!--
+lang.html.comment_string <!--
lang.html.comment_close_string " -->"
lang.html.closers.tag.regexp <([^/> ]*)
lang.html.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
@@ -581,7 +581,7 @@ lang.css.tokens.colours.format yellow bold
lang.css.tokens.long_comments.open \/\*
lang.css.tokens.long_comments.close \*\/
lang.css.tokens.long_comments.format 8 bold
-lang.css.comment_string /*
+lang.css.comment_string /*
lang.css.comment_close_string " */"
lang.css.tokens.numbers \b([0-9]+\.[0-9]+|[0-9]+)
lang.css.tokens.numbers.format blue bold
@@ -612,7 +612,7 @@ lang.ruby.tokens.instance_variables (@[A-Za-z_][A-Za-z_0-9]*)
lang.ruby.tokens.instance_variables.format white bold
lang.ruby.tokens.comments (#.*)
lang.ruby.tokens.comments.format 8 bold
-lang.ruby.comment_string #
+lang.ruby.comment_string #
lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/)
lang.ruby.tokens.regular_expressions.format red bold
lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\})
@@ -679,7 +679,7 @@ lang.php.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.php.tokens.constants.format yellow bold
lang.php.tokens.comments (\/\/.*)
lang.php.tokens.comments.format 8 bold
-lang.php.comment_string //
+lang.php.comment_string //
lang.php.tokens.preprocessor (^\s*#.*)
lang.php.tokens.preprocessor.format yellow bold
lang.php.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -714,7 +714,7 @@ lang.perl.format.selection inverse
lang.perl.format.found yellow inverse
lang.perl.tokens.comments (#.*)
lang.perl.tokens.comments.format 8 bold
-lang.perl.comment_string #
+lang.perl.comment_string #
lang.perl.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.perl.tokens.constants.format yellow bold
lang.perl.tokens.non_alphanum [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
@@ -761,7 +761,7 @@ lang.python.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~]
lang.python.tokens.non_alphanum.format white
lang.python.tokens.comments (#.*)
lang.python.tokens.comments.format 8 bold
-lang.python.comment_string #
+lang.python.comment_string #
lang.python.tokens.doublequoted_strings (\".*?[^\\]\")
lang.python.tokens.doublequoted_strings.format green bold
lang.python.tokens.singlequoted_strings ('.*?[^\\]')
@@ -796,7 +796,7 @@ lang.java.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.java.tokens.constants.format yellow bold
lang.java.tokens.comments (\/\/.*)
lang.java.tokens.comments.format 8 bold
-lang.java.comment_string //
+lang.java.comment_string //
lang.java.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
lang.java.tokens.non_alphanum.format white
lang.java.tokens.long_comments.open \/\*
@@ -833,7 +833,7 @@ lang.c.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
lang.c.tokens.constants.format yellow bold
lang.c.tokens.comments (\/\/.*)
lang.c.tokens.comments.format 8 bold
-lang.c.comment_string //
+lang.c.comment_string //
lang.c.tokens.preprocessor (^\s*#.*)
lang.c.tokens.preprocessor.format yellow bold
lang.c.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -861,7 +861,7 @@ lang.conf.tokens.commands ^\s*([^\s=]+)
lang.conf.tokens.commands.format cyan bold
lang.conf.tokens.comments (^\s*#.*)
lang.conf.tokens.comments.format yellow bold
-lang.conf.comment_string #
+lang.conf.comment_string #
lang.conf.tokens.doublequoted_strings (\".*?[^\\]\")
lang.conf.tokens.doublequoted_strings.format green bold
lang.conf.tokens.singlequoted_strings ('.*?[^\\]')
@@ -879,7 +879,7 @@ lang.crontab.format.selection inverse
lang.crontab.format.found yellow inverse
lang.crontab.tokens.comments (^\s*#.*)
lang.crontab.tokens.comments.format yellow bold
-lang.crontab.comment_string #
+lang.crontab.comment_string #
lang.crontab.tokens.schedule ^((?:[0-9\/*,-]+\s+){5})
lang.crontab.tokens.schedule.format cyan bold
lang.crontab.tokens.commands ^(\S+=.+)
@@ -895,7 +895,7 @@ lang.fstab.format.selection inverse
lang.fstab.format.found yellow inverse
lang.fstab.tokens.comments (^\s*#.*)
lang.fstab.tokens.comments.format yellow bold
-lang.fstab.comment_string #
+lang.fstab.comment_string #
lang.fstab.indent.size 4
lang.fstab.indent.auto true
lang.fstab.indent.roundup true
@@ -920,7 +920,7 @@ lang.sql.tokens.data_types.case_insensitive \b(BIT|BOOLEAN|CHAR|CHARACTER|DATE|D
lang.sql.tokens.data_types.format brown
lang.sql.tokens.comments (--.*)
lang.sql.tokens.comments.format 8 bold
-lang.sql.comment_string --
+lang.sql.comment_string --
lang.sql.tokens.singlequoted_strings ('.*?[^\\]')
lang.sql.tokens.singlequoted_strings.format green bold
lang.sql.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -946,7 +946,7 @@ lang.bash.indent.roundup true
lang.bash.tabsize 4
lang.bash.tokens.comments (^\s*#.*)
lang.bash.tokens.comments.format 8 bold
-lang.bash.comment_string #
+lang.bash.comment_string #
lang.bash.tokens.singlequoted_strings ('.*?[^\\]')
lang.bash.tokens.singlequoted_strings.format green bold
lang.bash.tokens.doublequoted_strings (\".*?[^\\]\")
@@ -972,7 +972,7 @@ lang.tcl.indent.roundup true
lang.tcl.tabsize 4
lang.tcl.tokens.comments (^\s*#.*)
lang.tcl.tokens.comments.format 8 bold
-lang.tcl.comment_string #
+lang.tcl.comment_string #
lang.tcl.tokens.reserved_words \b(encoding|incr|pid|tcl_endOfWord|Tcl|eof|info|tcl_findLibrary|after|error|interp|pkg_mkIndex|tcl_startOfNextWord|append|eval|join|proc|tcl_startOfPreviousWord|array|exec|lappend|puts|tcl_wordBreakAfter|auto_execok|exit|lassign|pwd|tcl_wordBreakBefore|auto_import|expr|lindex|re_syntax|tcltest|auto_load|fblocked|linsert|read|tclvars|auto_mkindex|fconfigure|list|regexp|tell|auto_mkindex_old|fcopy|llength|registry|time|auto_qualify|file|load|regsub|trace|auto_reset|fileevent|lrange|rename|unknown|bgerror|filename|lrepeat|resource|unload|binary|flush|lreplace|return|unset|break|for|lsearch|scan|update|catch|foreach|lset|seek|uplevel|cd|format|lsort|set|upvar|clock|gets|memory|socket|variable|close|glob|msgcat|source|vwait|concat|global|namespace|split|while|continue|history|open|string|dde|http|package|subst|dict|if|parray|switch)\b
lang.tcl.tokens.reserved_words.format white
lang.tcl.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -1045,7 +1045,7 @@ lang.yaml.tokens.directive_indicator ^(%.*)
lang.yaml.tokens.directive_indicator.format 10
lang.yaml.tokens.comment_indicator (#.+)
lang.yaml.tokens.comment_indicator.format 8 bold
-lang.yaml.comment_string #
+lang.yaml.comment_string #
lang.yaml.tokens.anchor_indicator (&\w+)
lang.yaml.tokens.anchor_indicator.format red bold
lang.yaml.tokens.alias_indicator (\*\w+)
diff --git a/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu b/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu
index a8819e3c..6647de9f 100644
--- a/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu
+++ b/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu
@@ -1,15 +1,15 @@
# lighttpd configuration file
-#
+#
# use a it as base for lighttpd 1.0.0 and above
#
#%% Options you really have to take care of
-#%
+#%
# modules to load
# at least mod_access and mod_accesslog should be loaded
# all other module should only be loaded if really neccesary
# - saves some time
# - saves memory
-server.dir-listing = "disable"
+server.dir-listing = "disable"
server.modules = ( "mod_rewrite",
"mod_access",
"mod_fastcgi",
@@ -17,14 +17,14 @@ server.modules = ( "mod_rewrite",
"mod_accesslog")
#%% a static document-root, for virtual-hosting take look at the
#% server.virtual-* options
-server.document-root = "/var/www/"
-#server.document-root = "/home/*username*/web/public/"
+server.document-root = "/var/www/"
+#server.document-root = "/home/*username*/web/public/"
## 'Parent' domain on any server except davie.
-#server.document-root = "/home/*username*/public_html/"
-##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
+#server.document-root = "/home/*username*/public_html/"
+##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
#server.document-root = "/home/*username*/web/public/"
#% where to send error-messages to
-server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
+server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
#% files to check for if .../ is requested
server.indexfiles = ( "index.php", "index.html",
"index.htm", "index.rb")
@@ -56,13 +56,13 @@ mimetype.assign = (
".odt" => "application/vnd.oasis.opendocument.text",
".bz2" => "application/x-bzip",
".tbz" => "application/x-bzip-compressed-tar",
- ".tar.bz2" => "application/x-bzip-compressed-tar"
+ ".tar.bz2" => "application/x-bzip-compressed-tar"
)
# text/x-server-parsed-html
#%Server ID Header
-server.tag = "lighttpd | TextDriven"
+server.tag = "lighttpd | TextDriven"
#%### accesslog module
-accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
#% deny access the file-extensions
#
# ~ is for backupfiles from vi, emacs, joe, ...
@@ -76,16 +76,16 @@ server.port = 81
#server.port = 8111
#server.port = 8965
##% bind to localhost (default: all interfaces)
-server.bind = "localhost"
-#server.bind = "corundum"
-##server.bind = "grisu.home.kneschke.de"
+server.bind = "localhost"
+#server.bind = "corundum"
+##server.bind = "grisu.home.kneschke.de"
##% to help the rc.scripts
-server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
+server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
#$HTTP["host"] =~ "\.corundum\.(name|com|net|org)" {
$HTTP["host"] == "localhost" {
- server.document-root = "/var/www/"
- server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
- accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+ server.document-root = "/var/www/"
+ server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
+ accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
url.rewrite-repeat = (
"^.*/$" => "index.html",
"^(.*/(landscape|portrait))$" => "$1.pdf",
@@ -93,7 +93,7 @@ $HTTP["host"] == "localhost" {
"^(.*/(sax|dom))$" => "$1.xml",
"^([^.]+)$" => "$1.html"
)
- server.error-handler-404 = "/dispatch.fcgi"
+ server.error-handler-404 = "/dispatch.fcgi"
# fastcgi.server = ( ".fcgi" =>
# ( "localhost" =>
# (
@@ -105,11 +105,11 @@ $HTTP["host"] == "localhost" {
# )
# )
# )
-}
+}
#% change uid to <uid> (default: don't care)
-server.username = "[*username*]"
+server.username = "[*username*]"
#% change uid to <uid> (default: don't care)
-server.groupname = "[*username*]"
+server.groupname = "[*username*]"
#%## compress module
-compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
+compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
diff --git a/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu_www b/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu_www
index d23c12ce..0dd16c94 100644
--- a/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu_www
+++ b/data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu_www
@@ -1,15 +1,15 @@
# lighttpd configuration file
-#
+#
# use a it as base for lighttpd 1.0.0 and above
#
#%% Options you really have to take care of
-#%
+#%
# modules to load
# at least mod_access and mod_accesslog should be loaded
# all other module should only be loaded if really neccesary
# - saves some time
# - saves memory
-server.dir-listing = "disable"
+server.dir-listing = "disable"
server.modules = ( "mod_rewrite",
"mod_access",
"mod_fastcgi",
@@ -17,14 +17,14 @@ server.modules = ( "mod_rewrite",
"mod_accesslog")
#%% a static document-root, for virtual-hosting take look at the
#% server.virtual-* options
-server.document-root = "/home/[user home]/sisu_www/"
-#server.document-root = "/home/*username*/web/public/"
+server.document-root = "/home/[user home]/sisu_www/"
+#server.document-root = "/home/*username*/web/public/"
## 'Parent' domain on any server except davie.
-#server.document-root = "/home/*username*/public_html/"
-##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
+#server.document-root = "/home/*username*/public_html/"
+##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
#server.document-root = "/home/*username*/web/public/"
#% where to send error-messages to
-server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
+server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
#% files to check for if .../ is requested
server.indexfiles = ( "index.php", "index.html",
"index.htm", "index.rb")
@@ -56,13 +56,13 @@ mimetype.assign = (
".odt" => "application/vnd.oasis.opendocument.text",
".bz2" => "application/x-bzip",
".tbz" => "application/x-bzip-compressed-tar",
- ".tar.bz2" => "application/x-bzip-compressed-tar"
+ ".tar.bz2" => "application/x-bzip-compressed-tar"
)
# text/x-server-parsed-html
#%Server ID Header
-server.tag = "lighttpd | TextDriven"
+server.tag = "lighttpd | TextDriven"
#%### accesslog module
-accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
#% deny access the file-extensions
#
# ~ is for backupfiles from vi, emacs, joe, ...
@@ -76,16 +76,16 @@ server.port = 8111
#server.port = 8111
#server.port = 8965
##% bind to localhost (default: all interfaces)
-server.bind = "localhost"
-#server.bind = "corundum"
-##server.bind = "grisu.home.kneschke.de"
+server.bind = "localhost"
+#server.bind = "corundum"
+##server.bind = "grisu.home.kneschke.de"
##% to help the rc.scripts
-server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
+server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
#$HTTP["host"] =~ "\.corundum\.(name|com|net|org)" {
$HTTP["host"] == "localhost" {
- server.document-root = "/home/[*username*]/sisu_www/"
- server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
- accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
+ server.document-root = "/home/[*username*]/sisu_www/"
+ server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
+ accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
url.rewrite-repeat = (
"^.*/$" => "index.html",
"^(.*/(landscape|portrait))$" => "$1.pdf",
@@ -93,7 +93,7 @@ $HTTP["host"] == "localhost" {
"^(.*/(sax|dom))$" => "$1.xml",
"^([^.]+)$" => "$1.html"
)
- server.error-handler-404 = "/dispatch.fcgi"
+ server.error-handler-404 = "/dispatch.fcgi"
# fastcgi.server = ( ".fcgi" =>
# ( "localhost" =>
# (
@@ -105,11 +105,11 @@ $HTTP["host"] == "localhost" {
# )
# )
# )
-}
+}
#% change uid to <uid> (default: don't care)
-server.username = "[*username*]"
+server.username = "[*username*]"
#% change uid to <uid> (default: don't care)
-server.groupname = "[*username*]"
+server.groupname = "[*username*]"
#%## compress module
-compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
+compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")