Merge branch 'master' into contact-procedure-update

1 files changed, 23 insertions, 2 deletions

diff --git a/wiki-preview.mdwn b/wiki-preview.mdwn
index 6334217..71cf7d1 100644
--- a/wiki-preview.mdwn
+++ b/wiki-preview.mdwn
@@ -1,4 +1,4 @@
-Taking the [[Create a Wiki|create-a-wiki]] article as a starting point, this article describes how to set up preview of Friposts wiki.
+Taking the [Create a Wiki](/create-a-wiki) article as a starting point, this article describes how to set up preview of Friposts wiki.
 
 The basic idea is something like the following:
 
@@ -20,7 +20,7 @@ recompilation of the local version of the. The local preview version is accessed
 by pointing the browser to
 *http\://localhost/~<name>/fripost-wiki-preview/*. 
 
-First the basics. According to [[Create a Wiki|create-a-wiki]] do the following:
+First the basics. According to [Create a Wiki](/create-a-wiki) do the following:
 
 * Install and configure Git
 * Install and configure Apache 2
@@ -48,6 +48,27 @@ You can also create an alias for to refresh the preview command.
 
     $ alias fripost-wiki-preview-refresh='ikiwiki -setup /home/gustav/lab-wiki/fripost-wiki.setup -refresh'
 
+
+Public www locations (userdir)
+------------------
+
+For to be able to access `http://localhost/~user` the "userdir"
+functionality is needed. For Nginx, put the following in e.g.
+*/etc/nginx/sites-available/localhost*:
+
+```
+server {
+  location ~ ^/~(.+?)(/.*)?$ {
+    alias /home/$1/public_html$2;
+    index index.html index.htm
+    autoindex on;
+  }
+}
+```
+
+Relative paths
+--------------
+
 Many links on the Fripost wiki are absolute. That means that you
 sometimes will not be able to follow homepage page and wiki page links
 between your local preview wiki. For testing purposes, that can