Merge pull request #642 from scop/docs

Various documentation improvements

compressor/management/commands/compress.py

@@ -234,7 +234,7 @@ class Command(NoArgsCommand):
                 try:
                     result = parser.render_node(template, context, node)
                 except Exception as e:
-                    raise CommandError("An error occured during rendering %s: "
+                    raise CommandError("An error occurred during rendering %s: "
                                        "%s" % (template.template_name, e))
                 offline_manifest[key] = result
                 context.pop()
@@ -253,7 +253,7 @@ class Command(NoArgsCommand):
         passed by using --extension/-e multiple times.
 
         for example: running 'django-admin compress -e js,txt -e xhtml -a'
-        would result in a extension list: ['.js', '.txt', '.xhtml']
+        would result in an extension list: ['.js', '.txt', '.xhtml']
 
         >>> handle_extensions(['.html', 'html,js,py,py,py,.py', 'py,.py'])
         ['.html', '.js']

compressor/tests/test_offline.py

@@ -49,7 +49,7 @@ class OfflineTestCaseMixin(object):
 
         # Reset template dirs, because it enables us to force compress to
         # consider only a specific directory (helps us make true,
-        # independant unit tests).
+        # independent unit tests).
         # Specify both Jinja2 and Django template locations. When the wrong engine
         # is used to parse a template, the TemplateSyntaxError will cause the
         # template to be skipped over.

docs/changelog.txt

@@ -57,7 +57,7 @@ v1.4 (06/20/2014)
 
 - Made ``CssCompressor`` class easier to extend.
 
-- Added support for explictly stating the block being ended.
+- Added support for explicitly stating the block being ended.
 
 - Added rcssmin and updated rjsmin.
 
@@ -368,7 +368,7 @@ v0.6.1
 ------
 
 - Fixed staticfiles support to also use its finder API to find files during
-  developement -- when the static files haven't been collected in
+  development -- when the static files haven't been collected in
   ``STATIC_ROOT``.
 
 - Fixed regression with the ``COMPRESS`` setting, pre-compilation and
@@ -394,7 +394,7 @@ Major improvements and a lot of bugfixes, some of which are:
   compress template tag does. See the
   :ref:`pre-compression <pre-compression>` docs for more information.
 
-- Various perfomance improvements by better caching and mtime cheking.
+- Various performance improvements by better caching and mtime cheking.
 
 - Deprecated ``COMPRESS_LESSC_BINARY`` setting because it's now
   superseded by the :attr:`~django.conf.settings.COMPRESS_PRECOMPILERS`

docs/settings.txt

@@ -135,7 +135,12 @@ Backend settings
     - ``compressor.filters.cssmin.CSSMinFilter``
 
       A filter that uses Zachary Voase's Python port of the YUI CSS compression
-      algorithm cssmin_.
+      algorithm cssmin_ (included, no external dependencies).
+
+    - ``compressor.filters.cssmin.rCSSMinFilter``
+
+      A filter that uses the cssmin implementation rCSSmin_ to compress CSS
+      (included, no external dependencies).
 
     - ``compressor.filters.cleancss.CleanCSSFilter``
 
@@ -153,6 +158,7 @@ Backend settings
     .. _CSSTidy: http://csstidy.sourceforge.net/
     .. _`data: URIs`: http://en.wikipedia.org/wiki/Data_URI_scheme
     .. _cssmin: http://pypi.python.org/pypi/cssmin/
+    .. _rCSSmin: http://opensource.perlig.de/rcssmin/
     .. _`clean-css`: https://github.com/GoalSmashers/clean-css/
 
 
@@ -178,7 +184,7 @@ Backend settings
     - ``compressor.filters.jsmin.JSMinFilter``
 
       A filter that uses the jsmin implementation rJSmin_ to compress
-      JavaScript code.
+      JavaScript code (included, no external dependencies).
 
     .. _slimit_filter:
 

docs/usage.txt

@@ -153,7 +153,7 @@ the commonly used setting to refer to saved files ``STATIC_URL``.
 
 The result of running the ``compress`` management command will be cached
 in a file called ``manifest.json`` using the :attr:`configured storage
-<django.conf.settings.COMPRESS_STORAGE>` to be able to be transfered from your developement
+<django.conf.settings.COMPRESS_STORAGE>` to be able to be transferred from your development
 computer to the server easily.
 
 .. _TEMPLATE_LOADERS: http://docs.djangoproject.com/en/dev/ref/settings/#template-loaders