Merge 2ec87ee into b40e7ae

django-cms · Apr 20, 2017 · a25bcba · a25bcba
2 parents b40e7ae + 2ec87ee
commit a25bcba
Show file tree

Hide file tree

Showing 27 changed files with 83 additions and 83 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -149,7 +149,7 @@
 * Added a workaround for a bug when plugins couldn't be deleted in Firefox
   with 1Password extension installed
 * Changed CMS JavaScript bundling from simple concatenation to webpack-based.
-  Using CMS Javascript modules directly is no longer possible.
+  Using CMS JavaScript modules directly is no longer possible.
 * Fixed an issue where plugins that have no immediate DOM representation
   wouldn't be editable or movable.
 * Fixed a regression in which plugins that defined ``parent_classes``
@@ -339,7 +339,7 @@
 - Added tooltips for certain user interaction elements
 - Added full touch support and optimisations for mobile devices
 - Added gulp.js for linting, compressing and bundling
-- Added YuiDocs for Javascript documentation
+- Added YuiDocs for JavaScript documentation
 - Added ``CMS_TOOLBAR_SIMPLE_STRUCTURE_MODE`` to switch back to the old board rendering,
   this will be deprecated in 3.3.0
 - Added ``request.toolbars.placeholder_list`` this will replace

diff --git a/cms/locale/de/LC_MESSAGES/django.po b/cms/locale/de/LC_MESSAGES/django.po
@@ -1857,7 +1857,7 @@ msgid ""
 "                        JavaScript seems to be disabled so please\n"
 "                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-add\">add a page</a> manually.\n"
 "                    "
-msgstr "\nJavascript scheint deaktiviert zu sein. Sie  können hier eine\n <a href=\"%(admin_add_page)s\" class=\"js-welcome-add\">Seite manuell hinzufügen</a>."
+msgstr "\nJavaScript scheint deaktiviert zu sein. Sie  können hier eine\n <a href=\"%(admin_add_page)s\" class=\"js-welcome-add\">Seite manuell hinzufügen</a>."
 
 #: templates/cms/welcome.html:56
 msgid "Installation Notes"

