Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Copy-edited docs/faq.txt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 31cd933263ed31e9059de7d6e3f8fa2c52e7e273 1 parent caef619
Adrian Holovaty authored July 16, 2005

Showing 1 changed file with 24 additions and 24 deletions. Show diff stats Hide diff stats

  1. 48  docs/faq.txt
48  docs/faq.txt
@@ -100,17 +100,16 @@ Django appears to be a MVC framework, but you call the Controller the "view", an
100 100
 That's because Django isn't strictly a MVC framework.  We don't really believe in
101 101
 any capital-M Methodologies; we do what "feels" right.  If you squint the right
102 102
 way, you can call Django's ORM the "Model", the view functions the "View", and
103  
-the API automatically generated from the models the "Controller" -- but not
104  
-really.
  103
+the dynamically-generated API the "Controller" -- but not really.
105 104
 
106  
-So although we've been strongly influenced by MVC -- especially in the
107  
-separation of data from logic department -- we've also strayed from the path
  105
+So, although we've been strongly influenced by MVC -- especially in the
  106
+separation-of-data-from-logic department -- we've also strayed from the path
108 107
 where it makes sense.
109 108
 
110 109
 Do you have any of those nifty "screencast" things?
111 110
 ---------------------------------------------------
112 111
 
113  
-They're in the works -- it's amazing how much time those things take!  Stay tuned...
  112
+They're in the works. It's amazing how much time those things take!  Stay tuned...
114 113
 
115 114
 Installation questions
116 115
 ======================
@@ -123,7 +122,7 @@ How do I get started?
123 122
     #. Walk through the tutorial_.
124 123
     #. Check out the rest of the documentation_, and ask questions if you
125 124
        run into trouble.
126  
-       
  125
+
127 126
 .. _`Download the code`: http://www.djangoproject.com/download/
128 127
 .. _`installation guide`: http://www.djangoproject.com/documentation/install/
129 128
 .. _tutorial:  http://www.djangoproject.com/documentation/tutorial1/
@@ -137,12 +136,13 @@ Just run the ``ex_setup.py`` script in the Django distribution.
137 136
 What are Django's prerequisites?
138 137
 --------------------------------
139 138
 
140  
-Django requires Python_ 2.3 or later, Apache2_, and mod_python_.  You'll
141  
-also need a database engine; PostgreSQL_ is recommended, and MySQL_ is
  139
+Django requires Python_ 2.3 or later, `Apache 2`_, and mod_python_.
  140
+
  141
+You'll also need a database engine. PostgreSQL_ is recommended, and MySQL_ is
142 142
 supported.
143 143
 
144 144
 .. _Python: http://www.python.org/
145  
-.. _Apache2: http://httpd.apache.org/
  145
+.. _Apache 2: http://httpd.apache.org/
146 146
 .. _mod_python: http://www.modpython.org/
147 147
 .. _PostgreSQL: http://www.postgresql.org/
148 148
 .. _MySQL: http://www.mysql.com/
@@ -155,8 +155,8 @@ How do I install mod_python on Windows?
155 155
     * For Python 2.3, grab mod_python from http://www.mod_python.org/, the read
156 156
       `Running mod_python on Apache on Windows2000`_.
157 157
 
158  
-    * Also try this (not windows-specific) `guide to getting mod_python working`_.
159  
-      
  158
+    * Also try this (not Windows-specific) `guide to getting mod_python working`_.
  159
+
160 160
 .. _`guide to mod_python & Python 2.3`: http://www.lehuen.com/nicolas/index.php/2005/02/21/39-win32-build-of-mod_python-314-for-python-24
161 161
 .. _`Running mod_python on Apache on Windows2000`: http://groups-beta.google.com/group/comp.lang.python/msg/139af8c83a5a9d4f
162 162
 .. _`guide to getting mod_python working`: http://www.dscpl.com.au/articles/modpython-001.html
@@ -166,16 +166,16 @@ How do I install mod_python on Windows?
166 166
 Do I have to use mod_python?
167 167
 ----------------------------
168 168
 
169  
-In the first release, yes.  However, WSGI_ support (which will let Django run
170  
-under FCGI, SCGI, medusa, etc.) is in the works; stay tuned!
  169
+In the first release, yes. However, WSGI_ support (which will let Django run
  170
+under FCGI, SCGI, medusa, etc.) is in the works. Stay tuned!
171 171
 
172 172
 .. _WSGI: http://www.python.org/peps/pep-0333.html
173 173
 
174 174
 Will Django run under shared hosting (like TextDrive or Dreamhost)?
175 175
 -------------------------------------------------------------------
176 176
 
177  
-Right now, no, unless you can get your host to install mod_python.  However, as
178  
-the previous question says, WSGI support is coming!.
  177
+Right now, no, unless you can get your host to install mod_python. However, as
  178
+the previous answer says, WSGI support is coming!
179 179
 
180 180
 Using Django
181 181
 ============
@@ -187,27 +187,27 @@ Make sure that:
187 187
 
188 188
     * The environment variable DJANGO_SETTINGS_MODULE is set to a fully-qualified
189 189
       Python module (i.e. "mysite.settings.main").
190  
-    
  190
+
191 191
     * Said module is on ``sys.path`` (``import mysite.settings.main`` should work).
192  
-    
  192
+
193 193
     * The module doesn't contain syntax errors (of course).
194  
-    
  194
+
195 195
     * If you're using mod_python but *not* using Django's request handler,
196 196
       you'll need to work around a mod_python bug related to the use of
197 197
       ``SetEnv``; before you import anything from Django you'll need to do
198 198
       the following::
199  
-      
  199
+
200 200
             os.environ.update(req.subprocess_env)
201  
-            
  201
+
202 202
       (where ``req`` is the mod_python request object).
203  
-      
204  
-I can't stand your template language; do I have to use it?
  203
+
  204
+I can't stand your template language. Do I have to use it?
205 205
 ----------------------------------------------------------
206 206
 
207 207
 We happen to think our template engine is the best thing since chunky bacon,
208  
-but we recognize that choosing a template language runs close to religion.  
  208
+but we recognize that choosing a template language runs close to religion.
209 209
 There's nothing about Django that requires using the template language, so
210  
-if you're attached to ZPT, Cheetah, or whatever, feel free to use those. 
  210
+if you're attached to ZPT, Cheetah, or whatever, feel free to use those.
211 211
 
212 212
 The admin interface
213 213
 ===================

0 notes on commit 31cd933

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