From 71ab64ad26f200e25f613ee5ae66eeda764c1e17 Mon Sep 17 00:00:00 2001
From: Arjen van Bochoven <arjen@bochoven.net>
Date: Sat, 19 Oct 2013 23:13:21 +0200
Subject: [PATCH] Changed setup.md

---
 app/helpers/site_helper.php |  2 +-
 docs/setup.md               | 38 ++++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/helpers/site_helper.php b/app/helpers/site_helper.php
index 5879ae15c..d349f6a9a 100644
--- a/app/helpers/site_helper.php
+++ b/app/helpers/site_helper.php
@@ -1,7 +1,7 @@
 <?php
 
 // Munkireport version (last number is number of commits)
-$GLOBALS['version'] = '2.0.0.329';
+$GLOBALS['version'] = '2.0.0.335';
 
 //===============================================
 // Uncaught Exception Handling
diff --git a/docs/setup.md b/docs/setup.md
index 2bdae3916..2c07cc67b 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -5,20 +5,15 @@ First setup the server, the clients use the server to pull down the installation
 
 On the server
 ---
- 1. Put all files in the root directory of your website (for subdirs,
-    see below). Make sure you also copy the .htaccess file.
- 2. Create config.php in the root directory of your website. This file overrides the settings in config_default.php
- 3. Check if the directory /app/db/ is writeable by the webserver.
-
-Munkireport is able to detect if it is running from a subdirectory. If automatic detection fails, you can also specify the subdirectory in config.php.
-So if you want to run munkireport from http://munki.mysite.org/report/
-add the following to config.php:
-
-	$conf['subdirectory'] = '/report/';
-
-You're done with the server and should be able to see a webpage with an empty
-table when you visit the website with a browser.
+ 1. Use git to checkout the latest version or download the zip file and put all files in the root directory of your website (for subdirs, see below).
+ 2. Create config.php in the root directory of your website. Write `<?php` in the top of the file. config.php overrides the settings in config_default.php
+ 3. Check if the directory /app/db/ is writeable by the webserver (only when using sqlite)
 
+Create the first user
+---
+ 1. Visit the site with a webbrowser, you'll be prompted to create a user and password
+ 2. Add the generated hash line to config.php
+ 3. In the browser login with your username and password
 
 Setting up a client manually
 ---
@@ -33,10 +28,23 @@ Setting up clients with munki
  2. Copy MunkiReport.plist into your Munki repository
  3. Run /usr/local/munki/makecatalogs
 
+Advanced setup
+---
 
+### Running MunkiReport from a subdir
+
+Munkireport should able to detect if it is running from a subdirectory. If automatic detection fails, you can also specify the subdirectory in config.php.
+So if you want to run munkireport from http://munki.mysite.org/report/
+add the following to config.php:
+
+	$conf['subdirectory'] = '/report/';
+
+You're done with the server and should be able to see a webpage with an empty
+table when you visit the website with a browser.
+
+
+#### Running MunkiReport with mod_rewrite
 
-Running MunkiReport with mod_rewrite
----
 If youre running munkireport on an apache webserver and you want to use mod_rewrite (which gives you nicer urls), you'll have
 to change the following: