Skip to content

Commit 6493eba

Browse files
committed
Merge pull request #3078 from peterkokot/patch-2
JavaScript case sensitive typos
2 parents 3c853e8 + 671c86d commit 6493eba

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

book/forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,7 @@ There's still much more to learn about the powerful world of forms, such as
16911691
how to handle
16921692
:doc:`file uploads with Doctrine </cookbook/doctrine/file_uploads>` or how
16931693
to create a form where a dynamic number of sub-forms can be added (e.g. a
1694-
todo list where you can keep adding more fields via Javascript before submitting).
1694+
todo list where you can keep adding more fields via JavaScript before submitting).
16951695
See the cookbook for these topics. Also, be sure to lean on the
16961696
:doc:`field type reference documentation </reference/forms/types>`, which
16971697
includes examples of how to use each field type and its options.

book/page_creation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ inside a bundle.
9595

9696
A bundle is nothing more than a directory that houses everything related
9797
to a specific feature, including PHP classes, configuration, and even stylesheets
98-
and Javascript files (see :ref:`page-creation-bundles`).
98+
and JavaScript files (see :ref:`page-creation-bundles`).
9999

100100
To create a bundle called ``AcmeHelloBundle`` (a play bundle that you'll
101101
build in this chapter), run the following command and follow the on-screen

book/templating.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ Asynchronous Content with hinclude.js
679679
.. versionadded:: 2.1
680680
hinclude.js support was added in Symfony 2.1
681681

682-
Controllers can be embedded asynchronously using the hinclude.js_ javascript library.
682+
Controllers can be embedded asynchronously using the hinclude.js_ JavaScript library.
683683
As the embedded content comes from another page (or controller for that matter),
684684
Symfony2 uses a version of the standard ``render`` function to configure ``hinclude``
685685
tags:
@@ -744,7 +744,7 @@ tags:
744744
'fragments' => array('path' => '/_fragment'),
745745
));
746746
747-
Default content (while loading or if javascript is disabled) can be set globally
747+
Default content (while loading or if JavaScript is disabled) can be set globally
748748
in your application configuration:
749749

750750
.. configuration-block::
@@ -974,7 +974,7 @@ correctly:
974974
Linking to Assets
975975
~~~~~~~~~~~~~~~~~
976976

977-
Templates also commonly refer to images, Javascript, stylesheets and other
977+
Templates also commonly refer to images, JavaScript, stylesheets and other
978978
assets. Of course you could hard-code the path to these assets (e.g. ``/images/logo.png``),
979979
but Symfony2 provides a more dynamic option via the ``asset`` Twig function:
980980

@@ -1007,29 +1007,29 @@ look like ``/images/logo.png?v2``. For more information, see the :ref:`ref-frame
10071007
configuration option.
10081008

10091009
.. index::
1010-
single: Templating; Including stylesheets and Javascripts
1010+
single: Templating; Including stylesheets and JavaScripts
10111011
single: Stylesheets; Including stylesheets
1012-
single: Javascript; Including Javascripts
1012+
single: JavaScript; Including JavaScripts
10131013

1014-
Including Stylesheets and Javascripts in Twig
1014+
Including Stylesheets and JavaScripts in Twig
10151015
---------------------------------------------
10161016

1017-
No site would be complete without including Javascript files and stylesheets.
1017+
No site would be complete without including JavaScript files and stylesheets.
10181018
In Symfony, the inclusion of these assets is handled elegantly by taking
10191019
advantage of Symfony's template inheritance.
10201020

10211021
.. tip::
10221022

10231023
This section will teach you the philosophy behind including stylesheet
1024-
and Javascript assets in Symfony. Symfony also packages another library,
1024+
and JavaScript assets in Symfony. Symfony also packages another library,
10251025
called Assetic, which follows this philosophy but allows you to do much
10261026
more interesting things with those assets. For more information on
10271027
using Assetic see :doc:`/cookbook/assetic/asset_management`.
10281028

10291029
Start by adding two blocks to your base template that will hold your assets:
10301030
one called ``stylesheets`` inside the ``head`` tag and another called ``javascripts``
10311031
just above the closing ``body`` tag. These blocks will contain all of the
1032-
stylesheets and Javascripts that you'll need throughout your site:
1032+
stylesheets and JavaScripts that you'll need throughout your site:
10331033

10341034
.. code-block:: html+jinja
10351035

@@ -1052,7 +1052,7 @@ stylesheets and Javascripts that you'll need throughout your site:
10521052
</html>
10531053

10541054
That's easy enough! But what if you need to include an extra stylesheet or
1055-
Javascript from a child template? For example, suppose you have a contact
1055+
JavaScript from a child template? For example, suppose you have a contact
10561056
page and you need to include a ``contact.css`` stylesheet *just* on that
10571057
page. From inside that contact page's template, do the following:
10581058

components/css_selector.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ long and unwieldy expressions.
3232

3333
Many developers -- particularly web developers -- are more comfortable
3434
using CSS selectors to find elements. As well as working in stylesheets,
35-
CSS selectors are used in Javascript with the ``querySelectorAll`` function
36-
and in popular Javascript libraries such as jQuery, Prototype and MooTools.
35+
CSS selectors are used in JavaScript with the ``querySelectorAll`` function
36+
and in popular JavaScript libraries such as jQuery, Prototype and MooTools.
3737

3838
CSS selectors are less powerful than XPath, but far easier to write, read
3939
and understand. Since they are less powerful, almost all CSS selectors can

cookbook/assetic/apply_to_option.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ How to Apply an Assetic Filter to a Specific File Extension
77
Assetic filters can be applied to individual files, groups of files or even,
88
as you'll see here, files that have a specific extension. To show you how
99
to handle each option, let's suppose that you want to use Assetic's CoffeeScript
10-
filter, which compiles CoffeeScript files into Javascript.
10+
filter, which compiles CoffeeScript files into JavaScript.
1111

1212
The main configuration is just the paths to coffee, node and node_modules.
1313
An example configuration might look like this:

cookbook/assetic/uglifyjs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
How to Minify CSS/JS Files (using UglifyJs and UglifyCss)
55
=========================================================
66

7-
`UglifyJs`_ is a javascript parser/compressor/beautifier toolkit. It can be used
8-
to combine and minify javascript assets so that they require less HTTP requests
7+
`UglifyJs`_ is a JavaScript parser/compressor/beautifier toolkit. It can be used
8+
to combine and minify JavaScript assets so that they require less HTTP requests
99
and make your site load faster. `UglifyCss`_ is a css compressor/beautifier
1010
that is very similar to UglifyJs.
1111

cookbook/assetic/yuicompressor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ the view layer, this work is done in your templates:
103103

104104
The above example assumes that you have a bundle called ``AcmeFooBundle``
105105
and your JavaScript files are in the ``Resources/public/js`` directory under
106-
your bundle. This isn't important however - you can include your Javascript
106+
your bundle. This isn't important however - you can include your JavaScript
107107
files no matter where they are.
108108

109109
With the addition of the ``yui_js`` filter to the asset tags above, you should

cookbook/controller/error_pages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ end-user, create a new template located at
6868

6969
In addition to the standard HTML error page, Symfony provides a default error
7070
page for many of the most common response formats, including JSON
71-
(``error.json.twig``), XML (``error.xml.twig``) and even Javascript
71+
(``error.json.twig``), XML (``error.xml.twig``) and even JavaScript
7272
(``error.js.twig``), to name a few. To override any of these templates, just
7373
create a new file with the same name in the
7474
``app/Resources/TwigBundle/views/Exception`` directory. This is the standard

0 commit comments

Comments
 (0)