summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorDave Hodder <dmh@dmh.org.uk>2015-04-30 20:39:29 +0100
committerTim Graham <timograham@gmail.com>2015-05-01 13:26:42 -0400
commit08c980d752bc7f31f146facadfec3d284c4115c6 (patch)
treeba32460d9bc0123a687f5e55aec787fdd12a541a /docs/ref
parent57202a112a966593857725071ecd652a87c157fb (diff)
Updated capitalization in the word "JavaScript" for consistency
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/admin/index.txt4
-rw-r--r--docs/ref/csrf.txt4
-rw-r--r--docs/ref/middleware.txt6
-rw-r--r--docs/ref/settings.txt2
-rw-r--r--docs/ref/templates/builtins.txt2
5 files changed, 9 insertions, 9 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 85fc4cb6ff..e620f34905 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1827,7 +1827,7 @@ definitions on forms <form-asset-paths>`.
jQuery
~~~~~~
-Django admin Javascript makes use of the `jQuery`_ library.
+Django admin JavaScript makes use of the `jQuery`_ library.
To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
(version 1.11.2) is namespaced as ``django.jQuery``. If you want to use jQuery
@@ -2673,7 +2673,7 @@ Index ``index``
Logout ``logout``
Password change ``password_change``
Password change done ``password_change_done``
-i18n javascript ``jsi18n``
+i18n JavaScript ``jsi18n``
Application index page ``app_list`` ``app_label``
Redirect to object's page ``view_on_site`` ``content_type_id``, ``object_id``
========================= ======================== ==================================
diff --git a/docs/ref/csrf.txt b/docs/ref/csrf.txt
index fbed973952..84ba372491 100644
--- a/docs/ref/csrf.txt
+++ b/docs/ref/csrf.txt
@@ -7,7 +7,7 @@ Cross Site Request Forgery protection
The CSRF middleware and template tag provides easy-to-use protection against
`Cross Site Request Forgeries`_. This type of attack occurs when a malicious
-Web site contains a link, a form button or some javascript that is intended to
+Web site contains a link, a form button or some JavaScript that is intended to
perform some action on your Web site, using the credentials of a logged-in user
who visits the malicious site in their browser. A related type of attack,
'login CSRF', where an attacking site tricks a user's browser into logging into
@@ -80,7 +80,7 @@ While the above method can be used for AJAX POST requests, it has some
inconveniences: you have to remember to pass the CSRF token in as POST data with
every POST request. For this reason, there is an alternative method: on each
XMLHttpRequest, set a custom ``X-CSRFToken`` header to the value of the CSRF
-token. This is often easier, because many javascript frameworks provide hooks
+token. This is often easier, because many JavaScript frameworks provide hooks
that allow headers to be set on every request.
As a first step, you must get the CSRF token itself. The recommended source for
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 3088350f1f..8f88b6686c 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -252,7 +252,7 @@ sites with improperly configured servers, it can also pose a security
risk.
If your site serves user-uploaded files, a malicious user could upload a
-specially-crafted file that would be interpreted as HTML or Javascript by
+specially-crafted file that would be interpreted as HTML or JavaScript by
the browser when you expected it to be something harmless.
To learn more about this header and how the browser treats it, you can
@@ -280,8 +280,8 @@ setting will be useful.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Some browsers have the ability to block content that appears to be an `XSS
-attack`_. They work by looking for Javascript content in the GET or POST
-parameters of a page. If the Javascript is replayed in the server's response,
+attack`_. They work by looking for JavaScript content in the GET or POST
+parameters of a page. If the JavaScript is replayed in the server's response,
the page is blocked from rendering and an error page is shown instead.
The `X-XSS-Protection header`_ is used to control the operation of the
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 0763799651..c87572769d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2862,7 +2862,7 @@ protected cookie data.
Turning it on makes it less trivial for an attacker to escalate a cross-site
scripting vulnerability into full hijacking of a user's session. There's not
much excuse for leaving this off, either: if your code depends on reading
-session cookies from Javascript, you're probably doing it wrong.
+session cookies from JavaScript, you're probably doing it wrong.
.. _HTTPOnly: https://www.owasp.org/index.php/HTTPOnly
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 589c220844..bfbc65b7cd 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1146,7 +1146,7 @@ verbatim
Stops the template engine from rendering the contents of this block tag.
-A common use is to allow a Javascript template layer that collides with
+A common use is to allow a JavaScript template layer that collides with
Django's syntax. For example::
{% verbatim %}