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

Jonas Obrist · Jonas Obrist · commit 69f6685355e4 · 2011-10-17T12:45:34.000+02:00
diff --git a/AUTHORS b/AUTHORS
@@ -56,6 +56,7 @@ Contributors (in alphabetical order):
 * fcurella
 * Filip Kazimierczak
 * Frank Bieniek
+* Gabriel Hurley
 * GaretJax
 * George Marshall
 * Gerard Świderski
@@ -120,6 +121,7 @@ Contributors (in alphabetical order):
 * neoprolog
 * Orne Brocaar
 * padelt
+* Paolo
 * Patrick Toal
 * Paul van der Linden
 * pbgc
diff --git a/docs/getting_started/tutorial.rst b/docs/getting_started/tutorial.rst
@@ -272,6 +272,7 @@ Here is a simple example for a base template called ``base.html``:
         {% render_block "css" %}
     </head>
     <body>
+        {% cms_toolbar %}
         {% placeholder base_content %}
         {% block base_content%}{% endblock %}
         {% render_block "js" %}
