Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #8911 -- Several corrections for the 1.0 porting documentation,…

… thanks arien.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit acf2600a4c1b3d6cd4b1a4166ea62d784d246442 1 parent 165b558
Gary Wilson Jr. authored September 07, 2008

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

  1. 22  docs/releases/1.0-porting-guide.txt
22  docs/releases/1.0-porting-guide.txt
@@ -42,7 +42,7 @@ Rename ``maxlength`` to ``max_length``
42 42
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
43 43
 
44 44
 Rename your ``maxlength`` argument to ``max_length`` (this was changed to be
45  
-consistant with form fields):
  45
+consistent with form fields):
46 46
 
47 47
 Replace ``__str__`` with ``__unicode__``
48 48
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -473,7 +473,7 @@ New (1.0)::
473 473
     import datetime
474 474
 
475 475
     class Article(models.Model):
476  
-        title = models.CharField(maxlength=100)
  476
+        title = models.CharField(max_length=100)
477 477
         published = models.DateField(default=datetime.datetime.now)
478 478
 
479 479
 ``DecimalField`` is new, and ``FloatField`` is now a proper float
@@ -536,7 +536,7 @@ Notes:
536 536
      this procedure for any of the standard Django models.
537 537
 
538 538
 If something goes wrong in the above process, just copy your backed up
539  
-database file over the top of the original file and start again.
  539
+database file over the original file and start again.
540 540
 
541 541
 Internationalization
542 542
 --------------------
@@ -644,10 +644,10 @@ Syndication
644 644
 ``Feed.__init__`` has changed
645 645
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
646 646
 
647  
-The ``__init__()`` parameters in the syndication framework's ``Feed`` class now
648  
-take an ``HttpRequest`` object as its second parameter, instead of the feed's
  647
+The ``__init__()`` method of the syndication framework's ``Feed`` class now
  648
+takes an ``HttpRequest`` object as its second parameter, instead of the feed's
649 649
 URL. This allows the syndication framework to work without requiring the sites
650  
-framework. This only affects code that subclass ``Feed`` and overrides the
  650
+framework. This only affects code that subclasses ``Feed`` and overrides the
651 651
 ``__init__()`` method, and code that calls ``Feed.__init__()`` directly.
652 652
 
653 653
 Data structures
@@ -656,8 +656,8 @@ Data structures
656 656
 ``SortedDictFromList`` is gone
657 657
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
658 658
 
659  
-`django.newforms.forms.SortedDictFromList`` was removed.
660  
-:class:`django.utils.datastructures.SortedDict`` can now be instantiated with
  659
+``django.newforms.forms.SortedDictFromList`` was removed.
  660
+:class:`django.utils.datastructures.SortedDict` can now be instantiated with
661 661
 a sequence of tuples.
662 662
 
663 663
 To update your code:
@@ -665,9 +665,9 @@ To update your code:
665 665
      1. Use :class:`django.utils.datastructures.SortedDict` wherever you were
666 666
         using ``django.newforms.forms.SortedDictFromList``.
667 667
 
668  
-     2. Because :meth:`django.utils.datastructures.SortedDict.copy` returns a
669  
-        deepcopy as ``SortedDictFromList`` method did, you will need to update
670  
-        your code if you were relying on a deepcopy. Do this by using
  668
+     2. Because :meth:`django.utils.datastructures.SortedDict.copy` doesn't
  669
+        return a deepcopy as ``SortedDictFromList.copy()`` did, you will need
  670
+        to update your code if you were relying on a deepcopy. Do this by using
671 671
         ``copy.deepcopy`` directly.
672 672
 
673 673
 Database backend functions

0 notes on commit acf2600

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