Merge branch 'master' of git://github.com/n8v/symfony-docs into n8v-master

Author: weaverryan

book/templating.rst

@@ -1089,7 +1089,24 @@ but can return any other format based on the format requested by the user.
 The request format is most often managed by the routing, where a route can
 be configured so that ``/contact`` sets the request format to ``html`` while
 ``/contact.xml`` sets the format to ``xml``. For more information, see the
-:doc:`Routing</book/routing>` chapter.
+:ref:`Advanced Example in the Routing chapter <advanced-routing-example>`.
+
+To create links that include the format parameter, include a ``_format``
+key in the parameter hash:
+
+.. configuration-block::
+
+ .. code-block:: html+jinja
+
+ <a href="{{ path('article_show', {'id':123, '_format':pdf}) }}">
+ PDF Version</a>
+
+ .. code-block:: php
+
+ <a href="<?php echo $view['router']->generate('article_show', 
+ array('id' => 123, '_format' => 'pdf',) ?>">PDF Version</a>
+
+
 
 Final Thoughts
 --------------

contributing/code/patches.rst

@@ -106,8 +106,8 @@ while to finish your changes):
  $ git checkout BRANCH_NAME
  $ git rebase master
 
-When doing the `rebase` command, you might have to fix merge conflicts. `git
-st` gives you the *unmerged* files. Resolve all conflicts, then continue the
+When doing the ``rebase`` command, you might have to fix merge conflicts. ``git
+status`` gives you the *unmerged* files. Resolve all conflicts, then continue the
 rebase:
 
 .. code-block:: bash

glossary.rst

@@ -53,7 +53,8 @@ Glossary
  an application. Instead of creating services directly, the developer
  *trains* the service container (via configuration) on how to create
  the services. The service container takes care of lazily instantiating
- and injecting dependent services.
+ and injecting dependent services. See :doc:`/book/service_container` 
+ chapter.
 
  HTTP Specification
  The *Http Specification* is a document that describes the Hypertext
@@ -71,6 +72,53 @@ Glossary
  to have a ``dev`` environment built for debugging and a ``prod`` environment
  that's optimized for speed.
 
+ Vendor
+ A *vendor* is a supplier of PHP libraries and bundles including Symfony2
+ itself. Despite the usual commercial connotations of the word, vendors
+ in Symfony often (even usually) include free software. Any library you
+ add to your Symfony2 project should go in the ``vendor`` directory. See
+ :ref:`The Architecture: Using Vendors <using-vendors>`.
+
+ Acme
+ *Acme* is a sample company name used in Symfony demos and
+ documentation. For example, it's used as a namespace where you would
+ normally use your own company's name. See 
+ `Acme Corporation at Wikipedia`_.
+
+ Action
+ An *action* is controller code that executes for a given
+ route. Synonomous with *controller*, but most *controller* PHP classes
+ include several *actions*. See the 
+ :doc:`Controller Chapter </book/controller>`.
+
+ Asset
+ An *asset* is any non-executable, static component of a web application,
+ including CSS, js, images and video. Assets may be placed directly in
+ the project's ``web`` directory, or published from a :term:`Bundle` to the web
+ directory using the ``assets:install`` console task.
+
+ Kernel
+ The *Kernel* is the core of Symfony2. The Kernel object handles HTTP
+ requests using all the bundles and libraries registered to it. See
+ :ref:`The Architecture: The Application Directory <the-app-dir>` and the
+ :doc:`book/internals/kernel` chapter.
+
+ Firewall
+ In Symfony2, a *Firewall* doesn't have to do with networking. Instead,
+ it defines the authentication mechanisms, either for the whole
+ application or for just a part of it. See the
+ :doc:`book/security/overview` chapters.
+
+ YAML 
+ *YAML* is a recursive acronym for "YAML Ain't a Markup Language". It's a
+ lightweight, humane data serialization language used extensively in
+ Symfony2's configuration files. See the :doc:`reference/YAML` reference
+ chapter.
+
+
+
+
 .. _`service-oriented architecture`: http://wikipedia.org/wiki/Service-oriented_architecture
 .. _`HTTP Wikipedia`: http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol
 .. _`HTTP 1.1 RFC`: http://www.w3.org/Protocols/rfc2616/rfc2616.html
+.. _`Acme Corporation at Wikipedia`: http://en.wikipedia.org/wiki/Acme_Corporation

quick_tour/the_architecture.rst

@@ -41,6 +41,8 @@ framework and registers the autoloader (see below).
 Like any front controller, ``app.php`` uses a Kernel Class, ``AppKernel``, to
 bootstrap the application.
 
+.. _the-app-dir:
+
 The Application Directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -264,6 +266,8 @@ instance.
 Do you understand now why Symfony2 is so flexible? Share your bundles between
 applications, store them locally or globally, your choice.
 
+.. _using-vendors:
+
 Using Vendors
 -------------
 
@@ -321,4 +325,4 @@ topics now? Look no further - go to the official :doc:`/book/index` and pick
 any topic you want.
 
 .. _standards: http://groups.google.com/group/php-standards/web/psr-0-final-proposal
-.. _convention: http://pear.php.net/
+.. _convention: http://pear.php.net/