Merge pull request cakephp#808 from bcrowe/hotfix-master

Capitalize AJAX acronym
kylejohnson · Oct 16, 2013 · bfd6101 · bfd6101
2 parents 76e7823 + a2abc04
commit bfd6101
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 25 deletions.
diff --git a/en/controllers/request-response.rst b/en/controllers/request-response.rst
@@ -224,7 +224,7 @@ Since many of the features ``CakeRequest`` offers used to be the realm of
 still fits into the picture.  For 2.0, :php:class:`RequestHandlerComponent`
 acts as a sugar daddy.  Providing a layer of sugar on top of the utility
 `CakeRequest` affords. Sugar like switching layout and views based on content
-types or ajax is the domain of :php:class:`RequestHandlerComponent`.
+types or AJAX is the domain of :php:class:`RequestHandlerComponent`.
 This separation of utility and sugar between the two classes lets you
 more easily pick and choose what you want and what you need.
 

diff --git a/en/core-libraries/components/authentication.rst b/en/core-libraries/components/authentication.rst
@@ -282,7 +282,7 @@ order in which you specify the authenticate object in `AuthComponent::$authentic
 property matters.
 
 If authenticator returns null, `AuthComponent` redirects user to login action.
-If it's an ajax request and `AuthComponent::$ajaxLogin` is specified that element
+If it's an AJAX request and `AuthComponent::$ajaxLogin` is specified that element
 is rendered else a 403 http status code is returned.
 
 .. note::
@@ -765,7 +765,7 @@ and authentication mechanics in CakePHP.
 
 .. php:attr:: ajaxLogin
 
-    The name of an optional view element to render when an Ajax request is made
+    The name of an optional view element to render when an AJAX request is made
     with an invalid or expired session.
 
 .. php:attr:: allowedActions

diff --git a/en/core-libraries/components/pagination.rst b/en/core-libraries/components/pagination.rst
@@ -324,7 +324,7 @@ block and take appropriate action when a `NotFoundException` is caught::
 AJAX Pagination
 ===============
 
-It's very easy to incorporate Ajax functionality into pagination.
+It's very easy to incorporate AJAX functionality into pagination.
 Using the :php:class:`JsHelper` and :php:class:`RequestHandlerComponent` you can
 easily add Ajax pagination to your application.  See :ref:`ajax-pagination` for
 more information.

diff --git a/en/core-libraries/components/request-handling.rst b/en/core-libraries/components/request-handling.rst
@@ -6,11 +6,11 @@ Request Handling
 The Request Handler component is used in CakePHP to obtain
 additional information about the HTTP requests that are made to
 your applications. You can use it to inform your controllers about
-Ajax as well as gain additional insight into content types that the
+AJAX as well as gain additional insight into content types that the
 client accepts and automatically changes to the appropriate layout
 when file extensions are enabled.
 
-By default RequestHandler will automatically detect Ajax requests
+By default RequestHandler will automatically detect AJAX requests
 based on the HTTP-X-Requested-With header that many javascript
 libraries use. When used in conjunction with
 :php:meth:`Router::parseExtensions()` RequestHandler will automatically switch
@@ -113,9 +113,9 @@ Other request 'type' detection methods include:
 
 All of the above request detection methods can be used in a similar
 fashion to filter functionality intended for specific content
-types. For example when responding to Ajax requests, you often will
+types. For example when responding to AJAX requests, you often will
 want to disable browser caching, and change the debug level.
-However, you want to allow caching for non-ajax requests. The
+However, you want to allow caching for non-AJAX requests. The
 following would accomplish that::
 
         if ($this->request->is('ajax')) {
@@ -130,7 +130,7 @@ Obtaining Additional Client Information
 
 .. php:method:: getAjaxVersion()
 
-    Gets Prototype version if call is Ajax, otherwise empty string. The
+    Gets Prototype version if call is AJAX, otherwise empty string. The
     Prototype library sets a special "Prototype version" HTTP header.
 
 Automatically decoding request data

diff --git a/en/core-libraries/components/security-component.rst b/en/core-libraries/components/security-component.rst
@@ -321,7 +321,7 @@ one-use tokens.
 Disabling Security Component For Specific Actions
 =================================================
 
-There may be cases where you want to disable all security checks for an action (ex. ajax request).
+There may be cases where you want to disable all security checks for an action (ex. AJAX requests).
 You may "unlock" these actions by listing them in ``$this->Security->unlockedActions`` in your
 ``beforeFilter``.
 

diff --git a/en/core-libraries/helpers/js.rst b/en/core-libraries/helpers/js.rst
@@ -731,17 +731,17 @@ CakePHP core. Whenever you see separate lists for ``Options`` and
 
 .. _ajax-pagination:
 
-Ajax Pagination
+AJAX Pagination
 ===============
 
-Much like Ajax Pagination in 1.2, you can use the JsHelper to
-handle the creation of Ajax pagination links instead of plain HTML
+Much like AJAX Pagination in 1.2, you can use the JsHelper to
+handle the creation of AJAX pagination links instead of plain HTML
 links.
 
-Making Ajax Links
+Making AJAX Links
 -----------------
 
-Before you can create ajax links you must include the JavaScript
+Before you can create AJAX links you must include the JavaScript
 library that matches the adapter you are using with ``JsHelper``.
 By default the ``JsHelper`` uses jQuery. So in your layout include
 jQuery (or whichever library you are using). Also make sure to
@@ -783,7 +783,7 @@ bottom of your view file. Be sure to include::
 
     echo $this->Js->writeBuffer();
 
-If you omit this you will **not** be able to chain ajax pagination
+If you omit this you will **not** be able to chain AJAX pagination
 links. When you write the buffer, it is also cleared, so you don't
 have worry about the same JavaScript being output twice.
 

diff --git a/en/core-libraries/helpers/paginator.rst b/en/core-libraries/helpers/paginator.rst
@@ -382,17 +382,17 @@ named parameters to be converted::
 Configuring the PaginatorHelper to use a javascript helper
 ----------------------------------------------------------
 
-By default the ``PaginatorHelper`` uses :php:class:`JsHelper` to do ajax
+By default the ``PaginatorHelper`` uses :php:class:`JsHelper` to do AJAX
 features. However, if you don't want that and want to use a custom helper
-for ajax links, you can do so by changing the ``$helpers`` array in your controller.
+for AJAX links, you can do so by changing the ``$helpers`` array in your controller.
 After running ``paginate()`` do the following::
 
     // In your controller action.
     $this->set('posts', $this->paginate());
     $this->helpers['Paginator'] = array('ajax' => 'CustomJs');
 
 Will change the ``PaginatorHelper`` to use the ``CustomJs`` for
-ajax operations. You could also set the 'ajax' key to be any
+AJAX operations. You could also set the 'ajax' key to be any
 helper, as long as that class implements a ``link()`` method that
 behaves like :php:meth:`HtmlHelper::link()`
 
@@ -480,7 +480,7 @@ Other Methods
     Accepted keys for ``$options``:
 
     * ``update`` The Id of the DOM element you wish to update. Creates
-      Ajax enabled links.
+      AJAX enabled links.
     * ``escape`` Whether you want the contents html entity encoded,
       defaults to true.
     * ``model`` The model to use, defaults to

diff --git a/en/getting-started/cakephp-structure.rst b/en/getting-started/cakephp-structure.rst
@@ -95,7 +95,7 @@ View Extensions ("Helpers")
 A Helper is a class that aids in view logic. Much like a component
 used among controllers, helpers allow presentational logic to be
 accessed and shared between views. One of the core helpers,
-JsHelper, makes Ajax requests within views much easier and comes with support for jQuery (default), Prototype and Mootools.
+JsHelper, makes AJAX requests within views much easier and comes with support for jQuery (default), Prototype and Mootools.
 
 Most applications have pieces of view code that are used
 repeatedly. CakePHP facilitates view code reuse with layouts and

diff --git a/en/tutorials-and-examples/blog/part-two.rst b/en/tutorials-and-examples/blog/part-two.rst
@@ -181,7 +181,7 @@ Hopefully this should look somewhat simple.
 You might have noticed the use of an object called ``$this->Html``.
 This is an instance of the CakePHP :php:class:`HtmlHelper` class. CakePHP
 comes with a set of view helpers that make things like linking,
-form output, JavaScript and Ajax a snap. You can learn more about
+form output, JavaScript and AJAX a snap. You can learn more about
 how to use them in :doc:`/views/helpers`, but
 what's important to note here is that the ``link()`` method will
 generate an HTML link with the given title (the first parameter)

diff --git a/en/views.rst b/en/views.rst
@@ -406,8 +406,8 @@ using something like::
 
 CakePHP features two core layouts (besides CakePHP's default
 layout) you can use in your own application: 'ajax' and 'flash'.
-The Ajax layout is handy for crafting Ajax responses - it's an
-empty layout (most ajax calls only require a bit of markup in
+The Ajax layout is handy for crafting AJAX responses - it's an
+empty layout (most AJAX calls only require a bit of markup in
 return, rather than a fully-rendered interface). The flash layout
 is used for messages shown by :php:meth:`Controller::flash()` method.
 

diff --git a/en/views/helpers.rst b/en/views/helpers.rst
@@ -10,7 +10,7 @@ tasks CakePHP's core helpers can help you accomplish.
 
 CakePHP features a number of helpers that aid in view creation.
 They assist in creating well-formed markup (including forms), aid
-in formatting text, times and numbers, and can even speed up Ajax
+in formatting text, times and numbers, and can even speed up AJAX
 functionality. For more information on the helpers included in CakePHP,
 check out the chapter for each helper: