From 420f19aa353ee6568c93f34dfe2e6eef24bc528d Mon Sep 17 00:00:00 2001 From: Brian Rosner Date: Mon, 23 Jun 2008 21:05:02 +0000 Subject: newforms-admin: Merged from trunk up to [7729]. git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7730 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/model-api.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/model-api.txt') diff --git a/docs/model-api.txt b/docs/model-api.txt index 314c8ea4b5..6dc2d0835a 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -648,8 +648,8 @@ Django will automatically add this field:: Thus, you don't need to set ``primary_key=True`` on any of your fields unless you want to override the default primary-key behavior. -``primary_key=True`` implies ``blank=False``, ``null=False`` and -``unique=True``. Only one primary key is allowed on an object. +``primary_key=True`` implies ``null=False`` and ``unique=True``. Only +one primary key is allowed on an object. ``unique`` ~~~~~~~~~~ -- cgit v1.3