--- a/index.html
+++ b/index.html
@@ -13,9 +13,21 @@
 </div>
 
 <div id="content_base">
-	<h1>OSP Documentation</h1>
-
-	<h2>Setting up your Account</h2>
+	<h1>Quick Start Guide</h1>
+
+	<ul>
+		<li><a href="#account">Setting up your account</a></li>
+		<li><a href="#management">Project Management</a></li>
+		<li><a href="#git">Git</li>
+		<li><a href="#svn">SVN</li>
+		<li><a href="#issues">Issue Tracker</li>
+		<li><a href="#wiki">Wiki</li>
+		<li><a href="#forum">Discussion Forums</li>
+		<li><a href="#blog">Blog</li>
+		<li><a href="#metrics">Metrics and Statistics</li>
+	</ul>
+
+	<h2><a name="account">Setting up your Account</a></h2>
 
 	<img src="img/account.png"/>
 	<p>
@@ -31,7 +43,32 @@
 	login-link and insert your username and password.
 	</p>
 
-	<h2>Project Management</h2>
+	<p>You can change your profile’s settings from the <b>Settings</b>
+	option on top menu. On the User Settings page you, the user, are able
+	to set or change several personal details. A part on this page is
+	reserved for user contact details, like email, Skype, and social media
+	contacts. You can also give the URL to your personal website, if you
+	have one.</p>
+
+	<img src="img/settings.png"/>
+
+	<p>
+	The user settings page also gives you a single-page to manage your
+	subscriptions. These are the items for which the platform will send you
+	an email notification when an update happens. You are automatically
+	subscribed to the content you create, but you can subscribe to individual
+	content or even entire tools.
+	</p>
+
+
+	<p>Choosing <b>Profile</b> from the top bar menu you get to see your newly
+	created public profile. It shows your projects, personal data you have
+	entered, skills, and email address you logged in with.</p>
+
+
+
+
+	<h2><a name="management">Project Management<a></h2>
 
 	<p>You can create new projects from the projects list (from the top menu under <b>Projects</b>)
 	This opens a list of projects available to you. To create one of your
@@ -65,6 +102,11 @@
 	in the URL)
 	</p>
 
+	<p>
+	After installing a new tool instance, new configuration options for that instance
+	will be available in the same page. Multiple instances can be created, for the same type of tools.
+	</p>
+
 	<img src="img/itickets.png"/>
 	
 	<h3>Creating subprojects</h3>
@@ -83,7 +125,7 @@
 	the main project's tools page
 	</p>
 
-	<p class="hint">Projects &gt; ProjectName &gt; Admin &gt; Tools</p>
+	<p class="hint">Admin &gt; Tools</p>
 
 	<p>and click to add a new Subproject tool. A form will pop up for you
 	to fill in the sub-project's information, such as its Label and its
@@ -95,11 +137,84 @@
 	<p>After the pop-up window is dismissed, the new Subproject tool will
 	be listed along with the other installed tools.</p>
 
