Ticket #7814: 7814.diff

File 7814.diff, 13.4 KB (added by programmerq, 7 years ago)

Fixed one failed hunk

  • docs/api_stability.txt

    diff --git a/docs/api_stability.txt b/docs/api_stability.txt
    index 769359b..9566e8f 100644
    a b These APIs are stable: 
    5959   
    6060   - `Request/response objects`_.
    6161   
    62    - `Sending email`_.
     62   - `Sending e-mail`_.
    6363   
    6464   - `Sessions`_.
    6565   
    change: 
    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/authentication.txt

    diff --git a/docs/authentication.txt b/docs/authentication.txt
    index cd76731..095e33c 100644
    a b The page shown after a user has changed their password. 
    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
    in an email. 
    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:**
    system provides several built-in forms: 
    696696      user to change their password.
    697697
    698698    * ``django.contrib.auth.forms.PasswordResetForm``: A form for resetting a
    699       user's password and emailing the new password to them.
     699      user's password and e-mailing the new password to them.
    700700
    701701    * ``django.contrib.auth.forms.UserCreationForm``: A form for creating a
    702702      new user.
  • docs/csrf.txt

    diff --git a/docs/csrf.txt b/docs/csrf.txt
    index 7d79e39..8d56e2f 100644
    a b Cross Site Request Forgery protection 
    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
    CsrfMiddleware does two things: 
    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
    effects (see `9.1.1 Safe Methods, HTTP 1.1, RFC 2616`_), and so a 
    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
    it sends fragments of HTML in javascript document.write statements) 
    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/db-api.txt

    diff --git a/docs/db-api.txt b/docs/db-api.txt
    index 5fdcd94..4074932 100644
    a b Be careful, if you are using ``extra()`` to add custom handling to your 
    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/django-admin.txt

    diff --git a/docs/django-admin.txt b/docs/django-admin.txt
    index f5cc02e..71c4cf5 100644
    a b makemessages 
    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.
  • docs/forms.txt

    diff --git a/docs/forms.txt b/docs/forms.txt
    index 18d322a..5db3a9f 100644
    a b created manipulators. But the coolness doesn't end there: You can easily create 
    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/i18n.txt

    diff --git a/docs/i18n.txt b/docs/i18n.txt
    index c221b43..cce9d4e 100644
    a b does translation: 
    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/install.txt

    diff --git a/docs/install.txt b/docs/install.txt
    index bfe85ff..cd21bd7 100644
    a b Install Apache and mod_python 
    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
    installed. 
    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/newforms.txt

    diff --git a/docs/newforms.txt b/docs/newforms.txt
    index 88b25be..c2448e5 100644
    a b mentioned above (``required``, ``label``, ``initial``, ``widget``, 
    15961596Custom form and field validation
    15971597---------------------------------
    15981598
    1599 Form validation happens when the data is cleaned. If you want to customise
     1599Form validation happens when the data is cleaned. If you want to customize
    16001600this process, there are various places you can change, each one serving a
    16011601different purpose. Three types of cleaning methods are run during form
    16021602processing. These are normally executed when you call the ``is_valid()``
    directly), but normally they won't be needed. 
    16071607In general, any cleaning method can raise ``ValidationError`` if there is a
    16081608problem with the data it is processing, passing the relevant error message to
    16091609the ``ValidationError`` constructor. If no ``ValidationError`` is raised, the
    1610 method should return the cleaned (normalised) data as a Python object.
     1610method should return the cleaned (normalized) data as a Python object.
    16111611
    16121612If you detect multiple errors during a cleaning method and wish to signal all
    16131613of them to the form submitter, it is possible to pass a list of errors to the
    The three types of cleaning methods are: 
    16401640    * The Form subclass's ``clean()`` method. This method can perform
    16411641      any validation that requires access to multiple fields from the form at
    16421642      once. This is where you might put in things to check that if field ``A``
    1643       is supplied, field ``B`` must contain a valid email address and the
     1643      is supplied, field ``B`` must contain a valid e-mail address and the
    16441644      like. The data that this method returns is the final ``cleaned_data``
    16451645      attribute for the form, so don't forget to return the full list of
    16461646      cleaned data if you override this method (by default, ``Form.clean()``
    Customizing widget instances 
    17621762When Django renders a widget as HTML, it only renders the bare minimum
    17631763HTML - Django doesn't add a class definition, or any other widget-specific
    17641764attributes. This means that all 'TextInput' widgets will appear the same
    1765 on your web page.
     1765on your Web page.
    17661766
    17671767If you want to make one widget look different to another, you need to
    17681768specify additional attributes for each widget. When you specify a
    each widget will be rendered exactly the same:: 
    17861786    <tr><th>Url:</th><td><input type="text" name="url"/></td></tr>
    17871787    <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
    17881788
    1789 On a real web page, you probably don't want every widget to look the same. You
     1789On a real Web page, you probably don't want every widget to look the same. You
    17901790might want a larger input element for the comment, and you might want the
    17911791'name' widget to have some special CSS class. To do this, you specify a
    17921792custom widget for your fields, and specify some attributes to use
  • docs/release_notes_0.95.txt

    diff --git a/docs/release_notes_0.95.txt b/docs/release_notes_0.95.txt
    index f2ecbb6..a61b10d 100644
    a b Problem reports and getting help 
    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
    Django users and developers from around the world. Friendly people are usually 
    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/templates.txt

    diff --git a/docs/templates.txt b/docs/templates.txt
    index 04a4658..a7f6a83 100644
    a b information. 
    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/tutorial03.txt

    diff --git a/docs/tutorial03.txt b/docs/tutorial03.txt
    index d49a417..2ac1062 100644
    a b Here's what happens if a user goes to "/polls/34/" in this system: 
    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

    diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt
    index 7d67cd5..266e4a5 100644
    a b Including other URLconfs 
    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 *
    Django encounters ``include()``, it chops off whatever part of the URL matched 
    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-------------------
Back to Top