mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[1.6.x] Various documentation typo/spelling fixes
Errors detected by Topy (https://github.com/intgr/topy), all changes
verified by hand.
Backport of 11d453bcad from master
			
			
This commit is contained in:
		
				
					committed by
					
						 Tim Graham
						Tim Graham
					
				
			
			
				
	
			
			
			
						parent
						
							49f5a29493
						
					
				
				
					commit
					c5306d4af1
				
			| @@ -321,7 +321,7 @@ Ramiro Morales | ||||
|  | ||||
| Honza Král | ||||
|     Honza first discovered Django in 2006 and started using it right away, | ||||
|     first for school and personal projects and later in his full time job. He | ||||
|     first for school and personal projects and later in his full-time job. He | ||||
|     contributed various patches and fixes mostly to the newforms library, | ||||
|     newforms admin and, through participation in the Google Summer of Code | ||||
|     project, assisted in creating the :ref:`model validation | ||||
| @@ -520,11 +520,10 @@ Marc Tamlyn | ||||
|     documentation at DjangoCon EU 2012, and also helped to develop `CCBV`_, an | ||||
|     additional class based view reference tool. | ||||
|  | ||||
|     Marc currently works at `Incuna Ltd`_, a digital healthcare agency in | ||||
|     Marc is currently a full-time parent, part-time developer, and lives in | ||||
|     Oxford, UK. | ||||
|  | ||||
| .. _CCBV: http://ccbv.co.uk/ | ||||
| .. _Incuna Ltd: http://incuna.com/ | ||||
|  | ||||
| Baptiste Mispelon | ||||
|     Baptiste discovered Django around the 1.2 version and promptly switched away | ||||
|   | ||||
| @@ -192,7 +192,7 @@ Our policy for new features is: | ||||
|     release, not the development version. | ||||
|  | ||||
| Our preferred way for marking new features is by prefacing the features' | ||||
| documentation with: "``.. versionadded:: X.Y``", followed by a a mandatory | ||||
| documentation with: "``.. versionadded:: X.Y``", followed by a mandatory | ||||
| blank line and an optional content (indented). | ||||
|  | ||||
| General improvements, or other changes to the APIs that should be emphasized | ||||
|   | ||||
| @@ -146,7 +146,7 @@ Handling errors in actions | ||||
|  | ||||
| If there are foreseeable error conditions that may occur while running your | ||||
| action, you should gracefully inform the user of the problem. This means | ||||
| handling exceptions and and using | ||||
| handling exceptions and using | ||||
| :meth:`django.contrib.admin.ModelAdmin.message_user` to display a user friendly | ||||
| description of the problem in the response. | ||||
|  | ||||
|   | ||||
| @@ -106,7 +106,7 @@ respectively). | ||||
|     in the :doc:`sessions documentation </topics/http/sessions>` on | ||||
|     how to enable sessions. | ||||
|  | ||||
| We will use the :class:`SessionWizardView` in all examples but is is completely | ||||
| We will use the :class:`SessionWizardView` in all examples but is completely | ||||
| fine to use the :class:`CookieWizardView` instead. As with your | ||||
| :class:`~django.forms.Form` classes, this :class:`WizardView` class can live | ||||
| anywhere in your codebase, but convention is to put it in :file:`views.py`. | ||||
|   | ||||
| @@ -739,7 +739,7 @@ systems and coordinate transformation:: | ||||
|    .. attribute:: z | ||||
|  | ||||
|    Returns the Z coordinate of this point, or ``None`` if the | ||||
|    the point does not have a Z coordinate:: | ||||
|    point does not have a Z coordinate:: | ||||
|  | ||||
|        >>> OGRGeometry('POINT (1 2 3)').z | ||||
|        3.0 | ||||
|   | ||||
| @@ -872,7 +872,7 @@ Returns WKB of the geometry in hexadecimal.  Example:: | ||||
|  | ||||
| .. attribute:: WKBWriter.byteorder | ||||
|  | ||||
| This property may be be set to change the byte-order of the geometry | ||||
| This property may be set to change the byte-order of the geometry | ||||
| representation. | ||||
|  | ||||
| =============== ================================================= | ||||
|   | ||||
| @@ -766,7 +766,7 @@ Threaded option | ||||
| ---------------- | ||||
|  | ||||
| If you plan to run Django in a multithreaded environment (e.g. Apache using the | ||||
| the default MPM module on any modern operating system), then you **must** set | ||||
| default MPM module on any modern operating system), then you **must** set | ||||
| the ``threaded`` option of your Oracle database configuration to True:: | ||||
|  | ||||
|             'OPTIONS': { | ||||
|   | ||||
| @@ -1026,7 +1026,7 @@ For a complete discussion on the usage of the following see the | ||||
|     current point in time. Exactly what's returned depends on the value of | ||||
|     :setting:`USE_TZ`: | ||||
|  | ||||
|     * If :setting:`USE_TZ` is ``False``, this will be be a | ||||
|     * If :setting:`USE_TZ` is ``False``, this will be a | ||||
|       :ref:`naive <naive_vs_aware_datetimes>` datetime (i.e. a datetime | ||||
|       without an associated timezone) that represents the current time | ||||
|       in the system's local timezone. | ||||
|   | ||||
| @@ -77,7 +77,7 @@ handlers have been refactored to allow finer-grained control over the | ||||
| uploading process as well as streaming uploads of large files. | ||||
|  | ||||
| Along with these improvements and additions, we've made a number of | ||||
| of backwards-incompatible changes to the framework, as features have been | ||||
| backwards-incompatible changes to the framework, as features have been | ||||
| fleshed out and APIs have been finalized for the 1.0 release. A | ||||
| complete guide to these changes will be available as part of the final | ||||
| Django 1.0 release, and a comprehensive list of backwards-incompatible | ||||
|   | ||||
| @@ -50,7 +50,7 @@ Following this change, all platforms, regardless of word size, will generate a | ||||
|  | ||||
| As a result of this change, you will not be able to use the ``reset`` | ||||
| management command on any table made by a 64-bit machine. This is because the | ||||
| the new generated name will not match the historically generated name; as a | ||||
| new generated name will not match the historically generated name; as a | ||||
| result, the SQL constructed by the reset command will be invalid. | ||||
|  | ||||
| If you need to reset an application that was created with 64-bit constraints, | ||||
|   | ||||
| @@ -520,7 +520,7 @@ Added ``readonly_fields`` to ``ModelAdmin`` | ||||
|  | ||||
| :attr:`django.contrib.admin.ModelAdmin.readonly_fields` has been added to | ||||
| enable non-editable fields in add/change pages for models and inlines. Field | ||||
| and calculated values can be displayed along side editable fields. | ||||
| and calculated values can be displayed alongside editable fields. | ||||
|  | ||||
| Customizable syntax highlighting | ||||
| -------------------------------- | ||||
|   | ||||
| @@ -10,5 +10,5 @@ Bugfixes | ||||
| ======== | ||||
|  | ||||
| * Added backwards compatibility support for the :mod:`django.contrib.messages` | ||||
|   cookie format of Django 1.4 and earlier to faciliate upgrading to 1.6 from | ||||
|   cookie format of Django 1.4 and earlier to facilitate upgrading to 1.6 from | ||||
|   1.4 (`#22426 <http://code.djangoproject.com/ticket/22426>`_). | ||||
|   | ||||
| @@ -96,6 +96,7 @@ The standard pattern for processing a form in a view looks like this: | ||||
|  | ||||
|    def contact(request): | ||||
|        if request.method == 'POST': # If the form has been submitted... | ||||
|            # ContactForm was defined in the previous section | ||||
|            form = ContactForm(request.POST) # A form bound to the POST data | ||||
|            if form.is_valid(): # All validation rules pass | ||||
|                # Process the data in form.cleaned_data | ||||
|   | ||||
| @@ -124,7 +124,7 @@ specified with Python's standard named-string interpolation syntax. Example:: | ||||
| This technique lets language-specific translations reorder the placeholder | ||||
| text. For example, an English translation may be ``"Today is November 26."``, | ||||
| while a Spanish translation may be ``"Hoy es 26 de Noviembre."`` -- with the | ||||
| the month and the day placeholders swapped. | ||||
| month and the day placeholders swapped. | ||||
|  | ||||
| For this reason, you should use named-string interpolation (e.g., ``%(day)s``) | ||||
| instead of positional interpolation (e.g., ``%s`` or ``%d``) whenever you | ||||
|   | ||||
| @@ -52,7 +52,7 @@ The following is a simple unit test using the request factory:: | ||||
|             # Create an instance of a GET request. | ||||
|             request = self.factory.get('/customer/details') | ||||
|  | ||||
|             # Recall that middleware are not suported. You can simulate a | ||||
|             # Recall that middleware are not supported. You can simulate a | ||||
|             # logged-in user by setting request.user manually. | ||||
|             request.user = self.user | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user