Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[docs] updated index, added tutorial reference

  • Loading branch information...
commit 876b437dcde2512fde84d71adf9112755c68865c 1 parent e939c68
@Chive Chive authored
View
4 docs/getting_started/installation/integrate.rst
@@ -4,7 +4,7 @@ Installing django CMS into an existing project
This document assumes you are familiar with Python and Django. It should
-outline the steps necessary for you to follow the :doc:`tutorial`.
+outline the steps necessary for you to follow the :doc:`../tutorial`.
.. _requirements:
@@ -231,7 +231,7 @@ or
This will install Django, django CMS, South, Pillow, and your database's driver globally.
-You have now everything that is needed for you to follow the :doc:`tutorial`.
+You have now everything that is needed for you to follow the :doc:`../tutorial`.
On Mac OSX
View
5 docs/getting_started/tutorial.rst
@@ -0,0 +1,5 @@
+###################
+django CMS Tutorial
+###################
+
+The new tutorial is hosted at https://github.com/divio/django-cms-tutorial.
View
59 docs/index.rst
@@ -3,15 +3,15 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-######################################
-Welcome to django CMS's documentation!
-######################################
+#####################################
+Welcome to django CMS' documentation!
+#####################################
This document refers to version |release|
-*******
-Install
-*******
+*************
+Release Notes
+*************
.. warning::
Version 3.0 introduces some significant changes that **require** action if
@@ -22,7 +22,6 @@ Install
.. toctree::
:maxdepth: 1
- getting_started/installation
upgrade/3.0
upgrade/2.4
upgrade/2.3.4
@@ -37,32 +36,30 @@ Install
Getting Started
***************
+Installation
+============
+
.. toctree::
:maxdepth: 2
:numbered:
+ getting_started/installation/index
+ getting_started/installation/integrate
getting_started/tutorial
- getting_started/using_south
- getting_started/configuration
- getting_started/navigation
- getting_started/plugin_reference
- faq/common_issues
-
-********
-Advanced
-********
+
+Resources
+=========
.. toctree::
:maxdepth: 2
:numbered:
-
- advanced/i18n
- advanced/caching
- advanced/sitemap
- advanced/templatetags
- advanced/cli
- advanced/permissions_reference
+
+ getting_started/resources/configuration
+ getting_started/resources/navigation
+ getting_started/resources/plugin_reference
+ getting_started/resources/using_south
+ faq/common_issues
*****************
@@ -87,6 +84,22 @@ Extending the CMS
********
+Advanced
+********
+
+.. toctree::
+ :maxdepth: 2
+ :numbered:
+
+ advanced/i18n
+ advanced/caching
+ advanced/sitemap
+ advanced/templatetags
+ advanced/cli
+ advanced/permissions_reference
+
+
+********
Concepts
********
Please sign in to comment.
Something went wrong with that request. Please try again.