Skip to content
Browse files

Standardising references to the CMS as 'django CMS' where they're inc…

…onsistent.
  • Loading branch information...
1 parent be03470 commit 6364e81ccb2e3c6ee02b1eb7a3e49ec793e7c0f1 @kezabelle kezabelle committed Aug 4, 2011
View
8 docs/contribution.rst
@@ -1,8 +1,8 @@
##########################
-Contributing to Django-CMS
+Contributing to django CMS
##########################
-Like every open-source project, Django-CMS is always looking for motivated
+Like every open-source project, django CMS is always looking for motivated
individuals to contribute to it's source code.
However, to ensure the highest code quality and keep the repository nice and
tidy, everybody has to follow a few rules (nothing major, I promise :) )
@@ -12,7 +12,7 @@ tidy, everybody has to follow a few rules (nothing major, I promise :) )
Community
*********
-People interested in developing for the django-cms should join the
+People interested in developing for the django CMS should join the
`django-cms-developers`_ mailing list as well as heading over to #django-cms on
the `freenode`_ IRC network for help and to discuss the development.
@@ -58,7 +58,7 @@ not to do any work that will not get merged in anyway.
- Usually, if unit tests are written, pass, and your change is relevant, then
it'll be merged.
-Since we're hosted on GitHub, django-cms uses `git`_ as a version control system.
+Since we're hosted on GitHub, django CMS uses `git`_ as a version control system.
The `GitHub help`_ is very well written and will get you started on using git
and GitHub in a jiffy. It is an invaluable resource for newbies and old timers
View
2 docs/extending_cms/app_integration.rst
@@ -313,7 +313,7 @@ An example use-case
-------------------
A simple example: you have a news application that publishes pages
-independently of Django CMS. However, you would like to integrate the
+independently of django CMS. However, you would like to integrate the
application into the menu structure of your site, so that at appropriate
places a *News* node appears in the navigation menu.
View
12 docs/extending_cms/custom_plugins.rst
@@ -2,8 +2,8 @@
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) in
+CMS Plugins are reusable content publishers, that can be inserted into django
+CMS pages (or indeed into any content that uses django CMS placeholders) in
order to publish information automatically, without further intervention.
This means that your published web content, whatever it is, can be kept
@@ -22,17 +22,17 @@ Why would you need to write a plugin?
*************************************
A plugin is the most convenient way to integrate content from another Django
-app into a Django CMS page.
+app into a django CMS page.
-For example, suppose you're developing a site for a record company in Django
+For example, suppose you're developing a site for a record company in django
CMS. You might like to have on your site's home page a "Latest releases" box.
Of course, you could every so often edit that page and update the information.
However, a sensible record company will manage its catalogue in Django too,
which means Django already knows what this week's new releases are.
This is an excellent opportunity to make use of that information to make your
-life easier - all you need to do is create a Django CMS plugin that you can
+life easier - all you need to do is create a django CMS plugin that you can
insert into your home page, and leave it to do the work of publishing information
about the latest releases for you.
@@ -45,7 +45,7 @@ publish information about recent new releases in that series.
Overview
********
-A Django CMS plugin is fundamentally composed of three things.
+A django CMS plugin is fundamentally composed of three things.
* a plugin **editor**, to configure a plugin each time it is deployed
* a plugin **publisher**, to do the automated work of deciding what to publish
View
2 docs/extending_cms/placeholders.rst
@@ -2,7 +2,7 @@
Placeholders outside the CMS
############################
-Placeholders are special model fields that DjangoCMS uses to render
+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
user can add text, video or any other plugin to a webpage, using either the
normal Django admin interface or the so called `frontend editing`.
View
2 docs/extending_cms/searchdocs.rst
@@ -1,5 +1,5 @@
#########################
-Search and the Django-CMS
+Search and the django CMS
#########################
For powerful full-text search in with the django CMS, we suggest using
View
12 docs/getting_started/configuration.rst
@@ -4,7 +4,7 @@
Configuration
#############
-The Django-CMS has a lot of settings you can use to customize your installation
+The django CMS has a lot of settings you can use to customize your installation
of the CMS to be exactly like you want it to be.
*****************
@@ -209,7 +209,7 @@ CMS_HIDE_UNTRANSLATED
Default: ``True``
-By default django-cms hides menu items that are not yet translated into the
+By default django CMS hides menu items that are not yet translated into the
current language. With this setting set to False they will show up anyway.
.. setting:: CMS_LANGUAGES
@@ -219,7 +219,7 @@ CMS_LANGUAGES
Default: Value of :setting:`django:LANGUAGES`
-Defines the languages available in the CMS.
+Defines the languages available in django CMS.
Example::
@@ -283,7 +283,7 @@ CMS_FRONTEND_LANGUAGES
Default: Value of :setting:`CMS_LANGUAGES`
-A list of languages Django CMS uses in the frontend. For example, if
+A list of languages django CMS uses in the frontend. For example, if
you decide you want to add a new language to your page but don't want to
show it to the world yet.
@@ -330,12 +330,12 @@ CMS_PAGE_MEDIA_PATH
Default: ``'cms_page_media/'``
-By default, Django CMS creates a folder called ``cms_page_media`` in your
+By default, django CMS creates a folder called ``cms_page_media`` in your
static files folder where all uploaded media files are stored. The media files
are stored in subfolders numbered with the id of the page.
You should take care that the directory to which it points is writable by the
-user under which django will be running.
+user under which Django will be running.
****
View
2 docs/getting_started/installation.rst
@@ -90,7 +90,7 @@ On Microsoft Windows
Databases
*********
-We recommend using `PostgreSQL`_ or `MySQL`_ with Django CMS. Installing and
+We recommend using `PostgreSQL`_ or `MySQL`_ with django CMS. Installing and
maintaining database systems is outside the scope of this documentation, but is
very well documented on the system's respective websites.
View
10 docs/getting_started/tutorial.rst
@@ -98,7 +98,7 @@ instead:
If you opt for core plugins you should take care that directory to which
:setting:`CMS_PAGE_MEDIA_PATH` setting points (by default ``cms_page_media/``
-relative to :setting:`django:MEDIA_ROOT`) is writable by the user under which django
+relative to :setting:`django:MEDIA_ROOT`) is writable by the user under which Django
will be running. If you have opted for django-filer then similar requirement
exists based on its configuration.
@@ -219,7 +219,7 @@ and `django-appmedia`_ will do all the work for you.
Creating templates
******************
-Django CMS uses templates to define how a page should look and what parts of
+django CMS uses templates to define how a page should look and what parts of
it are editable. Editable areas are called *placeholders*. These templates are
standard Django templates and you may use them as described in the
`official documentation`_.
@@ -301,7 +301,7 @@ Initial database setup
This command depends on whether you **upgrade** your installation or do a
**fresh install**. We recommend that you get familiar with the way `South`_ works,
-as it is a very powerful, easy and convenient tool. Django CMS uses it extensively.
+as it is a very powerful, easy and convenient tool. django CMS uses it extensively.
Fresh install
-------------
@@ -375,7 +375,7 @@ pages.
.. |my-first-page| image:: ../images/my-first-page.png
-Congratulations! You now have a fully functional Django CMS installation!
+Congratulations! You now have a fully functional django CMS installation!
Publishing a page
=================
@@ -455,7 +455,7 @@ Template errors
If your placeholder content isn't displayed when you view a CMS Page: change the
:setting:`CMS_MODERATOR` setting in your ``settings.py`` to ``False``. This bug
-has been recently fixed, so upgrade to the latest version of Django CMS. See:
+has been recently fixed, so upgrade to the latest version of django CMS. See:
https://github.com/divio/django-cms/issues/issue/430
View
2 docs/getting_started/using_south.rst
@@ -1,5 +1,5 @@
###########################
-Using South with Django-CMS
+Using South with django CMS
###########################
South is an incredible piece of software that lets you handle database
View
8 docs/index.rst
@@ -4,7 +4,7 @@
contain the root `toctree` directive.
######################################
-Welcome to django cms's documentation!
+Welcome to django CMS's documentation!
######################################
This document refers to version |release|
@@ -55,9 +55,9 @@ Extending the CMS
extending_cms/searchdocs
-***********************
-Contributing to the CMS
-***********************
+**************************
+Contributing to django CMS
+**************************
.. toctree::
:maxdepth: 2

0 comments on commit 6364e81

Please sign in to comment.
Something went wrong with that request. Please try again.