summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--platform/etc/nginx/www.conf.sample34
-rw-r--r--platform/etc/php-fpm/www.conf.sample2
-rw-r--r--platform/www/conf/local.php6
-rw-r--r--platform/www/data/meta/en/index.changes2
-rw-r--r--platform/www/data/meta/en/index.indexed2
-rw-r--r--platform/www/data/meta/en/index.meta6
-rw-r--r--platform/www/data/pages/en/index.txt9
-rw-r--r--platform/www/data/pages/playground/playground.txt1
-rw-r--r--platform/www/data/pages/wiki/dokuwiki.txt62
-rw-r--r--platform/www/data/pages/wiki/syntax.txt525
-rw-r--r--platform/www/data/pages/wiki/welcome.txt30
11 files changed, 51 insertions, 628 deletions
diff --git a/platform/etc/nginx/www.conf.sample b/platform/etc/nginx/www.conf.sample
index cacddaa..1243549 100644
--- a/platform/etc/nginx/www.conf.sample
+++ b/platform/etc/nginx/www.conf.sample
@@ -1,6 +1,6 @@
server {
listen 80;
- server_name acerv.uz *.acerv.uz;
+ server_name acerv.us *.acerv.us;
root /srv/acerv.us/platform/www/;
error_log /srv/acerv.us/platform/log/nginx.error error;
@@ -40,3 +40,35 @@ server {
fastcgi_buffering off;
}
}
+
+# Define the subsites
+
+server {
+ if ($host = esteva.acerv.us) {
+ return 301 https://$host$request_uri;
+ } # managed by Certbot
+
+
+ if ($host = cidoc.acerv.us) {
+ return 301 https://$host$request_uri;
+ } # managed by Certbot
+
+
+ if ($host = illich.acerv.us) {
+ return 301 https://$host$request_uri;
+ } # managed by Certbot
+
+
+ if ($host = acerv.us) {
+ return 301 https://$host$request_uri;
+ } # managed by Certbot
+
+ if ($host = *.acerv.us) {
+ return 301 https://$host$request_uri;
+ } # managed by Certbot
+
+ listen 80;
+ server_name acerv.us *.acerv.us;
+ return 404; # managed by Certbot
+
+}
diff --git a/platform/etc/php-fpm/www.conf.sample b/platform/etc/php-fpm/www.conf.sample
index fe61ee1..2d0a9ad 100644
--- a/platform/etc/php-fpm/www.conf.sample
+++ b/platform/etc/php-fpm/www.conf.sample
@@ -47,7 +47,7 @@ php_admin_value[memory_limit] = 128M
php_admin_value[post_max_size] = 12M
php_admin_value[upload_max_filesize] = 10M
-; php_admin_value[session.cookie_domain] = .acervu.us
+; php_admin_value[session.cookie_domain] = .acerv.us
php_admin_value[cgi.fix_pathinfo] = 1
php_admin_value[session.save_path] = /srv/acerv.us/platform/tmp/
diff --git a/platform/www/conf/local.php b/platform/www/conf/local.php
index 3d8358a..976def9 100644
--- a/platform/www/conf/local.php
+++ b/platform/www/conf/local.php
@@ -3,7 +3,7 @@
* Dokuwiki's Main Configuration File - Local Settings
* Auto-generated by config plugin
* Run for user: admin
- * Date: Tue, 08 Mar 2022 19:07:53 +0000
+ * Date: Sat, 12 Mar 2022 20:10:08 +0000
*/
$conf['title'] = 'The Acervus Project';
@@ -16,9 +16,10 @@ $conf['useacl'] = 1;
$conf['superuser'] = 'admin';
$conf['disableactions'] = 'register';
$conf['htmlok'] = 1;
+$conf['target']['extern'] = '_blank';
+$conf['mailfrom'] = 'info@acerv.us';
$conf['userewrite'] = '1';
$conf['plugin']['authldap']['attributes'] = array();
-$conf['plugin']['fastwiki']['save'] = 1;
$conf['plugin']['pageredirect']['show_note'] = 0;
$conf['plugin']['translation']['translations'] = 'en es';
$conf['plugin']['translation']['display'] = 'langcode,name';
@@ -28,3 +29,4 @@ $conf['plugin']['translation']['copytrans'] = 1;
$conf['tpl']['acervus']['numberedHeading'] = 1;
$conf['tpl']['acervus']['tocPosition'] = 'dokuwiki';
$conf['tpl']['acervus']['footer'] = 'footer';
+$conf['plugin']['fastwiki']['save'] = '1';
diff --git a/platform/www/data/meta/en/index.changes b/platform/www/data/meta/en/index.changes
index 176146d..ea28e0b 100644
--- a/platform/www/data/meta/en/index.changes
+++ b/platform/www/data/meta/en/index.changes
@@ -1,2 +1,4 @@
1646766450 192.168.56.1 C en:index admin created 39
1646767088 192.168.56.1 E en:index admin 1938
+1656726728 127.0.0.1 E en:index external edit 1981
+1660778261 192.168.56.1 E en:index admin -539
diff --git a/platform/www/data/meta/en/index.indexed b/platform/www/data/meta/en/index.indexed
index 301160a..ecc2267 100644
--- a/platform/www/data/meta/en/index.indexed
+++ b/platform/www/data/meta/en/index.indexed
@@ -1 +1 @@
-8 \ No newline at end of file
+8+plugin_tag=0.2.deaccent=1 \ No newline at end of file
diff --git a/platform/www/data/meta/en/index.meta b/platform/www/data/meta/en/index.meta
index c4a4f9d..486c9be 100644
--- a/platform/www/data/meta/en/index.meta
+++ b/platform/www/data/meta/en/index.meta
@@ -1,3 +1,5 @@
-a:2:{s:7:"current";a:9:{s:4:"date";a:2:{s:7:"created";i:1646766450;s:8:"modified";i:1646767088;}s:7:"creator";s:5:"admin";s:4:"user";s:5:"admin";s:11:"last_change";b:0;s:11:"contributor";a:1:{s:5:"admin";s:5:"admin";}s:5:"title";s:31:"Welcome to The Acervus Project!";s:11:"description";a:2:{s:15:"tableofcontents";a:1:{i:0;a:4:{s:3:"hid";s:30:"welcome_to_the_acervus_project";s:5:"title";s:31:"Welcome to The Acervus Project!";s:4:"type";s:2:"ul";s:5:"level";i:1;}}s:8:"abstract";s:329:"Welcome to The Acervus Project!
+a:2:{s:7:"current";a:9:{s:4:"date";a:2:{s:7:"created";i:1646766450;s:8:"modified";i:1660778261;}s:7:"creator";s:5:"admin";s:4:"user";s:5:"admin";s:11:"last_change";a:8:{s:4:"date";i:1660778261;s:2:"ip";s:12:"192.168.56.1";s:4:"type";s:1:"E";s:2:"id";s:8:"en:index";s:4:"user";s:5:"admin";s:3:"sum";s:0:"";s:5:"extra";s:0:"";s:10:"sizechange";i:-539;}s:11:"contributor";a:1:{s:5:"admin";s:5:"admin";}s:5:"title";s:31:"Welcome to The Acervus Project!";s:11:"description";a:2:{s:15:"tableofcontents";a:1:{i:0;a:4:{s:3:"hid";s:30:"welcome_to_the_acervus_project";s:5:"title";s:31:"Welcome to The Acervus Project!";s:4:"type";s:2:"ul";s:5:"level";i:1;}}s:8:"abstract";s:386:"Welcome to The Acervus Project!
-The initiative has a double purpose: to contribute to the understanding of the critical current condition and to the analysis and debate of the existing options, based on the contributions of Ivan Illich’s circle, and to constitute a complete digital library of his work of general open access.";}s:8:"internal";a:2:{s:5:"cache";b:1;s:3:"toc";b:1;}s:8:"relation";a:1:{s:10:"firstimage";s:0:"";}}s:10:"persistent";a:5:{s:4:"date";a:2:{s:7:"created";i:1646766450;s:8:"modified";i:1646767088;}s:7:"creator";s:5:"admin";s:4:"user";s:5:"admin";s:11:"last_change";b:0;s:11:"contributor";a:1:{s:5:"admin";s:5:"admin";}}} \ No newline at end of file
+This project is under development, more news very soon!
+
+The initiative has a double purpose: to contribute to the understanding of the critical current condition and to the analysis and debate of the existing options, based on the contributions of Ivan Illich’s circle, and to constitute a complete digital library of his work of general open access.";}s:8:"internal";a:2:{s:5:"cache";b:1;s:3:"toc";b:1;}s:8:"relation";a:1:{s:10:"firstimage";s:0:"";}}s:10:"persistent";a:5:{s:4:"date";a:2:{s:7:"created";i:1646766450;s:8:"modified";i:1660778261;}s:7:"creator";s:5:"admin";s:4:"user";s:5:"admin";s:11:"last_change";a:8:{s:4:"date";i:1660778261;s:2:"ip";s:12:"192.168.56.1";s:4:"type";s:1:"E";s:2:"id";s:8:"en:index";s:4:"user";s:5:"admin";s:3:"sum";s:0:"";s:5:"extra";s:0:"";s:10:"sizechange";i:-539;}s:11:"contributor";a:1:{s:5:"admin";s:5:"admin";}}} \ No newline at end of file
diff --git a/platform/www/data/pages/en/index.txt b/platform/www/data/pages/en/index.txt
index fd3a3f6..6bbce37 100644
--- a/platform/www/data/pages/en/index.txt
+++ b/platform/www/data/pages/en/index.txt
@@ -1,11 +1,14 @@
# Welcome to The Acervus Project!
+**This project is under development, more news very soon!**
+
The initiative has a double purpose: to contribute to the understanding of the critical current condition and to the analysis and debate of the existing options, based on the contributions of Ivan Illich’s circle, and to constitute a complete digital library of his work of general open access.
-The initiative seeks to constitute a digital acervus of Ivan Illich's work, based on the original texts and new revised and updated translations in other languages (starting from Spanish but with the capability to integrate others like German, Italian and French). All the material will be presented in a digital platform specially designed for easy access, referencing, reading in different supports/formats and re-edition in paper by independent groups.
+The initiative seeks to constitute a digital acervus of different authors like Ivan Illich, Jean Robert, Gustavo Esteva and others. All the material will be presented in a digital platform specially designed for easy access, referencing, reading in different supports/formats and re-edition in paper by independent groups with non-profit purposes.
This virtual space will be developed using open source technologies oriented to collaboration, decentralized self-publication and interaction with the contents in a diverse set of ways. This will make it possible to consolidate a reliable, legible and lasting source that will allow access to each work as well as refer to specific portions and extracts.
-The library will consist of the books, their various versions in different languages (identifying whether they are direct translations of other versions), revised translations, compilations, articles, interviews, audio and video recordings. It will be a dynamic and collaborative publishing platform.
+The library will consist of the books, their various versions in different languages (identifying whether they are direct translations of other versions), compilations, articles, interviews, audio and video recordings. It will be a dynamic and collaborative publishing platform.
+
+**If you want to reach us, please write to <info@acerv.us>**
-Starting 2022, we will expand the collection to incorporate the work of authors from the Illich constellation: Robert, Sicilia, Mitcham, Duden, Hoinacki, Gorz, among others. The archive will be then a meeting point around the "Illichian thought", enriched by the work of his friends and collaborators. It will be a space that will not only allow the dissemination of this valuable corpus, but also enable the possibility of putting it in context, drawing relationships and producing new knowledge in the light of current challenges.
diff --git a/platform/www/data/pages/playground/playground.txt b/platform/www/data/pages/playground/playground.txt
deleted file mode 100644
index a2274bd..0000000
--- a/platform/www/data/pages/playground/playground.txt
+++ /dev/null
@@ -1 +0,0 @@
-====== PlayGround ======
diff --git a/platform/www/data/pages/wiki/dokuwiki.txt b/platform/www/data/pages/wiki/dokuwiki.txt
deleted file mode 100644
index 1e5a198..0000000
--- a/platform/www/data/pages/wiki/dokuwiki.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-====== DokuWiki ======
-
-[[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a simple to use and highly versatile Open Source [[wp>wiki]] software that doesn't require a database. It is loved by users for its clean and readable [[wiki:syntax]]. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in [[doku>acl|access controls]] and [[doku>auth|authentication connectors]] make DokuWiki especially useful in the enterprise context and the large number of [[doku>plugins]] contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.
-
-Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki.
-
-===== Download =====
-
-DokuWiki is available at https://download.dokuwiki.org/
-
-
-===== Read More =====
-
-All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>|www.dokuwiki.org]].
-
-**About DokuWiki**
-
- * [[doku>features|A feature list]] :!:
- * [[doku>users|Happy Users]]
- * [[doku>press|Who wrote about it]]
- * [[doku>blogroll|What Bloggers think]]
- * [[https://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]]
-
-**Installing DokuWiki**
-
- * [[doku>requirements|System Requirements]]
- * [[https://download.dokuwiki.org/|Download DokuWiki]] :!:
- * [[doku>changes|Change Log]]
- * [[doku>Install|How to install or upgrade]] :!:
- * [[doku>config|Configuration]]
-
-**Using DokuWiki**
-
- * [[doku>syntax|Wiki Syntax]]
- * [[doku>manual|The manual]] :!:
- * [[doku>FAQ|Frequently Asked Questions (FAQ)]]
- * [[doku>glossary|Glossary]]
-
-**Customizing DokuWiki**
-
- * [[doku>tips|Tips and Tricks]]
- * [[doku>Template|How to create and use templates]]
- * [[doku>plugins|Installing plugins]]
- * [[doku>development|Development Resources]]
-
-**DokuWiki Feedback and Community**
-
- * [[doku>newsletter|Subscribe to the newsletter]] :!:
- * [[doku>mailinglist|Join the mailing list]]
- * [[https://forum.dokuwiki.org|Check out the user forum]]
- * [[doku>irc|Talk to other users in the IRC channel]]
- * [[https://github.com/splitbrain/dokuwiki/issues|Submit bugs and feature wishes]]
- * [[doku>thanks|Some humble thanks]]
-
-
-===== Copyright =====
-
-2004-2020 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[https://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community
-
-The DokuWiki engine is licensed under [[https://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-).
-
-Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]].
diff --git a/platform/www/data/pages/wiki/syntax.txt b/platform/www/data/pages/wiki/syntax.txt
deleted file mode 100644
index bf36c08..0000000
--- a/platform/www/data/pages/wiki/syntax.txt
+++ /dev/null
@@ -1,525 +0,0 @@
-====== Formatting Syntax ======
-
-[[doku>DokuWiki]] supports some simple markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by pressing "Edit this page". If you want to try something, just use the [[playground:playground|playground]] page. The simpler markup is easily accessible via [[doku>toolbar|quickbuttons]], too.
-
-===== Basic Text Formatting =====
-
-DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these.
-
- DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts.
- Of course you can **__//''combine''//__** all these.
-
-You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
-
- You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
-
-You can mark something as <del>deleted</del> as well.
-
- You can mark something as <del>deleted</del> as well.
-
-**Paragraphs** are created from blank lines. If you want to **force a newline** without a paragraph, you can use two backslashes followed by a whitespace or the end of line.
-
-This is some text with some linebreaks\\ Note that the
-two backslashes are only recognized at the end of a line\\
-or followed by\\ a whitespace \\this happens without it.
-
- This is some text with some linebreaks\\ Note that the
- two backslashes are only recognized at the end of a line\\
- or followed by\\ a whitespace \\this happens without it.
-
-You should use forced newlines only if really needed.
-
-===== Links =====
-
-DokuWiki supports multiple ways of creating links.
-
-==== External ====
-
-External links are recognized automagically: http://www.google.com or simply www.google.com - You can set the link text as well: [[http://www.google.com|This Link points to google]]. Email addresses like this one: <andi@splitbrain.org> are recognized, too.
-
- DokuWiki supports multiple ways of creating links. External links are recognized
- automagically: http://www.google.com or simply www.google.com - You can set
- link text as well: [[http://www.google.com|This Link points to google]]. Email
- addresses like this one: <andi@splitbrain.org> are recognized, too.
-
-==== Internal ====
-
-Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]].
-
- Internal links are created by using square brackets. You can either just give
- a [[pagename]] or use an additional [[pagename|link text]].
-
-[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed.
-
-You can use [[some:namespaces]] by using a colon in the pagename.
-
- You can use [[some:namespaces]] by using a colon in the pagename.
-
-For details about namespaces see [[doku>namespaces]].
-
-Linking to a specific section is possible, too. Just add the section name behind a hash character as known from HTML. This links to [[syntax#internal|this Section]].
-
- This links to [[syntax#internal|this Section]].
-
-Notes:
-
- * Links to [[syntax|existing pages]] are shown in a different style from [[nonexisting]] ones.
- * DokuWiki does not use [[wp>CamelCase]] to automatically create links by default, but this behavior can be enabled in the [[doku>config]] file. Hint: If DokuWiki is a link, then it's enabled.
- * When a section's heading is changed, its bookmark changes, too. So don't rely on section linking too much.
-
-==== Interwiki ====
-
-DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
-
- DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis.
- For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
-
-==== Windows Shares ====
-
-Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogeneous user group like a corporate [[wp>Intranet]].
-
- Windows Shares like [[\\server\share|this]] are recognized, too.
-
-Notes:
-
- * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
- * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): <code - conf/lang/en/lang.php>
-<?php
-/**
- * Customization of the english language file
- * Copy only the strings that needs to be modified
- */
-$lang['js']['nosmblinks'] = '';
-</code>
-
-==== Image Links ====
-
-You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this:
-
- [[http://php.net|{{wiki:dokuwiki-128.png}}]]
-
-[[http://php.net|{{wiki:dokuwiki-128.png}}]]
-
-Please note: The image formatting is the only formatting syntax accepted in link names.
-
-The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links).
-
-===== Footnotes =====
-
-You can add footnotes ((This is a footnote)) by using double parentheses.
-
- You can add footnotes ((This is a footnote)) by using double parentheses.
-
-===== Sectioning =====
-
-You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''<nowiki>~~NOTOC~~</nowiki>'' in the document.
-
-==== Headline Level 3 ====
-=== Headline Level 4 ===
-== Headline Level 5 ==
-
- ==== Headline Level 3 ====
- === Headline Level 4 ===
- == Headline Level 5 ==
-
-By using four or more dashes, you can make a horizontal line:
-
-----
-
-===== Media Files =====
-
-You can include external and internal [[doku>images|images, videos and audio files]] with curly brackets. Optionally you can specify the size of them.
-
-Real size: {{wiki:dokuwiki-128.png}}
-
-Resize to given width: {{wiki:dokuwiki-128.png?50}}
-
-Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}}
-
-Resized external image:           {{https://secure.php.net/images/php.gif?200x50}}
-
- Real size: {{wiki:dokuwiki-128.png}}
- Resize to given width: {{wiki:dokuwiki-128.png?50}}
- Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}
- Resized external image:           {{https://secure.php.net/images/php.gif?200x50}}
-
-
-By using left or right whitespaces you can choose the alignment.
-
-{{ wiki:dokuwiki-128.png}}
-
-{{wiki:dokuwiki-128.png }}
-
-{{ wiki:dokuwiki-128.png }}
-
- {{ wiki:dokuwiki-128.png}}
- {{wiki:dokuwiki-128.png }}
- {{ wiki:dokuwiki-128.png }}
-
-Of course, you can add a title (displayed as a tooltip by most browsers), too.
-
-{{ wiki:dokuwiki-128.png |This is the caption}}
-
- {{ wiki:dokuwiki-128.png |This is the caption}}
-
-For linking an image to another page see [[#Image Links]] above.
-
-==== Supported Media Formats ====
-
-DokuWiki can embed the following media formats directly.
-
-| Image | ''gif'', ''jpg'', ''png'' |
-| Video | ''webm'', ''ogv'', ''mp4'' |
-| Audio | ''ogg'', ''mp3'', ''wav'' |
-| Flash | ''swf'' |
-
-If you specify a filename that is not a supported media format, then it will be displayed as a link instead.
-
-By adding ''?linkonly'' you provide a link to the media without displaying it inline
-
- {{wiki:dokuwiki-128.png?linkonly}}
-
-{{wiki:dokuwiki-128.png?linkonly}} This is just a link to the image.
-
-==== Fallback Formats ====
-
-Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility.
-
-For example consider this embedded mp4 video:
-
- {{video.mp4|A funny video}}
-
-When you upload a ''video.webm'' and ''video.ogv'' next to the referenced ''video.mp4'', DokuWiki will automatically add them as alternatives so that one of the three files is understood by your browser.
-
-Additionally DokuWiki supports a "poster" image which will be shown before the video has started. That image needs to have the same filename as the video and be either a jpg or png file. In the example above a ''video.jpg'' file would work.
-
-===== Lists =====
-
-Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones.
-
- * This is a list
- * The second item
- * You may have different levels
- * Another item
-
- - The same list but ordered
- - Another item
- - Just use indention for deeper levels
- - That's it
-
-<code>
- * This is a list
- * The second item
- * You may have different levels
- * Another item
-
- - The same list but ordered
- - Another item
- - Just use indention for deeper levels
- - That's it
-</code>
-
-Also take a look at the [[doku>faq:lists|FAQ on list items]].
-
-===== Text Conversions =====
-
-DokuWiki can convert certain pre-defined characters or strings into images or other text or HTML.
-
-The text to image conversion is mainly done for smileys. And the text to HTML conversion is used for typography replacements, but can be configured to use other HTML as well.
-
-==== Text to Image Conversions ====
-
-DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. Those [[doku>Smileys]] and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki:
-
- * 8-) %% 8-) %%
- * 8-O %% 8-O %%
- * :-( %% :-( %%
- * :-) %% :-) %%
- * =) %% =) %%
- * :-/ %% :-/ %%
- * :-\ %% :-\ %%
- * :-? %% :-? %%
- * :-D %% :-D %%
- * :-P %% :-P %%
- * :-O %% :-O %%
- * :-X %% :-X %%
- * :-| %% :-| %%
- * ;-) %% ;-) %%
- * ^_^ %% ^_^ %%
- * :?: %% :?: %%
- * :!: %% :!: %%
- * LOL %% LOL %%
- * FIXME %% FIXME %%
- * DELETEME %% DELETEME %%
-
-==== Text to HTML Conversions ====
-
-Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters.
-
--> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
-"He thought 'It's a man's world'..."
-
-<code>
--> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
-"He thought 'It's a man's world'..."
-</code>
-
-The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]].
-
-There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]].
-
-===== Quoting =====
-
-Some times you want to mark some text to show it's a reply or comment. You can use the following syntax:
-
-<code>
-I think we should do it
-
-> No we shouldn't
-
->> Well, I say we should
-
-> Really?
-
->> Yes!
-
->>> Then lets do it!
-</code>
-
-I think we should do it
-
-> No we shouldn't
-
->> Well, I say we should
-
-> Really?
-
->> Yes!
-
->>> Then lets do it!
-
-===== Tables =====
-
-DokuWiki supports a simple syntax to create tables.
-
-^ Heading 1 ^ Heading 2 ^ Heading 3 ^
-| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
-| Row 2 Col 1 | some colspan (note the double pipe) ||
-| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
-
-Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers.
-
- ^ Heading 1 ^ Heading 2 ^ Heading 3 ^
- | Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
- | Row 2 Col 1 | some colspan (note the double pipe) ||
- | Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
-
-To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators!
-
-Vertical tableheaders are possible, too.
-
-| ^ Heading 1 ^ Heading 2 ^
-^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
-^ Heading 4 | no colspan this time | |
-^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
-
-As you can see, it's the cell separator before a cell which decides about the formatting:
-
- | ^ Heading 1 ^ Heading 2 ^
- ^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
- ^ Heading 4 | no colspan this time | |
- ^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
-
-You can have rowspans (vertically connected cells) by adding ''%%:::%%'' into the cells below the one to which they should connect.
-
-^ Heading 1 ^ Heading 2 ^ Heading 3 ^
-| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
-| Row 2 Col 1 | ::: | Row 2 Col 3 |
-| Row 3 Col 1 | ::: | Row 2 Col 3 |
-
-Apart from the rowspan syntax those cells should not contain anything else.
-
- ^ Heading 1 ^ Heading 2 ^ Heading 3 ^
- | Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
- | Row 2 Col 1 | ::: | Row 2 Col 3 |
- | Row 3 Col 1 | ::: | Row 2 Col 3 |
-
-You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text.
-
-^ Table with alignment ^^^
-| right| center |left |
-|left | right| center |
-| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
-
-This is how it looks in the source:
-
- ^ Table with alignment ^^^
- | right| center |left |
- |left | right| center |
- | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
-
-Note: Vertical alignment is not supported.
-
-===== No Formatting =====
-
-If you need to display text exactly like it is typed (without any formatting), enclose the area either with ''%%<nowiki>%%'' tags or even simpler, with double percent signs ''<nowiki>%%</nowiki>''.
-
-<nowiki>
-This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
-</nowiki>
-The same is true for %%//__this__ text// with a smiley ;-)%%.
-
- <nowiki>
- This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
- </nowiki>
- The same is true for %%//__this__ text// with a smiley ;-)%%.
-
-===== Code Blocks =====
-
-You can include code blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''%%<code>%%'' or ''%%<file>%%''.
-
- This is text is indented by two spaces.
-
-<code>
-This is preformatted code all spaces are preserved: like <-this
-</code>
-
-<file>
-This is pretty much the same, but you could use it to show that you quoted a file.
-</file>
-
-Those blocks were created by this source:
-
- This is text is indented by two spaces.
-
- <code>
- This is preformatted code all spaces are preserved: like <-this
- </code>
-
- <file>
- This is pretty much the same, but you could use it to show that you quoted a file.
- </file>
-
-==== Syntax Highlighting ====
-
-[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. ''<nowiki><code java></nowiki>'' or ''<nowiki><file java></nowiki>''.
-
-<code java>
-/**
- * The HelloWorldApp class implements an application that
- * simply displays "Hello World!" to the standard output.
- */
-class HelloWorldApp {
- public static void main(String[] args) {
- System.out.println("Hello World!"); //Display the string.
- }
-}
-</code>
-
-The following language strings are currently recognized: //4cs 6502acme 6502kickass 6502tasm 68000devpac abap actionscript3 actionscript ada aimms algol68 apache applescript apt_sources arm asm asp asymptote autoconf autohotkey autoit avisynth awk bascomavr bash basic4gl batch bf biblatex bibtex blitzbasic bnf boo caddcl cadlisp ceylon cfdg cfm chaiscript chapel cil c_loadrunner clojure c_mac cmake cobol coffeescript c cpp cpp-qt cpp-winapi csharp css cuesheet c_winapi dart dcl dcpu16 dcs delphi diff div dos dot d ecmascript eiffel email epc e erlang euphoria ezt f1 falcon fo fortran freebasic freeswitch fsharp gambas gdb genero genie gettext glsl gml gnuplot go groovy gwbasic haskell haxe hicest hq9plus html html4strict html5 icon idl ini inno intercal io ispfpanel java5 java javascript jcl j jquery julia kixtart klonec klonecpp kotlin latex lb ldif lisp llvm locobasic logtalk lolcode lotusformulas lotusscript lscript lsl2 lua m68k magiksf make mapbasic mathematica matlab mercury metapost mirc mk-61 mmix modula2 modula3 mpasm mxml mysql nagios netrexx newlisp nginx nimrod nsis oberon2 objc objeck ocaml-brief ocaml octave oobas oorexx oracle11 oracle8 oxygene oz parasail parigp pascal pcre perl6 perl per pf phix php-brief php pic16 pike pixelbender pli plsql postgresql postscript povray powerbuilder powershell proftpd progress prolog properties providex purebasic pycon pys60 python qbasic qml q racket rails rbs rebol reg rexx robots roff rpmspec rsplus ruby rust sas sass scala scheme scilab scl sdlbasic smalltalk smarty spark sparql sql sshconfig standardml stonescript swift systemverilog tclegg tcl teraterm texgraph text thinbasic tsql twig typoscript unicon upc urbi uscript vala vbnet vb vbscript vedit verilog vhdl vim visualfoxpro visualprolog whitespace whois winbatch wolfram xbasic xml xojo xorg_conf xpp yaml z80 zxbasic//
-
-There are additional [[doku>syntax_highlighting|advanced options]] available for syntax highlighting, such as highlighting lines or adding line numbers.
-
-==== Downloadable Code Blocks ====
-
-When you use the ''%%<code>%%'' or ''%%<file>%%'' syntax as above, you might want to make the shown code available for download as well. You can do this by specifying a file name after language code like this:
-
-<code>
-<file php myexample.php>
-<?php echo "hello world!"; ?>
-</file>
-</code>
-
-<file php myexample.php>
-<?php echo "hello world!"; ?>
-</file>
-
-If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%<code - myfile.foo>%%''.
-
-
-===== Embedding HTML and PHP =====
-
-You can embed raw HTML or PHP code into your documents by using the ''%%<html>%%'' or ''%%<php>%%'' tags. (Use uppercase tags if you need to enclose block level elements.)
-
-HTML example:
-
-<code>
-<html>
-This is some <span style="color:red;font-size:150%;">inline HTML</span>
-</html>
-<HTML>
-<p style="border:2px dashed red;">And this is some block HTML</p>
-</HTML>
-</code>
-
-<html>
-This is some <span style="color:red;font-size:150%;">inline HTML</span>
-</html>
-<HTML>
-<p style="border:2px dashed red;">And this is some block HTML</p>
-</HTML>
-
-PHP example:
-
-<code>
-<php>
-echo 'The PHP version: ';
-echo phpversion();
-echo ' (generated inline HTML)';
-</php>
-<PHP>
-echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
-echo '<td>'.phpversion().'</td>';
-echo '</tr></table>';
-</PHP>
-</code>
-
-<php>
-echo 'The PHP version: ';
-echo phpversion();
-echo ' (inline HTML)';
-</php>
-<PHP>
-echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
-echo '<td>'.phpversion().'</td>';
-echo '</tr></table>';
-</PHP>
-
-**Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed.
-
-===== RSS/ATOM Feed Aggregation =====
-[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters:
-
-^ Parameter ^ Description ^
-| any number | will be used as maximum number items to show, defaults to 8 |
-| reverse | display the last items in the feed first |
-| author | show item authors names |
-| date | show item dates |
-| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped |
-| nosort | do not sort the items in the feed |
-| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). |
-
-The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered.
-
-By default the feed will be sorted by date, newest items first. You can sort it by oldest first using the ''reverse'' parameter, or display the feed as is with ''nosort''.
-
-**Example:**
-
- {{rss>http://slashdot.org/index.rss 5 author date 1h }}
-
-{{rss>http://slashdot.org/index.rss 5 author date 1h }}
-
-
-===== Control Macros =====
-
-Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble:
-
-^ Macro ^ Description |
-| %%~~NOTOC~~%% | If this macro is found on the page, no table of contents will be created |
-| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%<php>%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call |
-
-===== Syntax Plugins =====
-
-DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation:
-
-~~INFO:syntaxplugins~~
diff --git a/platform/www/data/pages/wiki/welcome.txt b/platform/www/data/pages/wiki/welcome.txt
deleted file mode 100644
index 10caa7c..0000000
--- a/platform/www/data/pages/wiki/welcome.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-====== Welcome to your new DokuWiki ======
-
-Congratulations, your wiki is now up and running. Here are a few more tips to get you started.
-
-Enjoy your work with DokuWiki,\\
--- the developers
-
-===== Create your first pages =====
-
-Your wiki needs to have a start page. As long as it doesn't exist, this link will be red: [[:start]].
-
-Go on, follow that link and create the page. If you need help with using the syntax you can always refer to the [[wiki:syntax|syntax page]].
-
-You might also want to use a sidebar. To create it, just edit the [[:sidebar]] page. Everything in that page will be shown in a margin column on the side. Read our [[doku>faq:sidebar|FAQ on sidebars]] to learn more.
-
-Please be aware that not all templates support sidebars.
-
-===== Customize your Wiki =====
-
-Once you're comfortable with creating and editing pages you might want to have a look at the [[this>doku.php?do=admin&page=config|configuration settings]] (be sure to login as superuser first).
-
-You may also want to see what [[doku>plugins|plugins]] and [[doku>templates|templates]] are available at DokuWiki.org to extend the functionality and looks of your DokuWiki installation.
-
-===== Join the Community =====
-
-DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]].
-
-The [[https://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]].
-
-Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki.