Skip to content

Commit

Permalink
Spelling issues fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
evildmp committed Apr 29, 2016
1 parent 19bffe3 commit f166bed
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docs/introduction/toolbar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ See it at work

Visit your Polls page on your site, and you'll see a new *Polls* item in the toolbar.

It gives you quick access to the list of Polls in the Admin, and gives you a shortcut for
It gives you quick access to the list of Polls in the Admin, and gives you a short-cut for
creating a new Poll.

There's a lot more to django CMS toolbar classes than this - see
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@ Although it is optional, authors of "text enabled" plugins should consider
overriding this function as well.

This function accepts the ``instance`` as a parameter and returns a string to be
used as the alt text for the plugin's icon which will appear as a tooltip in
used as the ``alt`` text for the plugin's icon which will appear as a tooltip in
most browsers. This is useful, because if the same plugin is used multiple
times within the same text plugin, they will typically all render with the
same icon rendering them visually identical to one another. This alt text and
same icon rendering them visually identical to one another. This ``alt`` text and
related tooltip will help the operator distinguish one from the others.

By default :meth:`icon_alt` will return a string of the form: "[plugin type] -
Expand Down
6 changes: 4 additions & 2 deletions docs/spelling_wordlist
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
#
# Please keep the two sections below separate.

#### entries that need to be checked for various different reasons ####

#### entries that need to be checked for various different reasons ####
#### for example because different operating systems' dictionaries differ ####
alt
api
dev
fallback
Expand All @@ -23,6 +24,7 @@ rc
regexps
src
url
vs

#### accepted entries ####

Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/3.2.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Improvements

- Substantial "under-the-hood" improvements to the page tree resulting in
significant reduction of page-tree reloads and generally cleaner code
- Update jsTree version to 3.2.1 with slight adaptions to the page tree
- Update jsTree version to 3.2.1 with slight adaptations to the page tree
- Improve the display and usability of the language menu, especially in cases
where there are many languages
- Documentation improvements
Expand Down
8 changes: 5 additions & 3 deletions docs/upgrade/3.2.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Bug Fixes
.. important::

This version of django CMS introduces a new setting:
CMS_UNESCAPED_RENDER_MODEL_TAGS with a default value of True. This default
``CMS_UNESCAPED_RENDER_MODEL_TAGS`` with a default value of ``True``. This default
value allows upgrades to occur without forcing django CMS users to do
anything, but, please be aware that this setting continues to allow known
security vulnerabilities to be present. Due to this, the new setting is
Expand All @@ -38,22 +38,24 @@ 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
is no need to render the content un-escaped, no further action
is no need to render the content unescaped, no further action
is required.

Once all template tags have been reviewed and adjusted where necessary,
the administrator should set ``CMS_UNESCAPED_RENDER_MODEL_TAGS = False``
in the project settings. At that point, the project is more secure and
will be ready for any future upgrades.


DjangoCMS Text CKEditor
=======================

Action required
---------------

CMS 3.2.1 is not compatible with djangocms-text-ckeditor < 2.8.1.
If you're using djangocms-text-ckeditor, please upgrade to 2.8.1 or later.
9 changes: 5 additions & 4 deletions docs/upgrade/3.2.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ What's new in 3.2.5
.. note::

This release is identical to 3.2.4, but had to be released also as 3.2.4 due
to a python wheel packaging issue.
to a Python wheel packaging issue.

Bug Fixes
=========
Expand All @@ -32,7 +32,7 @@ Bug Fixes
.. important::

This version of django CMS introduces a new setting:
CMS_UNESCAPED_RENDER_MODEL_TAGS with a default value of True. This default
``CMS_UNESCAPED_RENDER_MODEL_TAGS`` with a default value of `True`. This default
value allows upgrades to occur without forcing django CMS users to do
anything, but, please be aware that this setting continues to allow known
security vulnerabilities to be present. Due to this, the new setting is
Expand All @@ -43,11 +43,11 @@ 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
is no need to render the content un-escaped, no further action
is no need to render the content unescaped, no further action
is required.

Once all template tags have been reviewed and adjusted where necessary,
Expand All @@ -60,5 +60,6 @@ DjangoCMS Text CKEditor

Action required
---------------

CMS 3.2.1 is not compatible with djangocms-text-ckeditor < 2.8.1.
If you're using djangocms-text-ckeditor, please upgrade to 2.8.1 or later.

0 comments on commit f166bed

Please sign in to comment.