Ticket #17929: 17929.tutorial-attribute-choice_text.diff

docs/intro/tutorial01.txt

@@ -355 +355 @@
 
     class Choice(models.Model):
         poll = models.ForeignKey(Poll)
-        choice = models.CharField(max_length=200)
+        choice_text = models.CharField(max_length=200)
         votes = models.IntegerField()
 
 The code is straightforward. Each model is represented by a class that
@@ -447 +447 @@
     CREATE TABLE "polls_choice" (
         "id" serial NOT NULL PRIMARY KEY,
         "poll_id" integer NOT NULL REFERENCES "polls_poll" ("id") DEFERRABLE INITIALLY DEFERRED,
-        "choice" varchar(200) NOT NULL,
+        "choice_text" varchar(200) NOT NULL,
         "votes" integer NOT NULL
     );
     COMMIT;
@@ -598 +598 @@
     class Choice(models.Model):
         # ...
         def __unicode__(self):
-            return self.choice
+            return self.choice_text
 
 It's important to add :meth:`~django.db.models.Model.__unicode__` methods to
 your models, not only for your own sanity when dealing with the interactive
@@ -690 +690 @@
     []
 
     # Create three choices.
-    >>> p.choice_set.create(choice='Not much', votes=0)
+    >>> p.choice_set.create(choice_text='Not much', votes=0)
     <Choice: Not much>
-    >>> p.choice_set.create(choice='The sky', votes=0)
+    >>> p.choice_set.create(choice_text='The sky', votes=0)
     <Choice: The sky>
-    >>> c = p.choice_set.create(choice='Just hacking again', votes=0)
+    >>> c = p.choice_set.create(choice_text='Just hacking again', votes=0)
 
     # Choice objects have API access to their related Poll objects.
     >>> c.poll
@@ -714 +714 @@
     [<Choice: Not much>, <Choice: The sky>, <Choice: Just hacking again>]
 
     # Let's delete one of the choices. Use delete() for that.
-    >>> c = p.choice_set.filter(choice__startswith='Just hacking')
+    >>> c = p.choice_set.filter(choice_text__startswith='Just hacking')
     >>> c.delete()
 
 For more information on model relations, see :doc:`Accessing related objects

docs/intro/tutorial03.txt

@@ -399 +399 @@
     <h1>{{ poll.question }}</h1>
     <ul>
     {% for choice in poll.choice_set.all %}
-        <li>{{ choice.choice }}</li>
+        <li>{{ choice.choice_text }}</li>
     {% endfor %}
     </ul>
 

docs/intro/tutorial04.txt

@@ -22 +22 @@
     {% csrf_token %}
     {% for choice in poll.choice_set.all %}
         <input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}" />
-        <label for="choice{{ forloop.counter }}">{{ choice.choice }}</label><br />
+        <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br />
     {% endfor %}
     <input type="submit" value="Vote" />
     </form>
@@ -168 +168 @@
 
     <ul>
     {% for choice in poll.choice_set.all %}
-        <li>{{ choice.choice }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}</li>
+        <li>{{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}</li>
     {% endfor %}
     </ul>