diff --git a/docs/admin.txt b/docs/admin.txt
index e4f2d7668a..7453b49a80 100644
--- a/docs/admin.txt
+++ b/docs/admin.txt
@@ -150,7 +150,7 @@ The ``field_options`` dictionary can have the following keys:
 ``filter_horizontal``
 ~~~~~~~~~~~~~~~~~~~~~
 
-Use a nifty unobtrusive Javascript "filter" interface instead of the
+Use a nifty unobtrusive JavaScript "filter" interface instead of the
 usability-challenged ``<select multiple>`` in the admin form. The value is a
 list of fields that should be displayed as a horizontal filter interface. See
 ``filter_vertical`` to use a vertical interface.
@@ -489,7 +489,7 @@ with an operator:
 ``ModelAdmin`` media definitions
 --------------------------------
 
-There are times where you would like add a bit of CSS and/or Javascript to
+There are times where you would like add a bit of CSS and/or JavaScript to
 the add/change views. This can be accomplished by using a Media inner class
 on your ``ModelAdmin``::
 
diff --git a/docs/csrf.txt b/docs/csrf.txt
index 8d56e2f5db..ba04fa67cd 100644
--- a/docs/csrf.txt
+++ b/docs/csrf.txt
@@ -64,7 +64,7 @@ a custom authentication system that manually sets cookies and the like,
 it won't help you.
 
 If your app creates HTML pages and forms in some unusual way, (e.g.
-it sends fragments of HTML in javascript document.write statements)
+it sends fragments of HTML in JavaScript document.write statements)
 you might bypass the filter that adds the hidden field to the form,
 in which case form submission will always fail.  It may still be possible
 to use the middleware, provided you can find some way to get the
diff --git a/docs/forms.txt b/docs/forms.txt
index fb148345c3..082c372aa5 100644
--- a/docs/forms.txt
+++ b/docs/forms.txt
@@ -1847,7 +1847,7 @@ This is where Django media definitions come in. Django allows you to
 associate different media files with the forms and widgets that require
 that media. For example, if you want to use a calendar to render DateFields, 
 you can define a custom Calendar widget. This widget can then be associated 
-with the CSS and Javascript that is required to render the calendar. When 
+with the CSS and JavaScript that is required to render the calendar. When 
 the Calendar widget is used on a form, Django is able to identify the CSS and
 JavaScript files that are required, and provide the list of file names
 in a form suitable for easy inclusion on your web page.
@@ -1953,7 +1953,7 @@ If this last CSS definition were to be rendered, it would become the following H
 ``js``
 ~~~~~~
 
-A tuple describing the required javascript files. See
+A tuple describing the required JavaScript files. See
 `the section on media paths`_ for details of how to specify paths to media 
 files.
 
@@ -2271,7 +2271,7 @@ an exception::
     django.forms.util.ValidationError: [u'ManagementForm data is missing or has been tampered with']
 
 It is used to keep track of how many form instances are being displayed. If
-you are adding new forms via javascript, you should increment the count fields
+you are adding new forms via JavaScript, you should increment the count fields
 in this form as well.
 
 Custom formset validation
diff --git a/docs/middleware.txt b/docs/middleware.txt
index a2853e2965..8f93d7185d 100644
--- a/docs/middleware.txt
+++ b/docs/middleware.txt
@@ -104,7 +104,7 @@ browsers).
 It is suggested to place this first in the middleware list, so that the
 compression of the response content is the last thing that happens. Will not
 compress content bodies less than 200 bytes long, when the response code is
-something other than 200, Javascript files (for IE compatibitility), or
+something other than 200, JavaScript files (for IE compatibitility), or
 responses that have the ``Content-Encoding`` header already specified.
 
 django.middleware.http.ConditionalGetMiddleware