aboutsummaryrefslogtreecommitdiffstats
path: root/docs/howto/setup.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/howto/setup.rst')
-rw-r--r--docs/howto/setup.rst12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/howto/setup.rst b/docs/howto/setup.rst
index a9053f73..f14e0499 100644
--- a/docs/howto/setup.rst
+++ b/docs/howto/setup.rst
@@ -13,7 +13,7 @@ If you need to manually install Django REST framework to your ``site-packages``
Template Loaders
----------------
-Django REST framework uses a few templates for the HTML and plain text documenting emitters.
+Django REST framework uses a few templates for the HTML and plain text documenting renderers.
* Ensure ``TEMPLATE_LOADERS`` setting contains ``'django.template.loaders.app_directories.Loader'``.
@@ -22,16 +22,20 @@ This will be the case by default so you shouldn't normally need to do anything h
Admin Styling
-------------
-Django REST framework uses the admin media for styling. When running using Django's testserver this is automatically served for you, but once you move onto a production server, you'll want to make sure you serve the admin media separately, exactly as you would do `if using the Django admin <https://docs.djangoproject.com/en/dev/howto/deployment/modpython/#serving-the-admin-files>`_.
+Django REST framework uses the admin media for styling. When running using Django's testserver this is automatically served for you,
+but once you move onto a production server, you'll want to make sure you serve the admin media separately, exactly as you would do
+`if using the Django admin <https://docs.djangoproject.com/en/dev/howto/deployment/modpython/#serving-the-admin-files>`_.
-* Ensure that the ``ADMIN_MEDIA_PREFIX`` is set appropriately and that you are serving the admin media. (Django's testserver will automatically serve the admin media for you)
+* Ensure that the ``ADMIN_MEDIA_PREFIX`` is set appropriately and that you are serving the admin media.
+ (Django's testserver will automatically serve the admin media for you)
Markdown
--------
The Python `markdown library <http://www.freewisdom.org/projects/python-markdown/>`_ is not required but comes recommended.
-If markdown is installed your :class:`.Resource` descriptions can include `markdown style formatting <http://daringfireball.net/projects/markdown/syntax>`_ which will be rendered by the HTML documenting emitter.
+If markdown is installed your :class:`.Resource` descriptions can include `markdown style formatting
+<http://daringfireball.net/projects/markdown/syntax>`_ which will be rendered by the HTML documenting renderer.
robots.txt, favicon, login/logout
---------------------------------