Commit 516051bf authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

A whole lotta documentation fixes: Fixes #8704, #8826, #8980, #9243, #9343, #9529, 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 15becf23

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ answer newbie questions, and generally made Django that much better: 
    konrad@gwu.edu

    knox <christobzr@gmail.com>

    David Krauth

    Kevin Kubasik <kevin@kubasik.net>

    kurtiss@meetro.com

    Denis Kuzmichyov <kuzmichyov@gmail.com>

    Panos Laganakos <panos.laganakos@gmail.com>

docs/conf.py

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ show_authors = False 
# The name of the Pygments (syntax highlighting) style to use.

pygments_style = 'trac'



# Sphinx will recurse into subversion configuration folders and try to read  

# any document file within. These should be ignored. 

# Note: exclude_dirnames is new in Sphinx 0.5 

exclude_dirnames = ['.svn']



# Options for HTML output

# -----------------------

docs/faq/usage.txt

+10 −0
Original line number Diff line number Diff line
@@ -67,3 +67,13 @@ Using a :class:`~django.db.models.FileField` or an 
       Django. For example, if your :class:`~django.db.models.ImageField` is

       called ``mug_shot``, you can get the absolute URL to your image in a

       template with ``{{ object.mug_shot.url }}``.



How do I make a variable available to all my templates?

-------------------------------------------------------



Sometimes your templates just all need the same thing. A common example would

be dynamically-generated menus. At first glance, it seems logical to simply

add a common dictionary to the template context.



The correct solution is to use a ``RequestContext``. Details on how to do this

are here: :ref:`subclassing-context-requestcontext`.

docs/glossary.txt

+5 −4
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ Glossary 
        See :ref:`topics-db-models`.



    generic view

        A higher-order :term:`view` function that abstracts common idioms and patterns

        found in view development and abstracts them.

        A higher-order :term:`view` function that provides an abstract/generic

        implementation of a common idiom or pattern found in view development.

        

        See :ref:`ref-generic-views`.
@@ -71,8 +71,9 @@ Glossary 
        the last bit (``spring``) is the slug.



    template

        A chunk of text that separates the presentation of a document from its

        data.

        A chunk of text that acts as formatting for representing data. A

        template helps to abstract the presentation of data from the data

        itself.

        

        See :ref:`topics-templates`.

docs/howto/deployment/fastcgi.txt

+13 −0
Original line number Diff line number Diff line
@@ -288,6 +288,19 @@ You can also run multiple Django installations on the same site simply by 
specifying multiple entries in the ``fastcgi.server`` directive. Add one

FastCGI host for each.



Cherokee setup

==============



Cherokee is a very fast, flexible and easy to configure Web Server. It

supports the widespread technologies nowadays: FastCGI, SCGI, PHP, CGI, SSI,

TLS and SSL encrypted connections, Virtual hosts, Authentication, on the fly

encoding, Load Balancing, Apache compatible log files, Data Base Balancer,

Reverse HTTP Proxy and much more.



The Cherokee project provides a documentation to `setting up Django`_ with Cherokee.



.. _setting up Django: http://www.cherokee-project.com/doc/cookbook_django.html



Running Django on a shared-hosting provider with Apache

=======================================================