Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Made a bunch of tiny documentation formatting and typo fixes.

Thanks, quicklizard, adamv, Gary Wilson, superjudge and David Pretty.

Fixed #6554, #6573 ,#6592, #6595, #6608.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d9a3c1b9fcab47d233fee4c86bfd68fa9ce25f22 1 parent 87ca6ae
Malcolm Tredinnick authored February 15, 2008
6  docs/django-admin.txt
@@ -717,7 +717,7 @@ in Python package syntax, e.g. ``mysite.settings``. If this isn't provided,
717 717
 variable.
718 718
 
719 719
 Note that this option is unnecessary in ``manage.py``, because it uses
720  
-``settings.py`` from the current project by default. 
  720
+``settings.py`` from the current project by default.
721 721
 
722 722
 Extra niceties
723 723
 ==============
@@ -765,9 +765,9 @@ a command that can be executed as an action when you run ``manage.py``::
765 765
                 __init__.py
766 766
                 explode.py
767 767
         views.py
768  
-        
  768
+
769 769
 In this example, the ``explode`` command will be made available to any project
770  
-that includes the ``fancy_blog`` application in ``settings.INSTALLED_APPS``.
  770
+that includes the ``blog`` application in ``settings.INSTALLED_APPS``.
771 771
 
772 772
 The ``explode.py`` module has only one requirement -- it must define a class
773 773
 called ``Command`` that extends ``django.core.management.base.BaseCommand``.
10  docs/model-api.txt
@@ -384,7 +384,7 @@ The admin represents this as an ``<input type="text">`` (a single-line input).
384 384
 ``IPAddressField``
385 385
 ~~~~~~~~~~~~~~~~~~
386 386
 
387  
-An IP address, in string format (i.e. "24.124.1.30").
  387
+An IP address, in string format (e.g. "192.0.2.30").
388 388
 
389 389
 The admin represents this as an ``<input type="text">`` (a single-line input).
390 390
 
@@ -952,10 +952,10 @@ the relationship should work. All are optional:
952 952
     ``limit_choices_to``     See the description under ``ForeignKey`` above.
953 953
 
954 954
     ``symmetrical``          Only used in the definition of ManyToManyFields on self.
955  
-                             Consider the following model:
  955
+                             Consider the following model::
956 956
 
957  
-                             class Person(models.Model):
958  
-                                 friends = models.ManyToManyField("self")
  957
+                                 class Person(models.Model):
  958
+                                     friends = models.ManyToManyField("self")
959 959
 
960 960
                              When Django processes this model, it identifies that it has
961 961
                              a ``ManyToManyField`` on itself, and as a result, it
@@ -1872,7 +1872,7 @@ more simply as::
1872 1872
 
1873 1873
 If you define a ``__unicode__()`` method on your model and not a ``__str__()``
1874 1874
 method, Django will automatically provide you with a ``__str__()`` that calls
1875  
-``__unicode()__`` and then converts the result correctly to a UTF-8 encoded
  1875
+``__unicode__()`` and then converts the result correctly to a UTF-8 encoded
1876 1876
 string object. This is recommended development practice: define only
1877 1877
 ``__unicode__()`` and let Django take care of the conversion to string objects
1878 1878
 when required.
4  tests/modeltests/ordering/models.py
@@ -2,8 +2,8 @@
2 2
 6. Specifying ordering
3 3
 
4 4
 Specify default ordering for a model using the ``ordering`` attribute, which
5  
-should be a list or tuple of field names. This tells Django how to order the
6  
-results of ``get_list()`` and other similar functions.
  5
+should be a list or tuple of field names. This tells Django how to order
  6
+queryset results.
7 7
 
8 8
 If a field name in ``ordering`` starts with a hyphen, that field will be
9 9
 ordered in descending order. Otherwise, it'll be ordered in ascending order.

0 notes on commit d9a3c1b

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