Code

Ticket #7814: commonlyusedterms.patch

File commonlyusedterms.patch, 12.8 KB (added by uzi, 6 years ago)
  • docs/install.txt

     
    1818============================= 
    1919 
    2020If you just want to experiment with Django, skip ahead to the next 
    21 section; Django includes a lightweight web server you can use for 
     21section; Django includes a lightweight Web server you can use for 
    2222testing, so you won't need to set up Apache until you're ready to 
    2323deploy Django in production. 
    2424 
     
    6464  You will also want to read the database-specific notes for the `MySQL backend`_. 
    6565 
    6666* If you're using SQLite and either Python 2.3 or Python 2.4, you'll need 
    67   pysqlite_. Use version 2.0.3 or higher. Python 2.5 ships with an sqlite 
     67  pysqlite_. Use version 2.0.3 or higher. Python 2.5 ships with an SQLite 
    6868  wrapper in the standard library, so you don't need to install anything extra 
    6969  in that case. 
    7070 
  • docs/tutorial03.txt

     
    441441 
    442442* Django will find the match at ``'^polls/'`` 
    443443* It will strip off the matching text (``"polls/"``) and send the remaining 
    444   text -- ``"34/"`` -- to the 'mysite.polls.urls' urlconf for 
     444  text -- ``"34/"`` -- to the 'mysite.polls.urls' URLconf for 
    445445  further processing. 
    446446 
    447447Now that we've decoupled that, we need to decouple the 
    448 'mysite.polls.urls' urlconf by removing the leading "polls/" from each 
     448'mysite.polls.urls' URLconf by removing the leading "polls/" from each 
    449449line:: 
    450450 
    451451    urlpatterns = patterns('mysite.polls.views', 
  • docs/url_dispatch.txt

     
    373373At any point, your ``urlpatterns`` can "include" other URLconf modules. This 
    374374essentially "roots" a set of URLs below other ones. 
    375375 
    376 For example, here's the URLconf for the `Django website`_ itself. It includes a 
     376For example, here's the URLconf for the `Django Web site`_ itself. It includes a 
    377377number of other URLconfs:: 
    378378 
    379379    from django.conf.urls.defaults import * 
     
    390390up to that point and sends the remaining string to the included URLconf for 
    391391further processing. 
    392392 
    393 .. _`Django website`: http://www.djangoproject.com/ 
     393.. _`Django Web site`: http://www.djangoproject.com/ 
    394394 
    395395Captured parameters 
    396396------------------- 
  • docs/db-api.txt

     
    463463may or may not make sense. If you are using custom SQL fragments in your 
    464464``extra()`` calls, Django will not inspect these fragments to see if they need 
    465465to be rewritten because of changes in the merged query. So test the effects 
    466 carefully. Also realise that if you are combining two ``QuerySets`` with 
     466carefully. Also realize that if you are combining two ``QuerySets`` with 
    467467``|``, you cannot use ``extra(select=...)`` or ``extra(where=...)`` on *both* 
    468468``QuerySets``. You can only use those calls on one or the other (Django will 
    469469raise a ``ValueError`` if you try to use this incorrectly). 
  • docs/csrf.txt

     
    44 
    55The CsrfMiddleware class provides easy-to-use protection against 
    66`Cross Site Request Forgeries`_.  This type of attack occurs when a malicious 
    7 web site creates a link or form button that is intended to perform some action 
    8 on your web site, using the credentials of a logged-in user who is tricked 
     7Web site creates a link or form button that is intended to perform some action 
     8on your Web site, using the credentials of a logged-in user who is tricked 
    99into clicking on the link in their browser. 
    1010 
    1111The first defense against CSRF attacks is to ensure that GET requests 
     
    3838   checks that the 'csrfmiddlewaretoken' is present and correct. If it 
    3939   isn't, the user will get a 403 error. 
    4040 
    41 This ensures that only forms that have originated from your web site 
     41This ensures that only forms that have originated from your Web site 
    4242can be used to POST data back. 
    4343 
    4444It deliberately only targets HTTP POST requests (and the corresponding POST 
     
    4747CSRF attack with a GET request ought to be harmless. 
    4848 
    4949POST requests that are not accompanied by a session cookie are not protected, 
    50 but they do not need to be protected, since the 'attacking' web site 
     50but they do not need to be protected, since the 'attacking' Web site 
    5151could make these kind of requests anyway. 
    5252 
    5353The Content-Type is checked before modifying the response, and only 
     
    6868you might bypass the filter that adds the hidden field to the form, 
    6969in which case form submission will always fail.  It may still be possible 
    7070to use the middleware, provided you can find some way to get the 
    71 CSRF token and ensure that is included when your form is submitted. 
    72  No newline at end of file 
     71CSRF token and ensure that is included when your form is submitted. 
  • docs/api_stability.txt

     
    5959    
    6060   - `Request/response objects`_. 
    6161    
    62    - `Sending email`_. 
     62   - `Sending e-mail`_. 
    6363    
    6464   - `Sessions`_. 
    6565    
     
    108108.. _mod_python integration: ../modpython/ 
    109109.. _redirects: ../redirects/ 
    110110.. _request/response objects: ../request_response/ 
    111 .. _sending email: ../email/ 
     111.. _sending e-mail: ../email/ 
    112112.. _sessions: ../sessions/ 
    113113.. _settings: ../settings/ 
    114114.. _syndication: ../syndication_feeds/ 
  • docs/release_notes_0.95.txt

     
    9999================================ 
    100100 
    101101Need help resolving a problem with Django? The documentation in the 
    102 distribution is also available online_ at the `Django website`_. The FAQ_ 
     102distribution is also available online_ at the `Django Web site`_. The FAQ_ 
    103103document is especially recommended, as it contains a number of issues that 
    104104come up time and again. 
    105105 
     
    115115available at any hour of the day -- to help, or just to chat. 
    116116 
    117117.. _online: http://www.djangoproject.com/documentation/0.95/ 
    118 .. _Django website: http://www.djangoproject.com/ 
     118.. _Django Web site: http://www.djangoproject.com/ 
    119119.. _FAQ: http://www.djangoproject.com/documentation/faq/ 
    120120.. _django-users: http://groups.google.com/group/django-users 
    121121 
  • docs/i18n.txt

     
    888888    * The string domain is ``django`` or ``djangojs``. This string domain is 
    889889      used to differentiate between different programs that store their data 
    890890      in a common message-file library (usually ``/usr/share/locale/``). The 
    891       ``django`` domain is used for python and template translation strings 
     891      ``django`` domain is used for Python and template translation strings 
    892892      and is loaded into the global translation catalogs. The ``djangojs`` 
    893893      domain is only used for JavaScript translation catalogs to make sure 
    894894      that those are as small as possible. 
  • docs/authentication.txt

     
    631631**Description:** 
    632632 
    633633Allows a user to reset their password, and sends them the new password 
    634 in an email. 
     634in an e-mail. 
    635635 
    636636**Optional arguments:** 
    637637 
     
    640640      ``registration/password_reset_form.html`` if not supplied. 
    641641 
    642642    * ``email_template_name``: The full name of a template to use for 
    643       generating the email with the new password. This will default to 
     643      generating the e-mail with the new password. This will default to 
    644644      ``registration/password_reset_email.html`` if not supplied. 
    645645 
    646646**Template context:** 
     
    695695      for allowing a user to change their password. 
    696696 
    697697    * ``django.contrib.auth.forms.PasswordResetForm``: A manipulator 
    698       for resetting a user's password and emailing the new password to 
     698      for resetting a user's password and e-mailing the new password to 
    699699      them. 
    700700 
    701701    * ``django.contrib.auth.forms.UserCreationForm``: A manipulator 
  • docs/forms.txt

     
    373373your own custom manipulators for handling custom forms. 
    374374 
    375375Custom manipulators are pretty simple. Here's a manipulator that you might use 
    376 for a "contact" form on a website:: 
     376for a "contact" form on a Web site:: 
    377377 
    378378    from django import forms 
    379379 
  • docs/templates.txt

     
    19451945django.contrib.webdesign 
    19461946------------------------ 
    19471947 
    1948 A collection of template tags that can be useful while designing a website, 
     1948A collection of template tags that can be useful while designing a Web site, 
    19491949such as a generator of Lorem Ipsum text. See the `webdesign documentation`_. 
    19501950 
    19511951.. _webdesign documentation: ../webdesign/ 
  • docs/newforms.txt

     
    15871587Custom form and field validation 
    15881588--------------------------------- 
    15891589 
    1590 Form validation happens when the data is cleaned. If you want to customise 
     1590Form validation happens when the data is cleaned. If you want to customize 
    15911591this process, there are various places you can change, each one serving a 
    15921592different purpose. Three types of cleaning methods are run during form 
    15931593processing. These are normally executed when you call the ``is_valid()`` 
     
    15981598In general, any cleaning method can raise ``ValidationError`` if there is a 
    15991599problem with the data it is processing, passing the relevant error message to 
    16001600the ``ValidationError`` constructor. If no ``ValidationError`` is raised, the 
    1601 method should return the cleaned (normalised) data as a Python object. 
     1601method should return the cleaned (normalized) data as a Python object. 
    16021602 
    16031603If you detect multiple errors during a cleaning method and wish to signal all 
    16041604of them to the form submitter, it is possible to pass a list of errors to the 
     
    16311631    * The Form subclass's ``clean()`` method. This method can perform 
    16321632      any validation that requires access to multiple fields from the form at 
    16331633      once. This is where you might put in things to check that if field ``A`` 
    1634       is supplied, field ``B`` must contain a valid email address and the 
     1634      is supplied, field ``B`` must contain a valid e-mail address and the 
    16351635      like. The data that this method returns is the final ``cleaned_data`` 
    16361636      attribute for the form, so don't forget to return the full list of 
    16371637      cleaned data if you override this method (by default, ``Form.clean()`` 
     
    17531753When Django renders a widget as HTML, it only renders the bare minimum 
    17541754HTML - Django doesn't add a class definition, or any other widget-specific 
    17551755attributes. This means that all 'TextInput' widgets will appear the same 
    1756 on your web page. 
     1756on your Web page. 
    17571757 
    17581758If you want to make one widget look different to another, you need to 
    17591759specify additional attributes for each widget. When you specify a 
     
    17771777    <tr><th>Url:</th><td><input type="text" name="url"/></td></tr> 
    17781778    <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr> 
    17791779 
    1780 On a real web page, you probably don't want every widget to look the same. You 
     1780On a real Web page, you probably don't want every widget to look the same. You 
    17811781might want a larger input element for the comment, and you might want the 
    17821782'name' widget to have some special CSS class. To do this, you specify a 
    17831783custom widget for your fields, and specify some attributes to use 
  • docs/django-admin.txt

     
    395395 
    396396Runs over the entire source tree of the current directory and pulls out all 
    397397strings marked for translation. It creates (or updates) a message file in the 
    398 conf/locale (in the django tree) or locale (for project and application) 
     398conf/locale (in the Django tree) or locale (for project and application) 
    399399directory. After making changes to the messages files you need to compile them 
    400400with ``compilemessages`` for use with the builtin gettext support. See the 
    401401`i18n documentation`_ for details.