Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 3f6c168af8b18c5aca3141440fb4ceb5b0431f87..c6005fb5dcf174b4c178cd22da1c8708eb899206 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -7,6 +7,8 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 If you're using Debian or Ubuntu, ikiwiki is an <code><a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations">apt-get</a> install ikiwiki</code> away.
 If you're not, see the [[download]] and [[install]] pages.
 
 If you're using Debian or Ubuntu, ikiwiki is an <code><a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations">apt-get</a> install ikiwiki</code> away.
 If you're not, see the [[download]] and [[install]] pages.
 

+You may also want to try out a [[Docker image|https://github.com/elecnix/ikiwiki-docker]] with ikiwiki pre-installed.
+

 ## Create your wiki
 
 All it takes to create a fully functional wiki using ikiwiki is running
 ## Create your wiki
 
 All it takes to create a fully functional wiki using ikiwiki is running


@@ -146,4 +148,7 @@ the [[tips]] to find out how to get more out of ikiwiki.
 
 ----
 
 
 ----
 

-_Note: If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your ~/.ikiwiki._
+_Notes_:
+
+- If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your `~/.ikiwiki`.
+- If you want to enable a plugin you **WILL HAVE** to add it to the `add_plugins` array in the `*.setup` file (or to use the `--plugin` switch while calling `ikiwiki`). Uncommenting the plugin options/configuration fields in the setup is not **ALWAYS** sufficient. You have been warned.