summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2006-06-21 20:12:56 +0200
committerAndreas Gohr <andi@splitbrain.org>2006-06-21 20:12:56 +0200
commite077833f31b6419fe3252de4b9ec880a49a62c52 (patch)
treea06cc4d964b094930db61a4e6c24b3affb5e4b37 /data
parent881debf19ed6e0e4e728c85a1e73b91e333dfd6e (diff)
downloadrpg-e077833f31b6419fe3252de4b9ec880a49a62c52.tar.gz
rpg-e077833f31b6419fe3252de4b9ec880a49a62c52.tar.bz2
GeSHi update to 1.0.7.11
darcs-hash:20060621181256-7ad00-36aacf46a148ec8d834bf0e294b9a107bfe1485d.gz
Diffstat (limited to 'data')
-rw-r--r--data/pages/wiki/dokuwiki.txt5
-rw-r--r--data/pages/wiki/syntax.txt2
2 files changed, 4 insertions, 3 deletions
diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index f6f36fda7..4f15b9be8 100644
--- a/data/pages/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -45,6 +45,7 @@ All documentation and additional information besides the [[syntax|syntax descrip
**DokuWiki Feedback**
* [[doku>wiki:mailinglist|Join the mailing list]] :!:
+ * [[doku>wiki:forum|Check out the user forum]]
* [[http://bugs.splitbrain.org/index.php?project=1|Submit bugs and feature wishes]]
* [[doku>wiki:discussion:discussion|The discussion pages]]
* [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Share your experiences in the WikiMatrix forum]]
@@ -52,12 +53,12 @@ All documentation and additional information besides the [[syntax|syntax descrip
===== Copyright =====
-2004-2006 (c) Andreas Gohr <andi@splitbrain.org>
+2004-2006 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>wiki:mailinglist|mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead))
The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider donating a few bucks to me via [[https://www.paypal.com/xclick/business=andi%40splitbrain.org&amp;item_name=DokuWiki+Donation&amp;no_shipping=1&amp;no_note=1&amp;tax=0&amp;currency_code=EUR&amp;lc=US|PayPal]] ;-).
The content published in the DokuWiki at http://www.splitbrain.org/dokuwiki/ is licensed under the [[http://creativecommons.org/licenses/by-nc-sa/2.0/|Creative Commons Attribution-NonCommercial-ShareAlike License]] Version 2.0.
-An exception is made for the content which distributed in the download tarball ((files inside the ''data'' directory -- eg: ''dokuwiki.txt'', ''syntax.txt'', ''dokuwiki-128.png'')) which is, for compatibility reasons, licensed under the GNU General Public License Version 2 as well.
+An exception is made for the content which distributed in the download tarball((files inside the ''data'' directory -- eg: ''dokuwiki.txt'', ''syntax.txt'', ''dokuwiki-128.png'')) which is, for compatibility reasons, licensed under the GNU General Public License Version 2 as well.
Not sure what this means? See the [[doku>wiki:faq#licenses_explained|FAQ on the Licenses]]. \ No newline at end of file
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 92907ceb9..009fecc4c 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -336,7 +336,7 @@ class HelloWorldApp {
}
</code>
-The following language strings are currently recognized: //actionscript, actionscript-french, ada, apache, applescript, asm, asp, autoit, bash, blitzbasic, caddcl, cadlisp, c, c_mac, cfm, cpp, csharp, css, delphi, diff, d, div, dos, eiffel, freebasic, gml, groovy, html4strict, ini, inno, java, java5, javascript, lisp, lua, matlab, mpasm, mysql, nsis, objc, ocaml, ocaml-brief, oobas, oracle8, pascal, perl, php-brief, php, python, qbasic, scheme, sdlbasic, smarty, sql, tcl, text, tsql, reg, robots, ruby, vb, vbnet, vhdl, visualfoxpro, winbatch, xml//
+The following language strings are currently recognized: //actionscript, actionscript-french, ada, apache, applescript, asm, asp, autoit, bash, blitzbasic, caddcl, cadlisp, c, c_mac, cfm, cpp, csharp, css, delphi, diff, d, div, dos, eiffel, freebasic, gml, groovy, html4strict, ini, inno, java, java5, javascript, lisp, lua, matlab, mpasm, mysql, nsis, objc, ocaml, ocaml-brief, oobas, oracle8, pascal, perl, php-brief, php, python, qbasic, scheme, sdlbasic, smalltalk, smarty, sql, tcl, text, tsql, reg, robots, ruby, vb, vbnet, vhdl, visualfoxpro, winbatch, xml//
===== Embedding HTML and PHP =====