Recent changes to this wiki:

Update the SMTP server name; drop the related SSL certificate remark for mail.vtilburg.net
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index dd14982..404842f 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -25,7 +25,7 @@ Optionally, IMAP-SSL (using port 993) is also supported but not preferred.
 
 Email can be sent using our mail server wherever your are (especially useful for mobile devices).  Use the following settings:
 
-* **server:** `mailhost.luon.net`
+* **server:** `smtp.luon.net`
 * **port:** 587 (submission) or 25 (smtp)
 * **security:** (START)TLS
 
@@ -33,8 +33,6 @@ The Submission port (587) is preferred as it is usually not blocked by a firewal
 
 The same remarks concerning the guest system and virtual email accounts hold as written above.
 
-*N.B.* Since our mail sending setup is currently hosted on the guest system `target.vtilburg.net`, you can use as server `mail.vtilburg.net` to prevent SSL certificate problems.
-
 ## Webmail
 
 The Luon webmail service is available at: [https://webmail.luon.net/](https://webmail.luon.net).

Fix typo in managesieve port
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index d1edaff..dd14982 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -66,7 +66,7 @@ By default there should already be a "Spam Filter" rule, ensure that you keep it
 Use the following settings for a manage-sieve client:
 
 * **server:** imap.luon.net
-* **port:** 4910 (*N.B.* This used to be 2000 before!)
+* **port:** 4190 (*N.B.* This used to be 2000 before!)
 * **security:** (START)TLS
 * **login:** email account user/password
 

Update remark about certificate issues; imap.luon.net works now, mailhost.luon.net no longer
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index a05ab95..d1edaff 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -21,8 +21,6 @@ The _preferred_ way to access the email, even on the host itself, is via IMAP.
 
 Optionally, IMAP-SSL (using port 993) is also supported but not preferred.
 
-*N.B.* Since our mail setup is currently hosted on the guest system `target.vtilburg.net`, you can use as server `mail.vtilburg.net` to prevent SSL certificate problems.
-
 ### Sending email
 
 Email can be sent using our mail server wherever your are (especially useful for mobile devices).  Use the following settings:
@@ -35,6 +33,8 @@ The Submission port (587) is preferred as it is usually not blocked by a firewal
 
 The same remarks concerning the guest system and virtual email accounts hold as written above.
 
+*N.B.* Since our mail sending setup is currently hosted on the guest system `target.vtilburg.net`, you can use as server `mail.vtilburg.net` to prevent SSL certificate problems.
+
 ## Webmail
 
 The Luon webmail service is available at: [https://webmail.luon.net/](https://webmail.luon.net).

Fix some typos
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index 568b446..a05ab95 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -51,19 +51,19 @@ Our IMAP server tracks the moves and trains accordingly.  Moving them from maild
 
 ## Server-side mail filtering
 
-Server-side filtering is done using [Sieve](http://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)).  Some [email clients](http://sieve.info/clients) support configuring the sieve.  The Luon Webmail is such a client, but there is also an [add-on](https://addons.mozilla.org/en-us/thunderbird/addon/sieve/) for Thunderbird.  Evolution unfortunately has no support at all.
+Server-side filtering is done using [Sieve](http://en.wikipedia.org/wiki/Sieve_%28mail_filtering_language%29).  Some [email clients](http://sieve.info/clients) support configuring the sieve.  The Luon Webmail is such a client, but there is also an [add-on](https://addons.mozilla.org/en-us/thunderbird/addon/sieve/) for Thunderbird.  Evolution unfortunately has no support at all.
 
 Configuring sieve can be done using our Webmail or via the [manage-sieve protocol](http://tools.ietf.org/html/rfc5804).
 
 ### ... via webmail
 
-Login on the (Luon Webmail)[https://webmail.luon.net], go to "Personal Settings" and then select the tab "Filters".
+Login on the [Luon Webmail](https://webmail.luon.net/), go to "Personal Settings" and then select the tab "Filters".
 On the left side you can add, remove and reorder rules, on the right side you can edit or temporarily disable the rules.
 By default there should already be a "Spam Filter" rule, ensure that you keep it and keep it at the top.
 
-### ... via Manage-Sieve
+### ... via a manage-sieve client
 
-Use the following settings for a Manage-Sieve client:
+Use the following settings for a manage-sieve client:
 
 * **server:** imap.luon.net
 * **port:** 4910 (*N.B.* This used to be 2000 before!)

Mention/add explanation about editing the spam filter via webmail
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index a8ae377..568b446 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -53,7 +53,17 @@ Our IMAP server tracks the moves and trains accordingly.  Moving them from maild
 
 Server-side filtering is done using [Sieve](http://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)).  Some [email clients](http://sieve.info/clients) support configuring the sieve.  The Luon Webmail is such a client, but there is also an [add-on](https://addons.mozilla.org/en-us/thunderbird/addon/sieve/) for Thunderbird.  Evolution unfortunately has no support at all.
 
-Configuring sieve can be done using the [manage-sieve protocol](http://tools.ietf.org/html/rfc5804).  Use the following settings:
+Configuring sieve can be done using our Webmail or via the [manage-sieve protocol](http://tools.ietf.org/html/rfc5804).
+
+### ... via webmail
+
+Login on the (Luon Webmail)[https://webmail.luon.net], go to "Personal Settings" and then select the tab "Filters".
+On the left side you can add, remove and reorder rules, on the right side you can edit or temporarily disable the rules.
+By default there should already be a "Spam Filter" rule, ensure that you keep it and keep it at the top.
+
+### ... via Manage-Sieve
+
+Use the following settings for a Manage-Sieve client:
 
 * **server:** imap.luon.net
 * **port:** 4910 (*N.B.* This used to be 2000 before!)

Change managesieve port to 4910
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index de9e856..a8ae377 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -56,7 +56,7 @@ Server-side filtering is done using [Sieve](http://en.wikipedia.org/wiki/Sieve_(
 Configuring sieve can be done using the [manage-sieve protocol](http://tools.ietf.org/html/rfc5804).  Use the following settings:
 
 * **server:** imap.luon.net
-* **port:** 2000
+* **port:** 4910 (*N.B.* This used to be 2000 before!)
 * **security:** (START)TLS
 * **login:** email account user/password
 

More fixes
diff --git a/voip_setup.mdwn b/voip_setup.mdwn
index 165a506..8436862 100644
--- a/voip_setup.mdwn
+++ b/voip_setup.mdwn
@@ -9,9 +9,9 @@ Below we go into more detail of the SIP-setup.
 
 ## Account
 
-The main account on which you will be reachable is `sips:<username>@luon.net`.
+The main account on which you will be reachable is `sips request:<username>@luon.net`.  This account does not exist by default, you have to request it!
 
-If you have multiple devices, you can request an account per device that is coupled to your main account and will be of the form `sips:<username>-<devicename>@luon.net`.  When the main account is called, all registered devices will be called.
+If you have multiple devices, you can addionally request an account per device that is coupled to your main account and will be of the form `sips:<username>-<devicename>@luon.net`.  When the main account is called, all registered devices will be called.
 
 Additionally, everyone will have a phone number, useful for SIP softphones that can only dial numbers.  The number will correspond to your UID on the Luon servers.
 
@@ -19,14 +19,17 @@ The following account settings need to be filled in to connect:
 
 * **SIP address:** `<username>@luon.net` (or `<username>-<devicename>@luon.net`)
 * **port:** 5061
-* **security:** (START)TLS
+* **transport:** (START)TLS
+* **ignore TLS errors:** yes[1]
 * **auto-detect STUN:** yes
 
-However, only the SIP address should be enough to figure the rest out.
+However, only if you are allowed to provide the full SIP address (i.e. `sips:<username>@luon.net`), it should be enough to figure the rest out. 
+
+1: This is necessary for now, since Asterisk seems to have some issue with chained certificates.
 
 ## Dialing
 
-To dial someone, just call to `<number/username>` (using the default account) or `sips:<number/username>@luon.net`. 
+To dial someone, just call to `<number>`/`<username>` (using the default account) or `sips:<number>@luon.net`/`sips:<username>@luon.net`. 
 
 ### Extra services
 
@@ -42,6 +45,4 @@ You can try to dial to other SIP accounts, but there is no guarantee that that w
 
 ## Jabber/XMPP (Jingle) to SIP gateway
 
-You can use the Asterisk bot on Jabber/XMPP to dial out.  Just add `asterisk@luon.net` to your roster and call it using Jingle (voice call).
-The bot will answer and ask for the extension to dial.  You can enter a username, extension, or even try an external SIP address and it will forward the call over SIP.
-
+You can use the Asterisk bot on Jabber/XMPP to dial out from Jabber to SIP.  Just add `asterisk@luon.net` to your roster and call it using Jingle (voice call). The bot will answer and ask for the extension to dial.  You can enter a username, extension, or even try an external SIP address and it will forward the call over SIP.

Small fixes
diff --git a/voip_setup.mdwn b/voip_setup.mdwn
index e161f4f..165a506 100644
--- a/voip_setup.mdwn
+++ b/voip_setup.mdwn
@@ -11,7 +11,7 @@ Below we go into more detail of the SIP-setup.
 
 The main account on which you will be reachable is `sips:<username>@luon.net`.
 
-If you have multiple device, you can request an account per device that is coupled to your main account and will be of the form `sips:<username>-<devicename>@luon.net`.  When the main account is called, all registered devices will be called.
+If you have multiple devices, you can request an account per device that is coupled to your main account and will be of the form `sips:<username>-<devicename>@luon.net`.  When the main account is called, all registered devices will be called.
 
 Additionally, everyone will have a phone number, useful for SIP softphones that can only dial numbers.  The number will correspond to your UID on the Luon servers.
 
@@ -26,7 +26,7 @@ However, only the SIP address should be enough to figure the rest out.
 
 ## Dialing
 
-To dial someone, just call to `sips:<number/username>`, or `sips:<number/username>@luon.net` if you have multiple accounts. 
+To dial someone, just call to `<number/username>` (using the default account) or `sips:<number/username>@luon.net`. 
 
 ### Extra services
 

Add initial explanation about the VoIP setup
diff --git a/voip_setup.mdwn b/voip_setup.mdwn
new file mode 100644
index 0000000..e161f4f
--- /dev/null
+++ b/voip_setup.mdwn
@@ -0,0 +1,47 @@
+# Luon's VoIP setup
+
+Our VoIP setup is currently based on Jabber/XMPP using [ejabberd](http://ejabberd.im) and SIP using [Asterisk](http://asterisk.org).
+
+
+At the moment the Jabber/XMPP-part is fully federated, but the SIP-part it is not.  Hence, it is only possible to call other Luon-users via SIP.
+
+Below we go into more detail of the SIP-setup.
+
+## Account
+
+The main account on which you will be reachable is `sips:<username>@luon.net`.
+
+If you have multiple device, you can request an account per device that is coupled to your main account and will be of the form `sips:<username>-<devicename>@luon.net`.  When the main account is called, all registered devices will be called.
+
+Additionally, everyone will have a phone number, useful for SIP softphones that can only dial numbers.  The number will correspond to your UID on the Luon servers.
+
+The following account settings need to be filled in to connect:
+
+* **SIP address:** `<username>@luon.net` (or `<username>-<devicename>@luon.net`)
+* **port:** 5061
+* **security:** (START)TLS
+* **auto-detect STUN:** yes
+
+However, only the SIP address should be enough to figure the rest out.
+
+## Dialing
+
+To dial someone, just call to `sips:<number/username>`, or `sips:<number/username>@luon.net` if you have multiple accounts. 
+
+### Extra services
+
+There are some extra services available:
+
+* `100`/`chat`: conference room
+* `200`/`echo`: echo service
+* `300`/`test`: sound test service
+
+### External dialing
+
+You can try to dial to other SIP accounts, but there is no guarantee that that will work just yet.  E.g. you can call to `sip:someuser@domain.tld`.
+
+## Jabber/XMPP (Jingle) to SIP gateway
+
+You can use the Asterisk bot on Jabber/XMPP to dial out.  Just add `asterisk@luon.net` to your roster and call it using Jingle (voice call).
+The bot will answer and ask for the extension to dial.  You can enter a username, extension, or even try an external SIP address and it will forward the call over SIP.
+

diff --git a/index.mdwn b/index.mdwn
index c79fcf7..9be6000 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,6 +6,8 @@ For now, there are pages about:
 
 * the [[Mail Setup]]
 
+* the [[VoIP Setup]]
+
 * [[Hosting]] info
 
 * [[Spacelabs inventory]]

Tweak local CSS for theme change
diff --git a/local.css b/local.css
index 04cb4af..ebfbeb9 100644
--- a/local.css
+++ b/local.css
@@ -9,7 +9,6 @@ h3 {
 pre {
   margin: 0em 1em 1em 1em;
   padding: 0.5em;
-  background: #fafafa;
 }
 
 ul > li {

Fix another typo
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index 02b4f2d..de9e856 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -94,6 +94,6 @@ Once a virtual domain is created, you can manage it by editing the aliases file
 
 In the above virtual mail domain, mail to `abuse@mydomain.tld` and `hostmaster@mydomain.tld` is redirected to the hostmaster listed by the system aliases (in `/etc/aliases`).
 Mail to `info@mymaildomain.tld` and `webmaster@mydomain.tld` is redirected to the virtual mail account `virtualuser@mydomain.tld` (if it exists).  
-Finally, mail to `realuser@mydomain.tld` is redirected to the (UNIX) account `someuser` if it exists and is not an alias in the system aliases.
+Finally, mail to `someuser@mydomain.tld` is redirected to the (UNIX) account `someuser` if it exists and is not an alias in the system aliases.
 
 Note that adding `@localhost` is required to redirect mail to UNIX accounts, possibly via system aliases.  Leaving the domain suffix out signifies that the mail needs to go to a virtual mail account, if not aliased first.

Fix typo
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index 744222c..02b4f2d 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -31,7 +31,7 @@ Email can be sent using our mail server wherever your are (especially useful for
 * **port:** 587 (submission) or 25 (smtp)
 * **security:** (START)TLS
 
-The Submission port (587) is preferred as it is usefully not blocked by a firewall, while the SMTP port (25) often is.
+The Submission port (587) is preferred as it is usually not blocked by a firewall, while the SMTP port (25) often is.
 
 The same remarks concerning the guest system and virtual email accounts hold as written above.
 

Move Spacelabs stuff to a separate subsection
diff --git a/hosting.mdwn b/hosting.mdwn
index bfe197d..62f1424 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -63,6 +63,14 @@
 * wiki.luon.net: target
 * yubnub.luon.net MX: cube
 
+## spacelabs.nl
+
+* {analysis.,intern.,webcam.,www.}spacelabs.nl: target
+* spacelabs.nl MX: cube
+* lists.spacelabs.nl: tetraeder
+* lists.spacelabs.nl MX: tetraeder
+* svn.spacelabs.nl: cube
+
 ## vtilburg.net
 
 * {www.,webmail.,}vtilburg.net: target
@@ -105,8 +113,3 @@
 * {www.,}proggerij.nl: target
 * proggerij.nl MX: cube
 * senders.eu MX: cube
-* {analysis.,intern.,webcam.,www.}spacelabs.nl: target
-* spacelabs.nl MX: cube
-* lists.spacelabs.nl: tetraeder
-* lists.spacelabs.nl MX: tetraeder
-* svn.spacelabs.nl: cube

Remove hosting options
diff --git a/hosting.mdwn b/hosting.mdwn
index 0069d28..bfe197d 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -20,11 +20,6 @@
 18. sofie: vmail, vweb
 19. wouter: vm en/of vmail, vweb
 
-# Opties
-
-* Advanced abonnement bij [CSV Networks](http://www.csv-networks.nl/dedicatedhuur.php)
-* Quad Core packages by [LW](http://www.leaseweb.com/en/dedicated-servers/quad-core-servers)
-
 # Hostname/domein-mappings
 
 ## luon.net

Add more info to the hostname/domain mapping (mainly mail related)
diff --git a/hosting.mdwn b/hosting.mdwn
index e21e287..0069d28 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -33,44 +33,85 @@
 * luon.net MX: cube, tetraeder, jupiter
 * luon.net SRV jabber: tetraeder
 * banaan.luon.net: target
+* ca.luon.net: tetraeder
+* {calendar,contacts}.luon.net: tetraeder
 * ftp.luon.net: target
 * ffrenzy.luon.net: target
 * gcam.luon.net: target
+* git.luon.net: cube
 * gkrellm.luon.net: target
+* harrykim.luon.net MX: cube
 * hr127.luon.net: target (→ void)
 * jan.luon.net: target
+* jabber.luon.net: tetraeder
 * koenvd.luon.net: target _(→ ???)_
+* ledr.luon.net: cube
+* lists.luon.net: tetraeder
+* lists.luon.net MX: tetraeder
 * movienight.luon.net: target
 * paul.luon.net: target
+* planet.luon.net: cube
+* simons.luon.net MX: tetraeder
+* sjoerd.luon.net: cube
+* sphere.luon.net MX: cube
 * stefan.luon.net: target
 * stream.luon.net: target
+* svn.luon.net: cube
 * target.luon.net: target
+* target.luon.net MX: cube
 * taw.luon.net: target (→ void)
+* test.luon.net MX: cube
+* trac.luon.net MX: cube
 * webalizer.luon.net: target
 * webmail.luon.net: target
 * wicked-neo.luon.net: target (→ void)
 * wiki.luon.net: target
+* yubnub.luon.net MX: cube
 
 ## vtilburg.net
 
+* {www.,webmail.,}vtilburg.net: target
+* vtilburg.net MX: cube
 * ftp.vtilburg.net: target
 * {foto,foto-upload,fotos,photo,photos}.vtilburg.net: target (→ void)
-* {www.,webmail.,}vtilburg.net: target
 * {www.,}{martin,martria,paul,ria,tom}.vtilburg.net: target
 * stage.vtilburg.net: target
 * {mail,pop,smtp}.vtilburg.net: target
+* target.vtilburg.net MX: cube
 * vtilburg.net SRV jabber: target
 
+## utopiamoo.net
+
+* {new.,u10j.,web.,www.,}utopiamoo.net: target
+* {test.,}utopiamoo.net MX: cube
+* lists.utopiamoo.net: tetraeder
+* lists.utopiamoo.net MX: tetraeder
+* moo.utopiamoo.net: target
+
 ## Overige
 
 * {www.,}basenhenrieke.nl: target
+* basenhenrieke.nl MX: cube
 * {www.,}baskloet.nl: target
+* baskloet.nl MX: cube
 * {www.,}bloembergen.com: target
+* famschoonen.nl MX: cube
+* gezondeleefstijl.nl MX: cube
 * {www.,}greyspace.nl: target
+* greyspace.nl MX: cube
 * {www.,}henriekequarre.nl: target
+* henriekequarre.nl MX: cube
 * jorine.heling.eu: target
 * {www.,}mozcode.nl: target
+* mozcode.nl MX: cube
 * {www.,}onecolorrainbow.nl: target
+* oncolorrainbow.nl MX: cube
+* pjoem.nl MX: cube
 * {www.,}proggerij.nl: target
+* proggerij.nl MX: cube
+* senders.eu MX: cube
 * {analysis.,intern.,webcam.,www.}spacelabs.nl: target
-* {new.,u10j.,web.,www.,}utopiamoo.net: target
+* spacelabs.nl MX: cube
+* lists.spacelabs.nl: tetraeder
+* lists.spacelabs.nl MX: tetraeder
+* svn.spacelabs.nl: cube

Start list of hostname/domain mapping stuff
diff --git a/hosting.mdwn b/hosting.mdwn
index 616689d..e21e287 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -24,3 +24,53 @@
 
 * Advanced abonnement bij [CSV Networks](http://www.csv-networks.nl/dedicatedhuur.php)
 * Quad Core packages by [LW](http://www.leaseweb.com/en/dedicated-servers/quad-core-servers)
+
+# Hostname/domein-mappings
+
+## luon.net
+
+* {www,.}luon.net: target
+* luon.net MX: cube, tetraeder, jupiter
+* luon.net SRV jabber: tetraeder
+* banaan.luon.net: target
+* ftp.luon.net: target
+* ffrenzy.luon.net: target
+* gcam.luon.net: target
+* gkrellm.luon.net: target
+* hr127.luon.net: target (→ void)
+* jan.luon.net: target
+* koenvd.luon.net: target _(→ ???)_
+* movienight.luon.net: target
+* paul.luon.net: target
+* stefan.luon.net: target
+* stream.luon.net: target
+* target.luon.net: target
+* taw.luon.net: target (→ void)
+* webalizer.luon.net: target
+* webmail.luon.net: target
+* wicked-neo.luon.net: target (→ void)
+* wiki.luon.net: target
+
+## vtilburg.net
+
+* ftp.vtilburg.net: target
+* {foto,foto-upload,fotos,photo,photos}.vtilburg.net: target (→ void)
+* {www.,webmail.,}vtilburg.net: target
+* {www.,}{martin,martria,paul,ria,tom}.vtilburg.net: target
+* stage.vtilburg.net: target
+* {mail,pop,smtp}.vtilburg.net: target
+* vtilburg.net SRV jabber: target
+
+## Overige
+
+* {www.,}basenhenrieke.nl: target
+* {www.,}baskloet.nl: target
+* {www.,}bloembergen.com: target
+* {www.,}greyspace.nl: target
+* {www.,}henriekequarre.nl: target
+* jorine.heling.eu: target
+* {www.,}mozcode.nl: target
+* {www.,}onecolorrainbow.nl: target
+* {www.,}proggerij.nl: target
+* {analysis.,intern.,webcam.,www.}spacelabs.nl: target
+* {new.,u10j.,web.,www.,}utopiamoo.net: target

diff --git a/dougswordclock.mdwn b/dougswordclock.mdwn
index 23bac7e..8b6f8ab 100644
--- a/dougswordclock.mdwn
+++ b/dougswordclock.mdwn
@@ -4,20 +4,14 @@ For source code of this clock: see <http://git.luon.net/?p=users/paul/wordclock.
 
 Some ideas to do with this clock (in no particular order):
 
-1. add light sensor and adjust brightness (proportional?) to amount of received light
+1. add wifi module
 
-2. increase PWM resolution by interpolation?
+2. synchronize time with pc / ntp
 
-3. add wifi module
+3. flash lights when you have an appointment in your Google agenda
 
-4. synchronize time with pc / ntp
+4. adjust brightness based on calculated sunrise/sunset times <http://www.codeproject.com/KB/cs/suntimes.aspx>.
 
-5. flash lights when you have an appointment in your Google agenda
+5. fade words in/out
 
-6. round() time instead of floor() time (when it is between 1:58 and 2:02 (inclusive), display "two o'clock"; for 1:58: light up the 2 leds on the left side, 1:59: 1 led on left side, 2:01: 1 led on right side, 2:02: 2 leds on right side)
-
-7. adjust brightness based on calculated sunrise/sunset times <http://www.codeproject.com/KB/cs/suntimes.aspx>.
-
-8. fade words in/out
-
-9. blink leds (blink first led slow when it is 2:00:01, blink fast when it is 2:00:59; if it is 2:01:01: first led is solid, second led blinks slow)
+6. blink leds (blink first led slow when it is 2:00:01, blink fast when it is 2:00:59; if it is 2:01:01: first led is solid, second led blinks slow)

diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 47f2c89..d820dd6 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -24,7 +24,7 @@
 * serveruitlaatkarretje
 * stereo (Sjoerd)
 * oud-tungsten: Compaq Proliant DL-380
-* draaibare webcaminstallatie (Admar)
+* draaibare webcaminstallatie (Admar: mag bij grofvuil)
 * bergen boeken en CDs (diverse leden)
 * video- & netwerkkaarten, hardeschijven, CPUs, etc.
 * ballen van Anne (Bram)

Claim some university owned stuff in case it doesn't have to be returned
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 78b77a6..47f2c89 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -83,7 +83,7 @@
 * asiasat-behuizing
 * visionair settopboxen
 * nog meer settopboxen
-* [surveyor] Shuttle Pentium Celeron 1Ghz, 256MB RAM
+* [surveyor] Shuttle Pentium Celeron 1Ghz, 256MB RAM (Paul)
 * wireless/firewire/smartcard-kaartjes
 * satellietkaarten
 * Sony HDR-HC1E HDV-camera en toebeboren
@@ -103,14 +103,14 @@
 * GPS-ontvanger(s)
 * adapters
 * multimedia-, netwerk-, stroom-, datakabels
-* toetsenborden, muizen
-* remote controlled power outlets
+* toetsenborden, muizen (Paul)
+* remote controlled power outlets (Paul)
 * motionsensor
 * firedetector
 * laptopslot
 * AT(X) voedingen
 * blackboard
-* Panasonic KX-HCM250 movable webcam
+* Panasonic KX-HCM250 movable webcam (Paul)
 * Pioneer PDP-501MX plasma screen met toebehoren
 * 2 soldeerstations
 * 1 oscilloscoop
@@ -131,7 +131,7 @@
 * [apollo] JMW PC, P3 768 MHz, 756MB RAM
 * officemeuk
 * Harman Kardon PC-speakerset
-* Iiyama AS-433UT-D TFT-scherm
+* Iiyama AS-433UT-D TFT-scherm (Paul)
 
 ### Serverruimte
 

The Sat-finder is privatly owned
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 15f8724..78b77a6 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -33,6 +33,7 @@
 * Applespeakertjes (Emiel; niet alles waar Apple op staat is van Christian ;-))
 * Tuatuner (Bram)
 * reserveonderdelen Compaq Proliant servers
+* Sat-finder (van Christian, maar mag iemand hebben)
 
 ### Meuktafel
 
@@ -104,7 +105,6 @@
 * multimedia-, netwerk-, stroom-, datakabels
 * toetsenborden, muizen
 * remote controlled power outlets
-* Sat-finder (van Christian, maar mag iemand hebben)
 * motionsensor
 * firedetector
 * laptopslot

diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index fa72c9e..15f8724 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -44,7 +44,7 @@
 * galileo-behuizing
 * [rabarber] server (Bram)
 * [ex-target] server (Paul, Tom)
-* Tuxii
+* Tuxii (Sjoerd)
 
 ### Werkstationstafels
 

diff --git a/hosting.mdwn b/hosting.mdwn
index d88918c..616689d 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -9,7 +9,7 @@
 7. henrieke: vmail, vweb, mail
 8. jan: mail, vweb, mysql, shell
 9. jaccok: shell
-10. jeffrey: mail
+10. jeffrey: mail, shell
 11. joris: shell
 12. lotte: mail, shell
 13. marceldb: mail, shell

Added LW
diff --git a/hosting.mdwn b/hosting.mdwn
index 3f0ab48..d88918c 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -23,3 +23,4 @@
 # Opties
 
 * Advanced abonnement bij [CSV Networks](http://www.csv-networks.nl/dedicatedhuur.php)
+* Quad Core packages by [LW](http://www.leaseweb.com/en/dedicated-servers/quad-core-servers)

Added hosting provider
diff --git a/hosting.mdwn b/hosting.mdwn
index f1338c5..3f0ab48 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -19,3 +19,7 @@
 17. sjoerd: mail, shell
 18. sofie: vmail, vweb
 19. wouter: vm en/of vmail, vweb
+
+# Opties
+
+* Advanced abonnement bij [CSV Networks](http://www.csv-networks.nl/dedicatedhuur.php)

Sat-finder updated
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 02244c4..fa72c9e 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -104,7 +104,7 @@
 * multimedia-, netwerk-, stroom-, datakabels
 * toetsenborden, muizen
 * remote controlled power outlets
-* Sat-finder
+* Sat-finder (van Christian, maar mag iemand hebben)
 * motionsensor
 * firedetector
 * laptopslot

claimen van random dingen!
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 027f4cc..02244c4 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -27,8 +27,8 @@
 * draaibare webcaminstallatie (Admar)
 * bergen boeken en CDs (diverse leden)
 * video- & netwerkkaarten, hardeschijven, CPUs, etc.
-* ballen van Anne
-* UTP-krimptang
+* ballen van Anne (Bram)
+* UTP-krimptang (Bram)
 * DLT-tapes
 * Applespeakertjes (Emiel; niet alles waar Apple op staat is van Christian ;-))
 * Tuatuner (Bram)

Claim the scanner
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index af108f4..027f4cc 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -51,7 +51,7 @@
 * LG Flatron 915ft+ monitor (Admar)
 * Iiyama VisionMaster Pro 410 (Tom)
 * Sparc Classic diskding
-* HP ScanJet 3600C USB-scanner
+* HP ScanJet 3600C USB-scanner (Paul)
 * [weatherwax] PC (Bram)
 * Sun Blade 100 (Admar)
 * Sun Ultra 5 (Admar)

Eigenaarschap gefixt
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index a746b23..af108f4 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -30,7 +30,7 @@
 * ballen van Anne
 * UTP-krimptang
 * DLT-tapes
-* Applespeakertjes (Christian)
+* Applespeakertjes (Emiel; niet alles waar Apple op staat is van Christian ;-))
 * Tuatuner (Bram)
 * reserveonderdelen Compaq Proliant servers
 

Merge branch 'master' of target.luon.net:/srv/wiki/luon-wiki
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index be0d748..bfbf1d0 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -38,7 +38,7 @@
 
 * posters
 * schakeling (Mark Pustjens)
-* elektrozooi
+* elektrozooi (Admar?)
 * schraubendreherversämelung
 * TU/e-dienblad
 * galileo-behuizing

Uit eten van Irischeques?
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index be0d748..31f2108 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -13,7 +13,7 @@
 * DIN-toetsenbord
 * barcodescanner
 * € 10 met wat kleingeld
-* € 87,50 aan Irischeques
+* € 87,50 aan Irischeques (een keer met z'n allen uit eten van dit geld en het bovenstaande kleingeld?)
 * afwasspullen
 * mokken
 * koffie-/theemeuk

Added some claims
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 1c03952..be0d748 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -62,9 +62,9 @@
 
 ### Serverhok
 
-* [sphere] Tulip 486/DX4 server
-* [tetraeder] Compaq Proliant 6400R server
-* [sunny] Sun Ultra 5
+* [sphere] Tulip 486/DX4 server (Paul)
+* [tetraeder] Compaq Proliant 6400R server (Paul, Sjoerd)
+* [sunny] Sun Ultra 5 (Christian)
 * [galileo] server in lyngsat behuiving (Emiel)
 * [cube] IBM Netfinity 5000 (Bram, Christian, Paul, Sjoerd)
 * [target] Compaq Proliant ML370 (Paul, Tom)

Fix target and rabarber descriptions
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 810dab1..1c03952 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -41,7 +41,9 @@
 * elektrozooi
 * schraubendreherversämelung
 * TU/e-dienblad
-* galileo-, rabarber-, ex-target-behuizing
+* galileo-behuizing
+* [rabarber] server (Bram)
+* [ex-target] server (Paul, Tom)
 * Tuxii
 
 ### Werkstationstafels

Fix header nesting
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index c47507e..810dab1 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -34,7 +34,7 @@
 * Tuatuner (Bram)
 * reserveonderdelen Compaq Proliant servers
 
-## Meuktafel
+### Meuktafel
 
 * posters
 * schakeling (Mark Pustjens)
@@ -44,7 +44,7 @@
 * galileo-, rabarber-, ex-target-behuizing
 * Tuxii
 
-## Werkstationstafels
+### Werkstationstafels
 
 * LG Flatron 915ft+ monitor (Admar)
 * Iiyama VisionMaster Pro 410 (Tom)
@@ -58,7 +58,7 @@
 * doos meuk van Tom (Tom)
 * theepot & -kussen
 
-## Serverhok
+### Serverhok
 
 * [sphere] Tulip 486/DX4 server
 * [tetraeder] Compaq Proliant 6400R server

Add initial inventory
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 0e6560f..c47507e 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -1,12 +1,147 @@
-Spacelabs Inventory
-===================
+# Spacelabs Inventory
 
-Personal stuff
---------------
+## Spacelabsleden
 
-_Insert here_
+### Keuken
 
-University stuff
-----------------
+* koelkast (Anne?)
+* waterkoker
+* koffiezetapparaat
+* klein koffiezetapparaat
+* thermoskoffiepot
+* ventilator
+* DIN-toetsenbord
+* barcodescanner
+* € 10 met wat kleingeld
+* € 87,50 aan Irischeques
+* afwasspullen
+* mokken
+* koffie-/theemeuk
+* tosti-ijzer
 
-_Insert here_
+### Op/in kasten
+
+* serveruitlaatkarretje
+* stereo (Sjoerd)
+* oud-tungsten: Compaq Proliant DL-380
+* draaibare webcaminstallatie (Admar)
+* bergen boeken en CDs (diverse leden)
+* video- & netwerkkaarten, hardeschijven, CPUs, etc.
+* ballen van Anne
+* UTP-krimptang
+* DLT-tapes
+* Applespeakertjes (Christian)
+* Tuatuner (Bram)
+* reserveonderdelen Compaq Proliant servers
+
+## Meuktafel
+
+* posters
+* schakeling (Mark Pustjens)
+* elektrozooi
+* schraubendreherversämelung
+* TU/e-dienblad
+* galileo-, rabarber-, ex-target-behuizing
+* Tuxii
+
+## Werkstationstafels
+
+* LG Flatron 915ft+ monitor (Admar)
+* Iiyama VisionMaster Pro 410 (Tom)
+* Sparc Classic diskding
+* HP ScanJet 3600C USB-scanner
+* [weatherwax] PC (Bram)
+* Sun Blade 100 (Admar)
+* Sun Ultra 5 (Admar)
+* Sun Ultra 5 (Admar?)
+* bloempotten (Paul)
+* doos meuk van Tom (Tom)
+* theepot & -kussen
+
+## Serverhok
+
+* [sphere] Tulip 486/DX4 server
+* [tetraeder] Compaq Proliant 6400R server
+* [sunny] Sun Ultra 5
+* [galileo] server in lyngsat behuiving (Emiel)
+* [cube] IBM Netfinity 5000 (Bram, Christian, Paul, Sjoerd)
+* [target] Compaq Proliant ML370 (Paul, Tom)
+* orion-behuizing
+* deurdranger (Sun Sparc server 5)
+* rails e.d.
+
+## Universiteit
+
+### Spacelabs
+
+* stekkerdozen
+* haspels met coaxkabel
+* camerastatief
+* asiasat-behuizing
+* visionair settopboxen
+* nog meer settopboxen
+* [surveyor] Shuttle Pentium Celeron 1Ghz, 256MB RAM
+* wireless/firewire/smartcard-kaartjes
+* satellietkaarten
+* Sony HDR-HC1E HDV-camera en toebeboren
+* Sony NP-F330 DV-camera en toebehoren
+* Fujifilm FinePix 4900z digitale camera
+* Canopus DV-convertor
+* richtmicrofoon
+* 2 Philips webcams
+* 3 digitale telefoons
+* Compaq iPaq
+* 2 firewirehubs met kabels
+* firewire-to-POF gateway
+* Globo'comm bluetooth headset
+* bluetooth v1-adapters
+* Lancast fiber/UTP-convertor
+* Dymo labelwriter
+* GPS-ontvanger(s)
+* adapters
+* multimedia-, netwerk-, stroom-, datakabels
+* toetsenborden, muizen
+* remote controlled power outlets
+* Sat-finder
+* motionsensor
+* firedetector
+* laptopslot
+* AT(X) voedingen
+* blackboard
+* Panasonic KX-HCM250 movable webcam
+* Pioneer PDP-501MX plasma screen met toebehoren
+* 2 soldeerstations
+* 1 oscilloscoop
+* Cisco 802.11b wireless base station
+* [almaz] Shuttle XPC SN25P, AMD64 X2 1GHz, 2GB RAM [defect videokaart]
+* rol POF
+* Cisco Catalist 2948g switch (1Gbps/POF)
+* Compose solutions fiber patch panel
+* [soyuz] Dell PC, 933 Mhz, 256MB RAM [defecte voeding]
+* [progress] JMW PC, P4 2.8 GHz, 1GB RAM
+* [salyut] Shuttle XPC SN25P, AMD64 X2 1GHz, 2GB RAM
+* vostok-, testbakbehuizing
+* Cambridge Soundworks 5.1 geluidsinstallatie
+* meerdere setjes PC-speakers
+* CRT-monitoren
+* Analoge telefoon
+* LaserJet 4MP printer
+* [apollo] JMW PC, P3 768 MHz, 756MB RAM
+* officemeuk
+* Harman Kardon PC-speakerset
+* Iiyama AS-433UT-D TFT-scherm
+
+### Serverruimte
+
+* CRT-monitoren
+* HP Rack System E rack
+* [hermes] HP NetServer LH-3000r server
+* [tsup] ProCurve 2424m switch
+* Rittal rack
+* Compose Solution patch paneel
+* [noordwijk] Nortel 8006 router [crashes]
+* [darmstadt] HP ProCurve 4108gl switch
+* [sinosat] Antec server, P4 2.8GHz, 1GB RAM
+* Silvershield power manager USB-stekkerdoos
+* 2 Spaun satelliet multiswitches
+* 2 rollen POF

Split in two categories
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 54340e8..0e6560f 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -1,4 +1,12 @@
 Spacelabs Inventory
 ===================
 
+Personal stuff
+--------------
+
+_Insert here_
+
+University stuff
+----------------
+
 _Insert here_

Really use markdown format
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 4d6c01e..54340e8 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -1,3 +1,4 @@
-= Spacelabs Inventory
+Spacelabs Inventory
+===================
 
 _Insert here_

Use the markdown format
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
index 1dd6558..4d6c01e 100644
--- a/spacelabs_inventory.mdwn
+++ b/spacelabs_inventory.mdwn
@@ -1,3 +1,3 @@
-h1. Spacelabs Inventory
+= Spacelabs Inventory
 
 _Insert here_

Added initial page
diff --git a/spacelabs_inventory.mdwn b/spacelabs_inventory.mdwn
new file mode 100644
index 0000000..1dd6558
--- /dev/null
+++ b/spacelabs_inventory.mdwn
@@ -0,0 +1,3 @@
+h1. Spacelabs Inventory
+
+_Insert here_

Added a link to the Spacelabs inventory page
diff --git a/index.mdwn b/index.mdwn
index db0a858..c79fcf7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -8,6 +8,8 @@ For now, there are pages about:
 
 * [[Hosting]] info
 
+* [[Spacelabs inventory]]
+
 * [[DougsWordClock]]
 
 All wikis are supposed to have a [[SandBox]], so this one does too.

Typo fix
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index 4df3129..744222c 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -2,7 +2,7 @@
 
 Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org) and [Dovecot](http://dovecot.org).  This is supplemented by [DSPAM](https://www.nuclearelephant.com) for server-side spam filtering.
 
-For accessing mail via IMAP, webmail, or for changing the server-side filters, you will need to use the same login credentials, namely you (UNIX) account user and password.
+For accessing mail via IMAP, webmail, or for changing the server-side filters, you will need to use the same login credentials, namely your (UNIX) account user and password.
 
 We also support virtual mail accounts/boxes.  In this case the user name used for access is `youruser@yourdomain.tld`.
 If you would like to have (more) virtual mail boxes/addresses, just let [our postmaster](mailto:postmaster@luon.net) know!

Removed weird GGGG-stuff
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index 829e897..4df3129 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -1,6 +1,6 @@
 # Luon's Mail Setup
 
-Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org) and [Dovecot](http://dovecot.org).  This is supplemented by [DSPAM](https://www.nuclearelephant.com) for server-side spam filtering.GGGGG
+Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org) and [Dovecot](http://dovecot.org).  This is supplemented by [DSPAM](https://www.nuclearelephant.com) for server-side spam filtering.
 
 For accessing mail via IMAP, webmail, or for changing the server-side filters, you will need to use the same login credentials, namely you (UNIX) account user and password.
 

Added a title; changed the header levels
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index d94168f..829e897 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -1,3 +1,5 @@
+# Luon's Mail Setup
+
 Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org) and [Dovecot](http://dovecot.org).  This is supplemented by [DSPAM](https://www.nuclearelephant.com) for server-side spam filtering.GGGGG
 
 For accessing mail via IMAP, webmail, or for changing the server-side filters, you will need to use the same login credentials, namely you (UNIX) account user and password.
@@ -5,9 +7,9 @@ For accessing mail via IMAP, webmail, or for changing the server-side filters, y
 We also support virtual mail accounts/boxes.  In this case the user name used for access is `youruser@yourdomain.tld`.
 If you would like to have (more) virtual mail boxes/addresses, just let [our postmaster](mailto:postmaster@luon.net) know!
 
-# Accessing mail
+## Accessing mail
 
-## Retrieving mail
+### Retrieving mail
 
 If you have not specified a forwarding e-mail address in `~/.forward`, mail is stored in `~/Mail` of your (UNIX) account.  Under this directory there is a nested tree of directories where `cur`, `new` and `tmp` are special [Maildir format specific](http://cr.yp.to/proto/maildir.html) directories.
 
@@ -21,7 +23,7 @@ Optionally, IMAP-SSL (using port 993) is also supported but not preferred.
 
 *N.B.* Since our mail setup is currently hosted on the guest system `target.vtilburg.net`, you can use as server `mail.vtilburg.net` to prevent SSL certificate problems.
 
-## Sending email
+### Sending email
 
 Email can be sent using our mail server wherever your are (especially useful for mobile devices).  Use the following settings:
 
@@ -33,12 +35,12 @@ The Submission port (587) is preferred as it is usefully not blocked by a firewa
 
 The same remarks concerning the guest system and virtual email accounts hold as written above.
 
-# Webmail
+## Webmail
 
 The Luon webmail service is available at: [https://webmail.luon.net/](https://webmail.luon.net).
 For the login details, see above.
 
-# Spam-filtering
+## Spam-filtering
 
 We support server-side spam filtering by default; this is done using [DSPAM](http://www.nuclearelephant.com).
 Note that it requires some initial training before it starts working properly.
@@ -47,7 +49,7 @@ Incoming mail is stored in the _Inbox_ (i.e. `~/Mail`) unless DSPAM thinks it is
 Spam training is done by moving spam to the Junk mail folder (which also can be called `junk`, `Spam` or `spam`) and moving ham from the Junk mail folder to another folder.  For the training to have effect, this *has to be done via IMAP*.
 Our IMAP server tracks the moves and trains accordingly.  Moving them from maildir to maildir on the system will have no effect.
 
-# Server-side mail filtering
+## Server-side mail filtering
 
 Server-side filtering is done using [Sieve](http://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)).  Some [email clients](http://sieve.info/clients) support configuring the sieve.  The Luon Webmail is such a client, but there is also an [add-on](https://addons.mozilla.org/en-us/thunderbird/addon/sieve/) for Thunderbird.  Evolution unfortunately has no support at all.
 
@@ -72,11 +74,11 @@ Warning!  When manually editing filters, the default system filter will be overr
 
 If you prefer procmail, exim filter, or to forward your email, you can always create a `~/.procmailrc` or `~/.forward`, thus overriding the system filtering, including sieve.
 
-# Virtual domains
+## Virtual domains
 
 Besides the `luon.net` mail domain, we also host other virtual domains and virtual mail accounts.  Setting up or tearing down virtual domains or accounts has to be done by the [postmaster](mailto:postmaster@luon.net).  
 
-## Managing virtual domains
+### Managing virtual domains
 
 Once a virtual domain is created, you can manage it by editing the aliases file `/srv/mail/aliases/mydomain.tld`.  An example aliases file:
 

Add a link to the mail setup page
diff --git a/index.mdwn b/index.mdwn
index 3e30492..db0a858 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,6 +4,8 @@ For now, there are pages about:
 
 * the [[Git Setup]]
 
+* the [[Mail Setup]]
+
 * [[Hosting]] info
 
 * [[DougsWordClock]]

Fixed a typo
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index 772b332..d94168f 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -60,7 +60,7 @@ Configuring sieve can be done using the [manage-sieve protocol](http://tools.iet
 
 The filters are stored in `~/Mail/sieve` and the active filter is linked from `~/.dovecot.sieve`.  So, it is also possible to edit the filters via shell and an editor.  However, be sure to make no syntax errors ;)
 
-Warning!  When manually editing filters, the default system filter will be overriden, thus losing spam filter support.  There are two solutions:
+Warning!  When manually editing filters, the default system filter will be overridden, thus losing spam filter support.  There are two solutions:
 
 1. Add the following to your sieve:
 

Small textual fixes
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index c9444ba..772b332 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -2,8 +2,8 @@ Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org
 
 For accessing mail via IMAP, webmail, or for changing the server-side filters, you will need to use the same login credentials, namely you (UNIX) account user and password.
 
-We also support virtual email accounts/boxes.  In this case the user name used for access is `youruser@yourdomain.tld`.
-If you would like to have (more) virtual email boxes/addresses, just let [our postmaster](mailto:postmaster@luon.net) know!
+We also support virtual mail accounts/boxes.  In this case the user name used for access is `youruser@yourdomain.tld`.
+If you would like to have (more) virtual mail boxes/addresses, just let [our postmaster](mailto:postmaster@luon.net) know!
 
 # Accessing mail
 
@@ -42,9 +42,9 @@ For the login details, see above.
 
 We support server-side spam filtering by default; this is done using [DSPAM](http://www.nuclearelephant.com).
 Note that it requires some initial training before it starts working properly.
-Incoming mail is stored in the Inbox (i.e. `~/Mail`) unless DSPAM thinks it is spam (or: junk) mail.  Then, it is stored in `~/Mail/Junk`, corresponding to the Junk mailbox when accessed via IMAP.
+Incoming mail is stored in the _Inbox_ (i.e. `~/Mail`) unless DSPAM thinks it is spam (or: junk) mail.  Then, it is stored in `~/Mail/Junk`, corresponding to the _Junk_ mail folder when accessed via IMAP.
 
-Spam training is done by moving spam to the Junk mailbox (which also can be called `junk`, `Spam` or `spam`) and moving ham from the Junk mailbox to another folder.  For the training to have effect, this *has to be done via IMAP*.
+Spam training is done by moving spam to the Junk mail folder (which also can be called `junk`, `Spam` or `spam`) and moving ham from the Junk mail folder to another folder.  For the training to have effect, this *has to be done via IMAP*.
 Our IMAP server tracks the moves and trains accordingly.  Moving them from maildir to maildir on the system will have no effect.
 
 # Server-side mail filtering
@@ -80,15 +80,15 @@ Besides the `luon.net` mail domain, we also host other virtual domains and virtu
 
 Once a virtual domain is created, you can manage it by editing the aliases file `/srv/mail/aliases/mydomain.tld`.  An example aliases file:
 
-  # Aliases for mydomain.tld
-  abuse: hostmaster
-  hostmaster: hostmaster@localhost
-  info: virtualuser
-  mailer-daemon: postmaster
-  postmaster: postmaster@localhost
-  webmaster: virtualuser
+    # Aliases for mydomain.tld
+    abuse: hostmaster
+    hostmaster: hostmaster@localhost
+    info: virtualuser
+    mailer-daemon: postmaster
+    postmaster: postmaster@localhost
+    webmaster: virtualuser
 
-  someuser: someuser@localhost
+    someuser: someuser@localhost
 
 In the above virtual mail domain, mail to `abuse@mydomain.tld` and `hostmaster@mydomain.tld` is redirected to the hostmaster listed by the system aliases (in `/etc/aliases`).
 Mail to `info@mymaildomain.tld` and `webmaster@mydomain.tld` is redirected to the virtual mail account `virtualuser@mydomain.tld` (if it exists).  

Added explanation about virtual mail domains and accounts
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
index c84341d..c9444ba 100644
--- a/mail_setup.mdwn
+++ b/mail_setup.mdwn
@@ -1,4 +1,9 @@
-Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org) and [Dovecot](http://dovecot.org).  This is supplemented by [DSPAM](https://www.nuclearelephant.com) for server-side spam filtering.
+Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org) and [Dovecot](http://dovecot.org).  This is supplemented by [DSPAM](https://www.nuclearelephant.com) for server-side spam filtering.GGGGG
+
+For accessing mail via IMAP, webmail, or for changing the server-side filters, you will need to use the same login credentials, namely you (UNIX) account user and password.
+
+We also support virtual email accounts/boxes.  In this case the user name used for access is `youruser@yourdomain.tld`.
+If you would like to have (more) virtual email boxes/addresses, just let [our postmaster](mailto:postmaster@luon.net) know!
 
 # Accessing mail
 
@@ -11,18 +16,11 @@ The _preferred_ way to access the email, even on the host itself, is via IMAP.
 * **server:** `imap.luon.net`
 * **port:** 143 (imap2)
 * **security:** (START)TLS
-* **login:** (UNIX) account user/password
 
 Optionally, IMAP-SSL (using port 993) is also supported but not preferred.
 
 *N.B.* Since our mail setup is currently hosted on the guest system `target.vtilburg.net`, you can use as server `mail.vtilburg.net` to prevent SSL certificate problems.
 
-### Virtual email accounts
-
-We support virtual email accounts/boxes.  The same settings as above hold, but the user name used for access is usual `someuser@domain.tld`.
-
-If you would like to have (more) virtual email boxes/addresses, just let [our postmaster](mailto:postmaster@luon.net) know!
-
 ## Sending email
 
 Email can be sent using our mail server wherever your are (especially useful for mobile devices).  Use the following settings:
@@ -30,7 +28,6 @@ Email can be sent using our mail server wherever your are (especially useful for
 * **server:** `mailhost.luon.net`
 * **port:** 587 (submission) or 25 (smtp)
 * **security:** (START)TLS
-* **login:** (UNIX) account user/password
 
 The Submission port (587) is preferred as it is usefully not blocked by a firewall, while the SMTP port (25) often is.
 
@@ -74,3 +71,27 @@ Warning!  When manually editing filters, the default system filter will be overr
 2. Copy the contents of `/etc/dovecot/sieve.default`, as not all clients support the include-module yet.
 
 If you prefer procmail, exim filter, or to forward your email, you can always create a `~/.procmailrc` or `~/.forward`, thus overriding the system filtering, including sieve.
+
+# Virtual domains
+
+Besides the `luon.net` mail domain, we also host other virtual domains and virtual mail accounts.  Setting up or tearing down virtual domains or accounts has to be done by the [postmaster](mailto:postmaster@luon.net).  
+
+## Managing virtual domains
+
+Once a virtual domain is created, you can manage it by editing the aliases file `/srv/mail/aliases/mydomain.tld`.  An example aliases file:
+
+  # Aliases for mydomain.tld
+  abuse: hostmaster
+  hostmaster: hostmaster@localhost
+  info: virtualuser
+  mailer-daemon: postmaster
+  postmaster: postmaster@localhost
+  webmaster: virtualuser
+
+  someuser: someuser@localhost
+
+In the above virtual mail domain, mail to `abuse@mydomain.tld` and `hostmaster@mydomain.tld` is redirected to the hostmaster listed by the system aliases (in `/etc/aliases`).
+Mail to `info@mymaildomain.tld` and `webmaster@mydomain.tld` is redirected to the virtual mail account `virtualuser@mydomain.tld` (if it exists).  
+Finally, mail to `realuser@mydomain.tld` is redirected to the (UNIX) account `someuser` if it exists and is not an alias in the system aliases.
+
+Note that adding `@localhost` is required to redirect mail to UNIX accounts, possibly via system aliases.  Leaving the domain suffix out signifies that the mail needs to go to a virtual mail account, if not aliased first.

Add initial mail setup text
diff --git a/mail_setup.mdwn b/mail_setup.mdwn
new file mode 100644
index 0000000..c84341d
--- /dev/null
+++ b/mail_setup.mdwn
@@ -0,0 +1,76 @@
+Our mail setup (also for virtual hosting) is based on [Exim](http://www.exim.org) and [Dovecot](http://dovecot.org).  This is supplemented by [DSPAM](https://www.nuclearelephant.com) for server-side spam filtering.
+
+# Accessing mail
+
+## Retrieving mail
+
+If you have not specified a forwarding e-mail address in `~/.forward`, mail is stored in `~/Mail` of your (UNIX) account.  Under this directory there is a nested tree of directories where `cur`, `new` and `tmp` are special [Maildir format specific](http://cr.yp.to/proto/maildir.html) directories.
+
+The _preferred_ way to access the email, even on the host itself, is via IMAP.  You can use the following settings.
+
+* **server:** `imap.luon.net`
+* **port:** 143 (imap2)
+* **security:** (START)TLS
+* **login:** (UNIX) account user/password
+
+Optionally, IMAP-SSL (using port 993) is also supported but not preferred.
+
+*N.B.* Since our mail setup is currently hosted on the guest system `target.vtilburg.net`, you can use as server `mail.vtilburg.net` to prevent SSL certificate problems.
+
+### Virtual email accounts
+
+We support virtual email accounts/boxes.  The same settings as above hold, but the user name used for access is usual `someuser@domain.tld`.
+
+If you would like to have (more) virtual email boxes/addresses, just let [our postmaster](mailto:postmaster@luon.net) know!
+
+## Sending email
+
+Email can be sent using our mail server wherever your are (especially useful for mobile devices).  Use the following settings:
+
+* **server:** `mailhost.luon.net`
+* **port:** 587 (submission) or 25 (smtp)
+* **security:** (START)TLS
+* **login:** (UNIX) account user/password
+
+The Submission port (587) is preferred as it is usefully not blocked by a firewall, while the SMTP port (25) often is.
+
+The same remarks concerning the guest system and virtual email accounts hold as written above.
+
+# Webmail
+
+The Luon webmail service is available at: [https://webmail.luon.net/](https://webmail.luon.net).
+For the login details, see above.
+
+# Spam-filtering
+
+We support server-side spam filtering by default; this is done using [DSPAM](http://www.nuclearelephant.com).
+Note that it requires some initial training before it starts working properly.
+Incoming mail is stored in the Inbox (i.e. `~/Mail`) unless DSPAM thinks it is spam (or: junk) mail.  Then, it is stored in `~/Mail/Junk`, corresponding to the Junk mailbox when accessed via IMAP.
+
+Spam training is done by moving spam to the Junk mailbox (which also can be called `junk`, `Spam` or `spam`) and moving ham from the Junk mailbox to another folder.  For the training to have effect, this *has to be done via IMAP*.
+Our IMAP server tracks the moves and trains accordingly.  Moving them from maildir to maildir on the system will have no effect.
+
+# Server-side mail filtering
+
+Server-side filtering is done using [Sieve](http://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)).  Some [email clients](http://sieve.info/clients) support configuring the sieve.  The Luon Webmail is such a client, but there is also an [add-on](https://addons.mozilla.org/en-us/thunderbird/addon/sieve/) for Thunderbird.  Evolution unfortunately has no support at all.
+
+Configuring sieve can be done using the [manage-sieve protocol](http://tools.ietf.org/html/rfc5804).  Use the following settings:
+
+* **server:** imap.luon.net
+* **port:** 2000
+* **security:** (START)TLS
+* **login:** email account user/password
+
+The filters are stored in `~/Mail/sieve` and the active filter is linked from `~/.dovecot.sieve`.  So, it is also possible to edit the filters via shell and an editor.  However, be sure to make no syntax errors ;)
+
+Warning!  When manually editing filters, the default system filter will be overriden, thus losing spam filter support.  There are two solutions:
+
+1. Add the following to your sieve:
+
+       require ["include"];
+       
+       include :global "spam_filter";
+
+2. Copy the contents of `/etc/dovecot/sieve.default`, as not all clients support the include-module yet.
+
+If you prefer procmail, exim filter, or to forward your email, you can always create a `~/.procmailrc` or `~/.forward`, thus overriding the system filtering, including sieve.

Added some local CSS tweaks/overrides
diff --git a/local.css b/local.css
new file mode 100644
index 0000000..04cb4af
--- /dev/null
+++ b/local.css
@@ -0,0 +1,17 @@
+/* ikiwiki local style sheet */
+
+/* Add local styling here, instead of modifying style.css. */
+h3 {
+  font-size: 13px;
+  margin: 13px 0px;
+}
+
+pre {
+  margin: 0em 1em 1em 1em;
+  padding: 0.5em;
+  background: #fafafa;
+}
+
+ul > li {
+  margin-top: 0.5em;
+}

Disabled the local CSS theme in favour of a system theme
diff --git a/local.css b/local.css
deleted file mode 100644
index 6eb3b12..0000000
--- a/local.css
+++ /dev/null
@@ -1,300 +0,0 @@
-/*********************************
- *  public wiki theme for ikiwiki
- *
- * by Danny Castonguay
- *********************************/
-/* # HSLA(hue, saturation, lightness,alpha)
- * ## hue
- * R:0, O:30, Y:60, G:115, cyan:180, B:220, I:260, V:280, pink:300
- * ## saturation
- * 0% is gray, 100% is pure color
- * ## lightness
- * 0% is black, 100% is white
- * ## alpha
- * 0% is opaque, 100% is transparent
- *  */
-/* variables copy pasted from the corporate website */
-.pageheader {
-  padding: 2em 2em 3em 2em;
-  position: relative;
-  overflow: hidden;
-  background: #404040;
-  border-color: gray;
-  border-style: none none solid none;
-  border-width: 1px; }
-
-.pageheader .header {
-  float: left; }
-
-.title {
-  color: #b3b3b3;
-  font-weight: bold; }
-
-h1, h2, h3, h4, h5, h6 {
-  font-weight: bold;
-  color: gray; }
-
-.header {
-  font-size: 200%; }
-
-h1 {
-  font-size: 160%;
-  border-top: 5px solid gray; }
-
-h2 {
-  font-size: 130%;
-  border-top: 2px solid gray; }
-
-h3, h4, h5, h6 {
-  font-size: 110%; }
-
-#searchform {
-  position: absolute;
-  top: 0.5em;
-  right: 2em; }
-
-input#searchbox {
-  border: none;
-  padding: .5em;
-  border-style: solid;
-  border-width: 2px;
-  border-color: gray;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: inset 2px 2px 2px #1a1a1a;
-  -webkit-box-shadow: inset 2px 2px 2px #1a1a1a;
-  box-shadow: inset 2px 2px 2px #1a1a1a; }
-
-.pageheader .actions {
-  position: absolute;
-  bottom: 0;
-  right: 2em;
-  width: 100%;
-  text-align: right; }
-
-.pageheader .actions ul {
-  border-style: none; }
-
-.actions ul {
-  padding: 1em;
-  border-style: none; }
-
-.pageheader .actions ul li {
-  padding: 0; }
-
-.pageheader .actions ul li a, input[type="submit"] {
-  margin: 0.2em;
-  padding: 0.2em;
-  font-size: 1.01em;
-  background: gray;
-  color: black;
-  border-style: solid;
-  border-width: 2px;
-  border-color: gray;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px; }
-  .pageheader .actions ul li a:hover, input[type="submit"]:hover {
-    background: #e68019;
-    color: white; }
-
-div.toggleable#attachments {
-  margin: 1em; }
-
-body {
-  margin: 0;
-  padding: 0;
-  font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif";
-  *font-size: small;
-  color: black;
-  background: white;
-  font-size: 1.01em; }
-
-a {
-  text-decoration: none;
-  color: #f27f0d; }
-
-a:hover {
-  color: #ad661f; }
-
-hr {
-  border-style: none;
-  background-color: gray;
-  height: 1px; }
-
-code, pre {
-  background-color: #f2f2f2;
-  color: #2e1a05; }
-
-pre {
-  padding: .5em;
-  margin: 1em;
-  border-style: solid;
-  border-width: 2px;
-  border-color: gray;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: 0px 0px 2px #1a1a1a;
-  -webkit-box-shadow: 0px 0px 2px #1a1a1a;
-  box-shadow: 0px 0px 2px #1a1a1a; }
-
-#content, #comments, #footer {
-  margin: 1em 2em; }
-
-#pageinfo {
-  border-color: gray; }
-
-#editcontent, #editmessage {
-  width: 90%;
-  background: #f2f2f2;
-  font-size: 1.01em;
-  font-family: Consolas, Monaco, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  line-height: 1.4em;
-  padding: .5em;
-  border-style: solid;
-  border-width: 2px;
-  border-color: gray;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px; }
-  #editcontent:hover, #editmessage:hover {
-    background: white; }
-
-#editcontent {
-  height: 25em; }
-
-label[for="editmessage"] {
-  margin-top: 1em; }
-
-#editmessage {
-  margin-bottom: 1em; }
-
-.inlinepage {
-  margin: .4em 0;
-  padding: .4em 0;
-  border-style: none;
-  border-top: 1px solid gray; }
-
-.inlineheader {
-  font-size: 1.1em;
-  border-top: 2px solid gray; }
-
-/* Smaller headings for inline pages */
-.inlinepage h1 {
-  font-size: 1.1em; }
-
-.inlinepage h2 {
-  font-size: 1.01em; }
-
-.inlinepage h3 {
-  font-size: 1.01em; }
-
-div.recentchanges {

(Diff truncated)
Added Wouter.
diff --git a/hosting.mdwn b/hosting.mdwn
index 2deff9d..f1338c5 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -18,3 +18,4 @@
 16. paul: vm, mail, shell
 17. sjoerd: mail, shell
 18. sofie: vmail, vweb
+19. wouter: vm en/of vmail, vweb

diff --git a/dougswordclock.mdwn b/dougswordclock.mdwn
index f1a00f7..23bac7e 100644
--- a/dougswordclock.mdwn
+++ b/dougswordclock.mdwn
@@ -17,3 +17,7 @@ Some ideas to do with this clock (in no particular order):
 6. round() time instead of floor() time (when it is between 1:58 and 2:02 (inclusive), display "two o'clock"; for 1:58: light up the 2 leds on the left side, 1:59: 1 led on left side, 2:01: 1 led on right side, 2:02: 2 leds on right side)
 
 7. adjust brightness based on calculated sunrise/sunset times <http://www.codeproject.com/KB/cs/suntimes.aspx>.
+
+8. fade words in/out
+
+9. blink leds (blink first led slow when it is 2:00:01, blink fast when it is 2:00:59; if it is 2:01:01: first led is solid, second led blinks slow)

diff --git a/dougswordclock.mdwn b/dougswordclock.mdwn
new file mode 100644
index 0000000..f1a00f7
--- /dev/null
+++ b/dougswordclock.mdwn
@@ -0,0 +1,19 @@
+Dougs official website: <http://www.dougswordclock.com/>. Instructable for the Arduino version: <http://www.instructables.com/id/The-Word-Clock-Arduino-Version/>.
+
+For source code of this clock: see <http://git.luon.net/?p=users/paul/wordclock.git>.
+
+Some ideas to do with this clock (in no particular order):
+
+1. add light sensor and adjust brightness (proportional?) to amount of received light
+
+2. increase PWM resolution by interpolation?
+
+3. add wifi module
+
+4. synchronize time with pc / ntp
+
+5. flash lights when you have an appointment in your Google agenda
+
+6. round() time instead of floor() time (when it is between 1:58 and 2:02 (inclusive), display "two o'clock"; for 1:58: light up the 2 leds on the left side, 1:59: 1 led on left side, 2:01: 1 led on right side, 2:02: 2 leds on right side)
+
+7. adjust brightness based on calculated sunrise/sunset times <http://www.codeproject.com/KB/cs/suntimes.aspx>.

diff --git a/index.mdwn b/index.mdwn
index 7593a23..3e30492 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,8 +1,12 @@
 # Welcome to the Luon Wiki!
 
-For now, there is only a page about the [[Git Setup]].
+For now, there are pages about:
 
-Some [[Hosting]] info.
+* the [[Git Setup]]
+
+* [[Hosting]] info
+
+* [[DougsWordClock]]
 
 All wikis are supposed to have a [[SandBox]], so this one does too.
 

Fixed wordwrap issues.
diff --git a/git_setup.mdwn b/git_setup.mdwn
index f52b879..9b0db3d 100644
--- a/git_setup.mdwn
+++ b/git_setup.mdwn
@@ -2,15 +2,9 @@
 
 Our Git setup is completely based on [Gitolite](http://github.com/sitaramc/gitolite).
 
-Cloning/pulling access is granted anonymously/non-authenticated through the HTTP and G
-it protocol (see below).
+Cloning/pulling access is granted anonymously/non-authenticated through the HTTP and Git protocol (see below).
 
-When authenticated, pushing is additionally allowed for the repositories the user has
-access to;  the user is also allowed to execute some commands to manipulate his/her ac
-counts/repositories.  Authenticated access means that your SSH public RSA key is known
- to Gitolite.  If you want to request an account, or add a key, mail the [Git admin](m
-ailto:gitadmin@luon.net) your public RSA 
-key.
+When authenticated, pushing is additionally allowed for the repositories the user has access to; the user is also allowed to execute some commands to manipulate his/her accounts/repositories.  Authenticated access means that your SSH public RSA key is known to Gitolite.  If you want to request an account, or add a key, mail the [Git admin](mailto:gitadmin@luon.net) your public RSA key.
 
 *Global note*: except for in HTTP-access URIs the suffix `.git` can be left out!
 
@@ -28,19 +22,15 @@ or:
 
 This provides read-only access, no pushing or anything is allowed.
 
-Web view available via [Gitweb](http://git.luon.net/): this will only shows the public
- repositories and the repositories of all users.
+Web view available via [Gitweb](http://git.luon.net/): this will only shows the public repositories and the repositories of all users.
 
 ### Authenticated
 
-
 Cloning from and pushing to:
 
 > ssh://gitolite@git.luon.net/*path/to/project.git*
 
-Note that you can only push to existing repositories on the root, but are free to push
- to users/*user/path/to/project* which will be created if non-existent. A short versio
-n of the URI is:
+Note that you can only push to existing repositories on the root, but are free to push to  users/*user/path/to/project* which will be created if non-existent. A short version of the URI is:
 
 > git.luon.net:*path/to/project.git*
 
@@ -51,24 +41,18 @@ when the following is added to ~/.ssh/
 
 Note also the colon (:) instead of the slash (/) after git.luon.net in the short URI.
 
-Web access is provided via [Gitweb](https://git.luon.net/) again, but authenticated an
-d via HTTPS.  All repositories for which you have read permissions for are shown. Note
- that authentication for Gitweb means logging in using the user name and configured we
-b password (see commands below).
+Web access is provided via [Gitweb](https://git.luon.net/) again, but authenticated and via HTTPS.  All repositories for which you have read permissions for are shown. Note that authentication for Gitweb means logging in using the user name and configured web password (see commands below).
 
 
 ## Repository administration
 
-Normal repository administration, such as creating, renaming, fixing or deleting needs
- to be done by the [Git admin](mailto:gitadmin@luon.net).
+Normal repository administration, such as creating, renaming, fixing or deleting needs to be done by the [Git admin](mailto:gitadmin@luon.net).
 
 Users can push to/clone from their own repositories via
    
 > ssh://gitolite@git.luon.net/users/*user/path/to/project.git*
 
-to create a personal repository.  This repository will be public, i.e. readable by eve
-ryone. Private user repositories are (not) yet supported.  Also due to running a sligh
-tly old version of Gitolite, we lack support for commands to remove a user repository.
+to create a personal repository.  This repository will be public, i.e. readable by everyone. Private user repositories are (not) yet supported.  Also due to running a slightly old version of Gitolite, we lack support for commands to remove a user repository.
 
 
 ## Shell commands
@@ -91,7 +75,6 @@ getdesc *path/to/project.git*
 setdesc *path/to/project.git*
 :   sets the description of the project via `stdin`
 
-
 The following commands are supported by Gitolite, but not (yet) by our repositories:
 
 getperm *path/to/project.git*

Enumerate people rather than itemise.
diff --git a/hosting.mdwn b/hosting.mdwn
index 8d18e51..2deff9d 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -1,20 +1,20 @@
 # Interested (18)
 
-* admar: vmail, mail, shell
-* bakel: mail, shell
-* bas: vmail, vweb, mail, shell
-* bram: vmail, vweb, mail, shell
-* christian: vm
-* ericbl: mail, vweb?
-* henrieke: vmail, vweb, mail
-* jan: mail, vweb, mysql, shell
-* jaccok: shell
-* jeffrey: mail
-* joris: shell
-* lotte: mail, shell
-* marceldb: mail, shell
-* marcels: mail, shell
-* mark: mail
-* paul: vm, mail, shell
-* sjoerd: mail, shell
-* sofie: vmail, vweb
+1. admar: vmail, mail, shell
+2. bakel: mail, shell
+3. bas: vmail, vweb, mail, shell
+4. bram: vmail, vweb, mail, shell
+5. christian: vm
+6. ericbl: mail, vweb?
+7. henrieke: vmail, vweb, mail
+8. jan: mail, vweb, mysql, shell
+9. jaccok: shell
+10. jeffrey: mail
+11. joris: shell
+12. lotte: mail, shell
+13. marceldb: mail, shell
+14. marcels: mail, shell
+15. mark: mail
+16. paul: vm, mail, shell
+17. sjoerd: mail, shell
+18. sofie: vmail, vweb

diff --git a/hosting.mdwn b/hosting.mdwn
index 87169e2..8d18e51 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -1,4 +1,4 @@
-# Interested (17)
+# Interested (18)
 
 * admar: vmail, mail, shell
 * bakel: mail, shell

diff --git a/hosting.mdwn b/hosting.mdwn
index 69ed87d..87169e2 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -1,4 +1,4 @@
-#h1 Interested (17)
+# Interested (17)
 
 * admar: vmail, mail, shell
 * bakel: mail, shell

diff --git a/hosting.mdwn b/hosting.mdwn
index d416870..69ed87d 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -1,4 +1,4 @@
-#1 Interested (17)
+#h1 Interested (17)
 
 * admar: vmail, mail, shell
 * bakel: mail, shell

diff --git a/hosting.mdwn b/hosting.mdwn
index 2ec9e0f..d416870 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -1,20 +1,20 @@
-
 #1 Interested (17)
 
-* admar
-* bakel
-* bas
-* bram
-* christian
-* ericbl
-* henrieke
-* jan
-* jaccok
-* jeffrey
-* joris
-* lotte
-* marceldb
-* marcels
-* mark
-* paul
-* sjoerd
+* admar: vmail, mail, shell
+* bakel: mail, shell
+* bas: vmail, vweb, mail, shell
+* bram: vmail, vweb, mail, shell
+* christian: vm
+* ericbl: mail, vweb?
+* henrieke: vmail, vweb, mail
+* jan: mail, vweb, mysql, shell
+* jaccok: shell
+* jeffrey: mail
+* joris: shell
+* lotte: mail, shell
+* marceldb: mail, shell
+* marcels: mail, shell
+* mark: mail
+* paul: vm, mail, shell
+* sjoerd: mail, shell
+* sofie: vmail, vweb

Added interested people.
diff --git a/hosting.mdwn b/hosting.mdwn
index 85ef614..2ec9e0f 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -1,4 +1,20 @@
 
-Foo!
+#1 Interested (17)
 
-Bar?
+* admar
+* bakel
+* bas
+* bram
+* christian
+* ericbl
+* henrieke
+* jan
+* jaccok
+* jeffrey
+* joris
+* lotte
+* marceldb
+* marcels
+* mark
+* paul
+* sjoerd

This is a test!
diff --git a/hosting.mdwn b/hosting.mdwn
index 785e22c..85ef614 100644
--- a/hosting.mdwn
+++ b/hosting.mdwn
@@ -1,2 +1,4 @@
 
 Foo!
+
+Bar?

Initial page!
diff --git a/hosting.mdwn b/hosting.mdwn
new file mode 100644
index 0000000..785e22c
--- /dev/null
+++ b/hosting.mdwn
@@ -0,0 +1,2 @@
+
+Foo!

diff --git a/index.mdwn b/index.mdwn
index 40c5603..7593a23 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,6 +2,8 @@
 
 For now, there is only a page about the [[Git Setup]].
 
+Some [[Hosting]] info.
+
 All wikis are supposed to have a [[SandBox]], so this one does too.
 
 ----

Added ikiwiked gray-orange style.
diff --git a/local.css b/local.css
new file mode 100644
index 0000000..6eb3b12
--- /dev/null
+++ b/local.css
@@ -0,0 +1,300 @@
+/*********************************
+ *  public wiki theme for ikiwiki
+ *
+ * by Danny Castonguay
+ *********************************/
+/* # HSLA(hue, saturation, lightness,alpha)
+ * ## hue
+ * R:0, O:30, Y:60, G:115, cyan:180, B:220, I:260, V:280, pink:300
+ * ## saturation
+ * 0% is gray, 100% is pure color
+ * ## lightness
+ * 0% is black, 100% is white
+ * ## alpha
+ * 0% is opaque, 100% is transparent
+ *  */
+/* variables copy pasted from the corporate website */
+.pageheader {
+  padding: 2em 2em 3em 2em;
+  position: relative;
+  overflow: hidden;
+  background: #404040;
+  border-color: gray;
+  border-style: none none solid none;
+  border-width: 1px; }
+
+.pageheader .header {
+  float: left; }
+
+.title {
+  color: #b3b3b3;
+  font-weight: bold; }
+
+h1, h2, h3, h4, h5, h6 {
+  font-weight: bold;
+  color: gray; }
+
+.header {
+  font-size: 200%; }
+
+h1 {
+  font-size: 160%;
+  border-top: 5px solid gray; }
+
+h2 {
+  font-size: 130%;
+  border-top: 2px solid gray; }
+
+h3, h4, h5, h6 {
+  font-size: 110%; }
+
+#searchform {
+  position: absolute;
+  top: 0.5em;
+  right: 2em; }
+
+input#searchbox {
+  border: none;
+  padding: .5em;
+  border-style: solid;
+  border-width: 2px;
+  border-color: gray;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: inset 2px 2px 2px #1a1a1a;
+  -webkit-box-shadow: inset 2px 2px 2px #1a1a1a;
+  box-shadow: inset 2px 2px 2px #1a1a1a; }
+
+.pageheader .actions {
+  position: absolute;
+  bottom: 0;
+  right: 2em;
+  width: 100%;
+  text-align: right; }
+
+.pageheader .actions ul {
+  border-style: none; }
+
+.actions ul {
+  padding: 1em;
+  border-style: none; }
+
+.pageheader .actions ul li {
+  padding: 0; }
+
+.pageheader .actions ul li a, input[type="submit"] {
+  margin: 0.2em;
+  padding: 0.2em;
+  font-size: 1.01em;
+  background: gray;
+  color: black;
+  border-style: solid;
+  border-width: 2px;
+  border-color: gray;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px; }
+  .pageheader .actions ul li a:hover, input[type="submit"]:hover {
+    background: #e68019;
+    color: white; }
+
+div.toggleable#attachments {
+  margin: 1em; }
+
+body {
+  margin: 0;
+  padding: 0;
+  font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif";
+  *font-size: small;
+  color: black;
+  background: white;
+  font-size: 1.01em; }
+
+a {
+  text-decoration: none;
+  color: #f27f0d; }
+
+a:hover {
+  color: #ad661f; }
+
+hr {
+  border-style: none;
+  background-color: gray;
+  height: 1px; }
+
+code, pre {
+  background-color: #f2f2f2;
+  color: #2e1a05; }
+
+pre {
+  padding: .5em;
+  margin: 1em;
+  border-style: solid;
+  border-width: 2px;
+  border-color: gray;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: 0px 0px 2px #1a1a1a;
+  -webkit-box-shadow: 0px 0px 2px #1a1a1a;
+  box-shadow: 0px 0px 2px #1a1a1a; }
+
+#content, #comments, #footer {
+  margin: 1em 2em; }
+
+#pageinfo {
+  border-color: gray; }
+
+#editcontent, #editmessage {
+  width: 90%;
+  background: #f2f2f2;
+  font-size: 1.01em;
+  font-family: Consolas, Monaco, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
+  line-height: 1.4em;
+  padding: .5em;
+  border-style: solid;
+  border-width: 2px;
+  border-color: gray;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px; }
+  #editcontent:hover, #editmessage:hover {
+    background: white; }
+
+#editcontent {
+  height: 25em; }
+
+label[for="editmessage"] {
+  margin-top: 1em; }
+
+#editmessage {
+  margin-bottom: 1em; }
+
+.inlinepage {
+  margin: .4em 0;
+  padding: .4em 0;
+  border-style: none;
+  border-top: 1px solid gray; }
+
+.inlineheader {
+  font-size: 1.1em;
+  border-top: 2px solid gray; }
+
+/* Smaller headings for inline pages */
+.inlinepage h1 {
+  font-size: 1.1em; }
+
+.inlinepage h2 {
+  font-size: 1.01em; }
+
+.inlinepage h3 {
+  font-size: 1.01em; }
+
+div.recentchanges {

(Diff truncated)
Fixed header.
diff --git a/git_setup.mdwn b/git_setup.mdwn
index b4cef36..f52b879 100644
--- a/git_setup.mdwn
+++ b/git_setup.mdwn
@@ -57,7 +57,7 @@ d via HTTPS.  All repositories for which you have read permissions for are shown
 b password (see commands below).
 
 
-# Repository administration
+## Repository administration
 
 Normal repository administration, such as creating, renaming, fixing or deleting needs
  to be done by the [Git admin](mailto:gitadmin@luon.net).

diff --git a/index.mdwn b/index.mdwn
index c8b233f..40c5603 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,6 @@
 # Welcome to the Luon Wiki!
 
-For now, there is only a page about the [[Git Setup]]
+For now, there is only a page about the [[Git Setup]].
 
 All wikis are supposed to have a [[SandBox]], so this one does too.
 

diff --git a/index.mdwn b/index.mdwn
index 1b479ba..c8b233f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,4 +1,4 @@
-Welcome to the Luon Wiki!
+# Welcome to the Luon Wiki!
 
 For now, there is only a page about the [[Git Setup]]
 

Transfer from gitit.
diff --git a/git_setup.mdwn b/git_setup.mdwn
new file mode 100644
index 0000000..b4cef36
--- /dev/null
+++ b/git_setup.mdwn
@@ -0,0 +1,100 @@
+# Luon's Git Setup
+
+Our Git setup is completely based on [Gitolite](http://github.com/sitaramc/gitolite).
+
+Cloning/pulling access is granted anonymously/non-authenticated through the HTTP and G
+it protocol (see below).
+
+When authenticated, pushing is additionally allowed for the repositories the user has
+access to;  the user is also allowed to execute some commands to manipulate his/her ac
+counts/repositories.  Authenticated access means that your SSH public RSA key is known
+ to Gitolite.  If you want to request an account, or add a key, mail the [Git admin](m
+ailto:gitadmin@luon.net) your public RSA 
+key.
+
+*Global note*: except for in HTTP-access URIs the suffix `.git` can be left out!
+
+## Repository access
+
+### Not-authenticated/anonymous:
+   
+Cloning from:
+
+> git://git.luon.net/*path/to/project.git*
+
+or:
+
+> http://git.luon.net/*path/to/project.git*
+
+This provides read-only access, no pushing or anything is allowed.
+
+Web view available via [Gitweb](http://git.luon.net/): this will only shows the public
+ repositories and the repositories of all users.
+
+### Authenticated
+
+
+Cloning from and pushing to:
+
+> ssh://gitolite@git.luon.net/*path/to/project.git*
+
+Note that you can only push to existing repositories on the root, but are free to push
+ to users/*user/path/to/project* which will be created if non-existent. A short versio
+n of the URI is:
+
+> git.luon.net:*path/to/project.git*
+
+when the following is added to ~/.ssh/
+
+    Host git.luon.net
+      User gitolite
+
+Note also the colon (:) instead of the slash (/) after git.luon.net in the short URI.
+
+Web access is provided via [Gitweb](https://git.luon.net/) again, but authenticated an
+d via HTTPS.  All repositories for which you have read permissions for are shown. Note
+ that authentication for Gitweb means logging in using the user name and configured we
+b password (see commands below).
+
+
+# Repository administration
+
+Normal repository administration, such as creating, renaming, fixing or deleting needs
+ to be done by the [Git admin](mailto:gitadmin@luon.net).
+
+Users can push to/clone from their own repositories via
+   
+> ssh://gitolite@git.luon.net/users/*user/path/to/project.git*
+
+to create a personal repository.  This repository will be public, i.e. readable by eve
+ryone. Private user repositories are (not) yet supported.  Also due to running a sligh
+tly old version of Gitolite, we lack support for commands to remove a user repository.
+
+
+## Shell commands
+
+When using (this implies passwordless login using your RSA key)
+
+> ssh gitolite@git.luon.net *command*
+
+the following commands can be executed:
+
+info *[user]*
+:   displays your (or optionally another user's) access to the repositories
+expand *[user]*
+:   displays your (or optionally another user's) expanded (i.e. tries to match against
+ regexps) access to the repositories
+htpasswd
+:   raises a prompt to set the password used for [Gitweb](https://git.luon.net)
+getdesc *path/to/project.git*
+:   displays the description of the project, used for example in the Gitweb interface
+setdesc *path/to/project.git*
+:   sets the description of the project via `stdin`
+
+
+The following commands are supported by Gitolite, but not (yet) by our repositories:
+
+getperm *path/to/project.git*
+:   displays the (sub)permissions of the project you have granted
+setperm *path/to/project.git*
+:   sets the (sub)permissions of the project

diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..1b479ba
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,9 @@
+Welcome to the Luon Wiki!
+
+For now, there is only a page about the [[Git Setup]]
+
+All wikis are supposed to have a [[SandBox]], so this one does too.
+
+----
+
+This wiki is powered by [[ikiwiki]].

initial commit
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b84c806
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.ikiwiki
+/recentchanges