Merge trunk to [3216]

git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3227 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 2 deletions

diff --git a/docs/templates_python.txt b/docs/templates_python.txt
index 5e3038ebb4..2fa837e424 100644
--- a/docs/templates_python.txt
+++ b/docs/templates_python.txt
@@ -783,7 +783,7 @@ Our earlier ``current_time`` function could thus be written like this::
 
 In Python 2.4, the decorator syntax also works::
 
-    @simple_tag
+    @register.simple_tag
     def do_current_time(token):
         ...
 
@@ -844,7 +844,7 @@ loader, we'd register the tag like this::
 As always, Python 2.4 decorator syntax works as well, so we could have
 written::
 
-    @inclusion_tag('results.html')
+    @register.inclusion_tag('results.html')
     def show_results(poll):
         ...