From 6ea9d8f17df485c064d83ab2b3e6cebf69900d3b Mon Sep 17 00:00:00 2001 From: Philipp Rieber Date: Sun, 24 Nov 2013 06:39:33 +0100 Subject: [PATCH] [Docs] Fix typos --- doc/installation.rst | 2 +- doc/tags/extends.rst | 2 +- doc/tags/from.rst | 2 +- doc/tags/include.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index a8ef6f7..278ef61 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -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. diff --git a/doc/tags/extends.rst b/doc/tags/extends.rst index f995a5d..d962a30 100644 --- a/doc/tags/extends.rst +++ b/doc/tags/extends.rst @@ -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 diff --git a/doc/tags/from.rst b/doc/tags/from.rst index 5337a23..39334fd 100644 --- a/doc/tags/from.rst +++ b/doc/tags/from.rst @@ -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. diff --git a/doc/tags/include.rst b/doc/tags/include.rst index 10b262d..da18dc6 100644 --- a/doc/tags/include.rst +++ b/doc/tags/include.rst @@ -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 -- 1.7.2.5