Merge branch 'master' of github.com:divio/django-cms

Conflicts:
	docs/getting_started/index.rst

Author: digi604

docs/advanced/templatetags.rst

@@ -699,7 +699,7 @@ show_breadcrumb
 ===============
 
 Renders the breadcrumb navigation of the current page.
-The template for the HTML can be found at ``cms/breadcrumb.html``::
+The template for the HTML can be found at ``menu/breadcrumb.html``::
 
     {% show_breadcrumb %}
 
@@ -710,7 +710,7 @@ Or with a custom template and only display level 2 or higher::
 Usually, only pages visible in the navigation are shown in the
 breadcrumb. To include *all* pages in the breadcrumb, write::
 
-    {% show_breadcrumb 0 "cms/breadcrumb.html" 0 %}
+    {% show_breadcrumb 0 "menu/breadcrumb.html" 0 %}
 
 If the current URL is not handled by the CMS or by a navigation extender,
 the current menu node can not be determined.

docs/getting_started/index.rst

@@ -5,17 +5,39 @@ Getting started
 Welcome to django CMS 3. This tutorial should guide you  through the first basic steps with django
 CMS all the way up to adding your own plugins and apps and extending the CMS' models itself!
 
-.. note::
-    Should you run into trouble and can't figure out how to solve it yourself, you
-    can get help from either our `mailinglist`_ or IRC channel ``#django-cms`` on
-    the ``irc.freenode.net`` network.
+.. toctree::
+    :maxdepth: 2
+    :hidden:
+
+    tutorial
+    integrate
+
+
 
+************
+Getting Help
+************
+
+Should you run into trouble and can't figure out how to solve it yourself, you
+can get help from either our `mailinglist`_ or IRC channel ``#django-cms`` on
+the ``irc.freenode.net`` network.
+
+
+**********************************
+Installing django CMS from scratch
+**********************************
+
+Start from scratch by following the tutorial on https://github.com/divio/django-cms-tutorial
+
+**********************************************
+Installing django CMS into an existing project
+**********************************************
 
 .. toctree::
     :maxdepth: 2
 
-    tutorial
     integrate
 
 
 .. _mailinglist: https://groups.google.com/forum/#!forum/django-cms
+