diff --git a/cms/plugin_base.py b/cms/plugin_base.py
@@ -502,7 +502,7 @@ def __init__(self, name, url, data, question=None, action='ajax', attributes=Non
         :param data: Data to be POSTed to the above URL
         :param question: Confirmation text to be shown to the user prior to call the given URL (optional)
         :param action: Custom action to be called on click; currently supported: 'ajax', 'ajax_add'
-        :param attributes: Dictionary whose content will be addes as data-attributes to the menu item
+        :param attributes: Dictionary whose content will be added as data-attributes to the menu item
         """
         if not attributes:
             attributes = {}

diff --git a/docs/how_to/apphooks.rst b/docs/how_to/apphooks.rst
@@ -1,8 +1,8 @@
 .. _apphooks_how_to:
 
-########
-Apphooks
-########
+######################
+How to create apphooks
+######################
 
 An **apphook** allows you to attach a Django application to a page. For example,
 you might have a news application that you'd like integrated with django CMS. In
@@ -15,6 +15,7 @@ All URLs in that URL path will be passed to the attached application's URL confi
 The :ref:`Tutorials <tutorials>` section contains a basic guide to :ref:`getting started with apphooks
 <apphooks_introduction>`. This document assumes more familiarity with the CMS generally.
 
+
 ******************************
 The basics of apphook creation
 ******************************

diff --git a/docs/how_to/caching.rst b/docs/how_to/caching.rst
@@ -1,6 +1,6 @@
-#######
-Caching
-#######
+#####################
+How to manage caching
+#####################
 
 
 ******

diff --git a/docs/how_to/contributing.rst b/docs/how_to/contributing.rst
@@ -1,8 +1,8 @@
 ..  _contributing_patch:
 
-####################
-Contributing a patch
-####################
+#########################
+How to contribute a patch
+#########################
 
 .. note:: For more background on the material covered in this how-to section, see the
    :ref:`contributing-code` and :ref:`testing` sections of the documentation.

diff --git a/docs/how_to/custom_plugins.rst b/docs/how_to/custom_plugins.rst
@@ -1,8 +1,8 @@
 .. _custom-plugins:
 
-##############
-Custom Plugins
-##############
+############################
+How to create custom Plugins
+############################
 
 CMS Plugins are reusable content publishers that can be inserted into django
 CMS pages (or indeed into any content that uses django CMS placeholders). They
@@ -17,7 +17,8 @@ It's like magic, but quicker.
 Unless you're lucky enough to discover that your needs can be met by the
 built-in plugins, or by the many available third-party plugins, you'll have to
 write your own custom CMS Plugin. Don't worry though - writing a CMS Plugin is
-rather simple.
+very straightforward.
+
 
 *************************************
 Why would you need to write a plugin?

diff --git a/docs/how_to/extending_page_title.rst b/docs/how_to/extending_page_title.rst
@@ -1,5 +1,5 @@
 #################################
-Extending the Page & Title models
+How to extend Page & Title models
 #################################
 
 You can extend the :class:`cms.models.Page` and :class:`cms.models.Title` models with your own fields (e.g. adding an

diff --git a/docs/how_to/frontend_models.rst b/docs/how_to/frontend_models.rst
@@ -1,8 +1,8 @@
 .. _frontend-editable-fields:
 
-###########################################
-Frontend editing for Page and Django models
-###########################################
+#########################################################
+How to enable frontend editing for Page and Django models
+#########################################################
 
 .. versionadded:: 3.0
 

diff --git a/docs/how_to/index.rst b/docs/how_to/index.rst
@@ -8,21 +8,21 @@ These guides presuppose some familiarity with django CMS. They cover some of
 the same territory as the :doc:`/introduction/index`, but in more detail.
 
 .. toctree::
-    :maxdepth: 2
+    :maxdepth: 1
 
-    install
-    custom_plugins
-    menus
-    apphooks
-    namespaced_apphooks
-    templates
-    extending_page_title
-    toolbar
-    testing
-    placeholders
-    caching
-    frontend_models
-    sitemap
-    page_types
-    wizards
-    contributing
+    Install django CMS by hand <install>
+    Create custom plugins <custom_plugins>
+    Customise menus <menus>
+    Create apphooks <apphooks>
+    Manage complex apphook configuration <namespaced_apphooks>
+    Work with templates <templates>
+    Extend Page & Title models <extending_page_title>
+    Extend the Toolbar <toolbar>
+    Test your extensions <testing>
+    Use placeholders outside the CMS <placeholders>
+    Manage caching <caching>
+    Enable frontend editing for Page and Django models <frontend_models>
+    Create sitemaps <sitemap>
+    Manage Page Types <page_types>
+    Implement content creation wizards <wizards>
+    Contribute a patch <contributing>
diff --git a/docs/how_to/install.rst b/docs/how_to/install.rst
@@ -1,8 +1,8 @@
 .. _installation:
 
-#############################
-Installing django CMS by hand
-#############################
+#################################
+How to install django CMS by hand
+#################################
 
 The easiest way to install django CMS is by using the automated `django CMS installer
 <https://github.com/nephila/djangocms-installer>`_. This is the recommended way to start with new projects, and it's

diff --git a/docs/how_to/menus.rst b/docs/how_to/menus.rst
@@ -1,6 +1,6 @@
-############################
-Customising navigation menus
-############################
+#################################
+How to customise navigation menus
+#################################
 
 In this document we discuss three different way of customising the navigation
 menus of django CMS sites.

diff --git a/docs/how_to/namespaced_apphooks.rst b/docs/how_to/namespaced_apphooks.rst
@@ -1,8 +1,8 @@
 .. _complex_apphooks_how_to:
 
-#############################
-Complex apphook configuration
-#############################
+###########################################
+How to manage complex apphook configuration
+###########################################
 
 In :ref:`apphooks_how_to` we discuss some basic points of using apphooks. In this document we will cover some more
 complex implementation possibilities.
@@ -43,7 +43,7 @@ need to set that to something *different* if an instance with that value already
 fall back to the one hard-wired into the class.
 
 In other words setting ``app_name`` correctly guarantees that URL-reversing will work, because it sets the fallback
-namespace approppriately.
+namespace appropriately.
 
 
 Set a namespace at instance-level

diff --git a/docs/how_to/page_types.rst b/docs/how_to/page_types.rst
@@ -1,8 +1,8 @@
 .. versionadded:: 3.0
 
-##########
-Page Types
-##########
+########################
+How to manage Page Types
+########################
 
 **Page Types** make it easier for content editors to create pages from predefined **types**.
 

diff --git a/docs/how_to/placeholders.rst b/docs/how_to/placeholders.rst
@@ -1,8 +1,8 @@
 .. _placeholders_outside_cms:
 
-############################
-Placeholders outside the CMS
-############################
+#######################################
+How to use placeholders outside the CMS
+#######################################
 
 Placeholders are special model fields that django CMS uses to render
 user-editable content (plugins) in templates. That is, it's the place where a

diff --git a/docs/how_to/sitemap.rst b/docs/how_to/sitemap.rst
@@ -1,6 +1,6 @@
-#############
-Sitemap Guide
-#############
+######################
+How to create sitemaps
+######################
 
 
 *******

diff --git a/docs/how_to/templates.rst b/docs/how_to/templates.rst
@@ -1,6 +1,6 @@
-**********************
-Working with templates
-**********************
+##########################
+How to work with templates
+##########################
 
 Application can reuse cms templates by mixing cms template tags and normal django
 templating language.

diff --git a/docs/how_to/testing.rst b/docs/how_to/testing.rst
@@ -1,6 +1,6 @@
-#######################
-Testing Your Extensions
-#######################
+############################
+How to test your extensions
+###########################
 
 ************
 Testing Apps

diff --git a/docs/how_to/toolbar.rst b/docs/how_to/toolbar.rst
@@ -1,8 +1,8 @@
 .. _toolbar_how_to:
 
-#####################
-Extending the Toolbar
-#####################
+#########################
+How to extend the Toolbar
+#########################
 
 .. versionadded:: 3.0
 

diff --git a/docs/how_to/wizards.rst b/docs/how_to/wizards.rst
@@ -2,9 +2,9 @@
 
 .. _wizard_how_to:
 
-########################
-Content creation wizards
-########################
+#########################################
+How to implement content creation wizards
+#########################################
 
 django CMS offers a framework for creating 'wizards' - helpers - for content editors.
 

diff --git a/docs/introduction/toolbar.rst b/docs/introduction/toolbar.rst
@@ -67,7 +67,7 @@ What this all means
 * ``watch_models`` allows the frontend editor to redirect the user to the model instance
   ``get_absolute_url`` whenever an instance of this model is created or saved through the frontend editor
   (see :ref:`url_changes` for details).
-* The ``populate()`` method, which poulates the toolbar menu with nodes, will only be called if the current user is a
+* The ``populate()`` method, which populates the toolbar menu with nodes, will only be called if the current user is a
   staff user. In this case it:
 
   * checks whether we're in a page belonging to this application, using ``self.is_current_app``

diff --git a/docs/reference/navigation.rst b/docs/reference/navigation.rst
@@ -1,6 +1,6 @@
-##########
-Navigation
-##########
+####################
+Menus and navigation
+####################
 
 .. highlight:: html+django
 

diff --git a/docs/reference/pages.rst b/docs/reference/pages.rst
@@ -4,7 +4,7 @@ Models
 
 ..  class:: cms.models.Page
 
-    A ``Page`` is the basic unit of site structure in django CMS. The CMS uses a hierachical page model: each page
+    A ``Page`` is the basic unit of site structure in django CMS. The CMS uses a hierarchical page model: each page
     stands in relation to other pages as parent, child or sibling. This hierarchy is managed by the `django-treebeard
     <http://django-treebeard.readthedocs.io/en/latest/>`_ library.
 

diff --git a/docs/reference/templatetags.rst b/docs/reference/templatetags.rst
@@ -491,7 +491,7 @@ This will render to:
 
     By default this template tag escapes the content of the rendered
     model attribute. This helps prevent a range of security vulnerabilities
-    stemming from HTML, Javascript, and CSS Code Injection.
+    stemming from HTML, JavaScript, and CSS Code Injection.
 
     To change this behavior, the project administrator should carefully review
     each use of this template tag and ensure that all content which is rendered
@@ -573,7 +573,7 @@ method is available; also template tags and filters are available in the block.
 
     By default this template tag escapes the content of the rendered
     model attribute. This helps prevent a range of security vulnerabilities
-    stemming from HTML, Javascript, and CSS Code Injection.
+    stemming from HTML, JavaScript, and CSS Code Injection.
 
     To change this behavior, the project administrator should carefully review
     each use of this template tag and ensure that all content which is rendered
@@ -640,7 +640,7 @@ It will render to something like:
 
     By default this template tag escapes the content of the rendered
     model attribute. This helps prevent a range of security vulnerabilities
-    stemming from HTML, Javascript, and CSS Code Injection.
+    stemming from HTML, JavaScript, and CSS Code Injection.
 
     To change this behavior, the project administrator should carefully review
     each use of this template tag and ensure that all content which is rendered
@@ -703,7 +703,7 @@ It will render to something like:
 
     By default this template tag escapes the content of the rendered
     model attribute. This helps prevent a range of security vulnerabilities
-    stemming from HTML, Javascript, and CSS Code Injection.
+    stemming from HTML, JavaScript, and CSS Code Injection.
 
     To change this behavior, the project administrator should carefully review
     each use of this template tag and ensure that all content which is rendered

diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
@@ -240,6 +240,4 @@ YouTube
 Zürich
 Øyvind
 日本語
-
-
-
+addes
diff --git a/docs/topics/index.rst b/docs/topics/index.rst
@@ -9,7 +9,7 @@ concerned with explaining *how to do things* than with helping you understand
 *how it works*.
 
 .. toctree::
-    :maxdepth: 2
+    :maxdepth: 1
 
     touch
     menu_system

diff --git a/docs/upgrade/3.2.5.rst b/docs/upgrade/3.2.5.rst
@@ -43,7 +43,7 @@ Bug Fixes
     administrator should carefully review each use of the ``render_model``
     template tags provided by django CMS. He or she is encouraged to ensure
     that all content which is rendered to a page using this template tag is
-    cleansed of any potentially harmful HTML markup, CSS styles or Javascript.
+    cleansed of any potentially harmful HTML markup, CSS styles or JavaScript.
     Once the administrator or developer is satisfied that the content is
     clean, he or she can add the "safe" filter parameter to the render_model
     template tag if the content should be rendered without escaping. If there