diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c0f057d7064..f5d096796d3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -33,5 +33,5 @@ - a lot of bugfixes - the cms now depends on the cms.middleware.media.PlaceholderMediaMiddleware middleware - templatetags refactored: see cms/docs/templatetags.txt for new signatures. -- placeholder has new option: or and a endbpalceholder templatetag +- placeholder has new option: or and a endpalceholder templatetag diff --git a/docs/installation.rst b/docs/installation.rst index 404d05441e7..646451b478b 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -73,13 +73,13 @@ Template Context Processors Templates --------- -You have to define at least one template in `CMS_TEMPLATES` which should -contain at least one `{% placeholder '' %}` tag. +You have to define at least one template in ``CMS_TEMPLATES`` which should +contain at least one ``{% placeholder '' %}`` tag. urls.py ------- -Include `cms.urls` **at the very end** of your urlpatterns. It **must** be the +Include ``cms.urls`` **at the very end** of your urlpatterns. It **must** be the last pattern in the list! Media Files @@ -87,15 +87,15 @@ Media Files Make sure your Django installation finds the cms media files, for this task we recommend using django-appmedia which will create a symbolic link for you. If -for whatever reason you are unable to use it, copy the folder `cms/media/cms` +for whatever reason you are unable to use it, copy the folder ``cms/media/cms`` into your main media folder. South ----- To avoid issues with migrations during the installation process it is currently -recommended to use `python manage.py syncdb --all` and -`python manage.py migrate --fake` for **new** projects. Note that the cms +recommended to use ``python manage.py syncdb --all`` and +``python manage.py migrate --fake`` for **new** projects. Note that the cms migrations can not be supported on sqlite3. @@ -110,6 +110,6 @@ If you create a page and you don't see a page in the list view: If you edit a Page but don't see a "Add Plugin" button and a dropdown-list with plugins: -- Be sure your CMS_TEMPLATES setting is correct and that the templates specified - actually exist. Maybe check that you are not missing a '{% placeholder %}' - templatetag in the template. +- Be sure your ``CMS_TEMPLATES`` setting is correct and that the templates + specified actually exist and have at least one ``{% placeholder %}`` + templatetag in them template. diff --git a/docs/plugins.rst b/docs/plugins.rst index ab422828256..804ce16b830 100644 --- a/docs/plugins.rst +++ b/docs/plugins.rst @@ -221,3 +221,5 @@ For installation be sure you have the following in your project's ``INSTALLED_AP # ... ) +.. warning:: The inherit plugin is currently the only core-plugin which can + **not** be used in non-cms placeholders. \ No newline at end of file diff --git a/docs/sitemap.rst b/docs/sitemap.rst index aefcdf798ca..9e7aac13375 100644 --- a/docs/sitemap.rst +++ b/docs/sitemap.rst @@ -4,38 +4,23 @@ Sitemap Guide Sitemap ------- -Sitemap are xml files fetched by google to help your site indexation. -You have to tell google were the sitemap is with the **Webmaster Tools** +Sitemaps are XML files used by Google to index your website by using their +**Webmaster Tools** and telling them the location of your sitemap. The CMSSitemap will create a sitemap with all the published pages of your cms -Apps ----- +Configuration +------------- -Add the following to your project's ``INSTALLED_APPS`` setting:: - - INSTALLED_APPS = ( - ... - 'django.contrib.sitemaps', - ... - ) - -urls.py -------- - -In your main ``urls.py`` add the following import at the top of the file: - from cms.sitemaps import CMSSitemap - -Then add the following line at the **start** of the ``urlpatterns`` definition:: - - urlpatterns = ( - url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': {'cmspages': CMSSitemap}}), - ... - ) +Add ``django.contrib.sitemaps`` to your project's ``INSTALLED_APPS`` setting. +Add ``from cms.sitemaps import CMSSitemap`` to the top of your main `urls.py`. +Add ``url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': {'cmspages': CMSSitemap}})`` +to your urlpatterns. Django.contrib.sitemaps ----------------------- -More information about ``djangot.contrib.sitemaps`` can be found in the official django documentation `here `_. +More information about ``djangot.contrib.sitemaps`` can be found in the official +`Django documentation `_.