From c3f48762fceea5cf3049c12035acc9a2211a0d5c Mon Sep 17 00:00:00 2001
From: Justin Bronn <jbronn@gmail.com>
Date: Sat, 10 May 2008 16:18:22 +0000
Subject: [PATCH] gis: Merged revisions 7514,7520-7521 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/views/decorators.py | 2 +-
 django/db/backends/oracle/query.py       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
index b9fd9ab900..cedb1f9cfd 100644
--- a/django/contrib/admin/views/decorators.py
+++ b/django/contrib/admin/views/decorators.py
@@ -29,7 +29,7 @@ def _display_login_form(request, error_message=''):
         post_data = _encode_post_data({})
     return render_to_response('admin/login.html', {
         'title': _('Log in'),
-        'app_path': mark_safe(request.path),
+        'app_path': request.path,
         'post_data': post_data,
         'error_message': error_message
     }, context_instance=template.RequestContext(request))
diff --git a/django/db/backends/oracle/query.py b/django/db/backends/oracle/query.py
index 033ffe8533..7e50c7b5db 100644
--- a/django/db/backends/oracle/query.py
+++ b/django/db/backends/oracle/query.py
@@ -1,6 +1,6 @@
 """
-Custom Query class for this backend (a derivative of
-django.db.models.sql.query.Query).
+Custom Query class for Oracle.
+Derives from: django.db.models.sql.query.Query
 """
 
 import datetime
@@ -12,8 +12,8 @@ _classes = {}
 
 def query_class(QueryClass, Database):
     """
-    Returns a custom djang.db.models.sql.query.Query subclass that is
-    appropraite for Oracle.
+    Returns a custom django.db.models.sql.query.Query subclass that is
+    appropriate for Oracle.
 
     The 'Database' module (cx_Oracle) is passed in here so that all the setup
     required to import it only needs to be done by the calling module.