Skip to content

Commit

Permalink
[Docs] Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
bicpi committed Nov 24, 2013
1 parent f7c00d3 commit 6ea9d8f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Or manually like any other PHP extension:
For Windows:

1. Setup the build environment following the `PHP documentation`_
2. Put twig C extension source code into ``C:\php-sdk\phpdev\vcXX\x86\php-source-directory\ext\twig``
2. Put Twig's C extension source code into ``C:\php-sdk\phpdev\vcXX\x86\php-source-directory\ext\twig``
3. Use the ``configure --disable-all --enable-cli --enable-twig=shared`` command instead of step 14
4. ``nmake``
5. Copy the ``C:\php-sdk\phpdev\vcXX\x86\php-source-directory\Release_TS\php_twig.dll`` file to your PHP setup.
Expand Down
2 changes: 1 addition & 1 deletion doc/tags/extends.rst
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ How blocks work?
A block provides a way to change how a certain part of a template is rendered
but it does not interfere in any way with the logic around it.

Let's take the following example to illustrate how a block work and more
Let's take the following example to illustrate how a block works and more
importantly, how it does not work:

.. code-block:: jinja
Expand Down
2 changes: 1 addition & 1 deletion doc/tags/from.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
``from``
========

The ``from`` tags import :doc:`macro<../tags/macro>` names into the current
The ``from`` tag imports :doc:`macro<../tags/macro>` names into the current
namespace. The tag is documented in detail in the documentation for the
:doc:`import<../tags/import>` tag.

Expand Down
2 changes: 1 addition & 1 deletion doc/tags/include.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
``include``
===========

The ``include`` statement includes a template and return the rendered content
The ``include`` statement includes a template and returns the rendered content
of that file into the current namespace:

.. code-block:: jinja
Expand Down

0 comments on commit 6ea9d8f

Please sign in to comment.