-	<h2>Git</h2>
-
-	<h2>SVN</h2>
-
-	<h2>Issue Tracker</h2>
+
+	<h3>Permissions and access control</h3>
+
+
+	<h2><a name="git">Git</a></h2>
+
+	<p>
+	GIT can be enabled enabled as a project tool in the <b>Admin &gt; Tools</b>
+	page. Once added, a new entry will appear on the project sidebar.
+	After adding the Git tool, a new repository will be available for you project (check http://git-scm.com/ for update documentation on Git).</p>
+
+	<p>The standard way to modify the contents of your repository is using
+	a Git client as detailed in the Git User's Manual. If the code
+	repository is empty, the code browser will display some instructions to
+	help make the first commit and push, such as:</p>
+
+	<pre class="hint">
+cd myproject 
+git init 
+# add all your files. You can use specific filenames or directories instead of '.' 
+git add . 
+git commit -a -m 'Initial commit' 
+git remote add origin http://user@opensourceprojects.eu/git/p/newproject/code-0 
+git push origin master 
+git branch --set-upstream master origin/master  # so 'git pull' will work later
+	</pre>
+
+	<p>Or If using Git with an existing repository:</p>
+
+	<pre class="hint">
+cd myproject 
+git remote add origin http://user@opensourceprojects.eu/git/p/newproject/code-0 
+git push origin master 
+git branch --set-upstream master origin/master  # so 'git pull' will work later
+	</pre>
+
+	<p>To manage the Git tool, go to Tools page under</p>
+
+	<p class="hint">
+	Projects &gt; ProjectName &gt; Tools &gt; Code
+	</p>
+
+	<p>and choose an option within the available from Git tool's block. It
+	allows the administrators to set visible files, refresh the repository,
+	set user permissions, set new label or delete tool as visible in figure
+	below.</p>
+
+
+	<h2><a name="svn">SVN</a></h2>
+
+	<p>
+	SVN can be enabled enabled as a project tool in the <b>Admin &gt; Tools</b>
+	page. Once added, a new entry will appear on the project sidebar.
+	</p>
+	
+	<p>To use a new repository it is only necessary to checkout the
+	source code. A command line example is:</p>
+
+	<pre class="hint">
+	svn checkout --username=user http://opensourceprojects.eu/svn/p/project/code/trunk project-code
+	</pre>
+
+	Or to import an existing repository
+
+	<pre class="hint">
+	cd existing-project-code
+	svn import http://opensourceprojects.eu/svn/p/project/code/ -m "Initial commit"
+	</pre>
+
+	More configuration options for SVN can be accessed at
+
+	<p class="hint">
+	Projects &gt; ProjectName &gt; Tools &gt; Code
+	</p>
+
+	<p>and choose an option within the available from SVN tool's block. It allows to checkout URL, import repository, set visible files, refresh the repository, set user permissions, set new label or delete the tool as depicted.</p>
+
+	<h2><a name="issues">Issue Tracker</a></h2>
 
 	<div class="col1">
 	<p>
@@ -134,7 +249,7 @@
 	<img src="img/feature-tickets.png"/>
 	</div>
 
-	<h3>Installing the Issue Tracker</h3>
+	<h3 class="col1">Installing the Issue Tracker</h3>
 
 	<p class="col1">
 	You can install a new issue tracker instance from the <b>Admin/ Tools</b> and
@@ -200,7 +315,7 @@
 
 
 
-	<h2 class="nocol">Wiki</h2>
+	<h2 class="nocol"><a name="wiki">Wiki</a></h2>
 
 	<p>The wiki is a collaborative document editor which is easily edited
 	and can be used for various documentation needs, both internal and
@@ -209,11 +324,108 @@
 	different user groups. Like most modern wikis, all edits are
 	non-destructive and a copy of every version is stored.</p>
 
-
-
-	<h2 class="nocol">Forum</h2>
-
-	<h2 class="nocol">Blog</h2>
+	<p>The wiki can be installed as any other project tool:</p>
+	<p class="hint"> Admin &gt; Tools</p>
+
+	<p>Once installed, new options become available from the Admin/Tools page.
+	In addition to the common tool options of permissions, Label and
+	Delete, there are also options specific to the Wiki tool:
+	</p>
+
+	<ul>
+	<li><b>Set Home</b> defines which page the wiki will redirect to when the base URL is used. By default, this is set to "Home"</li>
+	<li>The Options page in admin provides you with the ability to add or remove three different pieces of the wiki functionality.
+		<ul>
+		<li><b>Show discussion</b> enables user comments on each wiki page</li>
+		<li><b>Show metadata</b> The author, label, and attachment display near the top of each page</li>
+		</ul>
+	</li>
+	</ul>
+
+	<h3>Creating Wiki pages</h3>
+
+	<p>Wiki content itself, like the rest of Allura tools, uses <b>Markdown</b>
+	formatting, along with some additional handling for Artifact Links and
+	some custom macros.</p>
+
+	<p>
+	New wiki pages can be created from the left sidebar, using the
+	<b>Create Page</b> button and entering the desired name.  Pages can be
+	referenced within other pages, by putting the new page name in brackets
+	(e.g. [New page]). Click on a reference that does not exist will also
+	allow you to create a page.</p> 
+	
+	<p>To edit an existing page, simply use the
+	pencil icon of Edit link in the upper right of a page.
+	To add an attachment to a page, first save the page content, as you
+	may lose unsaved changes otherwise. Select Add attachment button at the
+	bottom of the edit view.</p>
+
+	<h3>Deleting Wiki pages</h3>
+	
+	<p>To delete a page, enter the edit view as shown above, and then
+	select the Trash icon in the upper right. Deleting a page will remove
+	it from view, however the page may still be undeleted if necessary. To
+	do so, select the + icon when viewing the deleted page. You will then
+	enter the edit view and you may rename the page as appropriate.</p>
+
+	<p>
+	Deleted pages can be found under the <b>Browse Pages</b> view by selecting the Show
+	deleted pages link at the bottom of the list.
+	</p>
+
+
+
+	<h2 class="nocol"><a name="forum">Discussion Forums</a></h2>
+
+	<p>Discussion forums are a way to collaborate with other developers on the
+	project, but they can also be used to discuss with end users. A project
+	administrator can create as many different forums as needed by clicking
+	on Add Forum on the left sidebar of the discussion page. To do so you
+	must have activated the discussion module under tools. It is up to the
+	administrator to create and name as many forums as required by the
+	project work flow. You can create as flexible environment as you wish.
+	</p>
+
+	<p>
+	You may install or remove a Discussion via <b>Admin &gt; Tools</b>.
+	Once installed, there are a number of configuration options available
+	for each Discussion instance.
+	</p>
+
+
+	<p>Most of the fields are standard fields. Those worth to note are as the following:</p>
+
+	<ul>
+	<li><b>Short</b> Name is the short name that forms the URL this forum uses</li>
+	<li><b>Parent Forum</b> selects a parent if the forum is to be a sub forum of another one</li>
+	<li><b>Monitoring Email</b> defines the email address where notifications should be sent to</li>
+	<li><b>Developer Only</b> restricts access to users in the Developers group</li>
+	</ul>
+
+	<p>From the Options page you can edit the Posting Policy of the forum. It determines how moderated posts are handled.</p>
+
+	<h3>Using the discussion forums</h3>
+
+	<p>
+	You can create a new thread using the <b>Create Topic</b> link on the left
+	sidebar of the interface. Enter an
+	appropriate Subject, Forum, and then enter a Description and post, an
+	example of this form can be seen in the following figure.
+	</p>
+
+	<img src="img/createtopic.png"/>
+
+	<p>To reply to an existing thread you should be viewing the thread.
+	Select “reply” next to a comment to reply to that specific comment, or
+	use the dialogue box at the bottom of the discussion to add your
+	comment to the end.</p>
+
+	<p>With appropriate permissions, forum moderators have options to edit the
+	forum. These can be accessed using the pencil icon in the upper right corner.
+	Moderators can move threads, make announcements, and sticky posts.  </p>	
+
+	<h2 class="nocol"><a name="blog">Blog</a></h2>
 
 	<p>
 	The blog may be installed through the tools menu, as described before,
@@ -227,17 +439,13 @@
 	it from the list.
 	</p>
 
-
-
-
-	<p>
-	To create a new post, select "New Post" from the left sidebar under the Blog option. Enter a title and description for the post and Save to publish the post. If you save a draft for later editing before making it public, change the State to Draft before saving. Select the Edit link to edit a post or saved draft. You may also delete a post from the Edit view.
+	<p>
+	To create a new post, select <b>New Post</b> from the left sidebar under the Blog option. Enter a title and description for the post and Save to publish the post. If you save a draft for later editing before making it public, change the State to Draft before saving. Select the Edit link to edit a post or saved draft. You may also delete a post from the Edit view.
 	</p>
 
 	<p>
 	Like all Allura tools, the blog uses Markdown syntax. Each blog post will also have a discussion section for users to comment on the post.</p>
 
-	<h2>Metrics and Statistics</h2>
 
 
 <div class="footer">