Merge branch 'fix-typo' of https://github.com/pborreli/symfony-docs into pborreli-e342883

weaverryan · weaverryan · commit 930aa6318006 · 2011-03-19T13:59:42.000-05:00
diff --git a/book/doctrine/orm/configuration.rst b/book/doctrine/orm/configuration.rst
@@ -133,7 +133,7 @@ Doctrine uses the lightweight ``Doctrine\Common\EventManager`` class to trigger
 a number of different events which you can hook into. You can register Event
 Listeners or Subscribers by tagging the respective services with
 ``doctrine.dbal.<connection>_event_listener`` or
-``doctrine.dbal.<connection>_event_subscriber`` using the Dependency Injenction
+``doctrine.dbal.<connection>_event_subscriber`` using the Dependency Injection
 container.
 
 You have to use the name of the DBAL connection to clearly identify which
diff --git a/book/forms/fields.rst b/book/forms/fields.rst
@@ -36,7 +36,7 @@ this initial value, you can set it in the ``data`` option.
 .. note::
 
     When you set the ``data`` option, the field will also not write the the
-    domain object, because the ``property_path`` option will implicitely be
+    domain object, because the ``property_path`` option will implicitly be
     ``null``. Read :ref:`form-field-property_path` for more information.
 
 ``required``
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -578,7 +578,7 @@ Validation with the ``Last-Modified`` Header
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The ``Last-Modified`` header is the second form of validation. According
-to the HTTP sepecification, "The ``Last-Modified`` header field indicates
+to the HTTP specification, "The ``Last-Modified`` header field indicates
 the date and time at which the origin server believes the representation
 was last modified." In other words, the application decides whether or not
 the cached content has been updated based on whether or not it's been updated
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -892,7 +892,7 @@ the configuration file for the ``dev`` environment.
 The ``imports`` key is similar to a PHP ``include`` statement and guarantees
 that the main configuration file (``config.yml``) is loaded first. The rest
 of the file tweaks the default configuration for increased logging and other
-settings condusive to a development environment.
+settings conducive to a development environment.
 
 Both the ``prod`` and ``test`` environments follow the same model: each environment
 imports the base configuration file and then modifies its configuration values
diff --git a/book/templating.rst b/book/templating.rst
@@ -959,7 +959,7 @@ When building your application, you may choose to follow this method or simply
 make each page template extend the base application template directly
 (e.g. ``{% extends '::base.html.twig' %}``). The three-template model is
 a best-practice method used by vendor bundles so that the base template for
-a bundle can be easily overriden to properly extend your application's base
+a bundle can be easily overridden to properly extend your application's base
 layout.
 
 .. index::
diff --git a/contributing/code/license.rst b/contributing/code/license.rst
@@ -14,7 +14,7 @@ According to `Uncyclopedia`_:
 The License
 -----------
 
-Copyright (c) 2004-2010 Fabien Potencier
+Copyright (c) 2004-2011 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/contributing/documentation/translations.rst b/contributing/documentation/translations.rst
@@ -66,8 +66,7 @@ When the team is confident that the repository is in a consistent and stable
 state (everything is translated, or non-translated documents have been removed
 from the toctrees -- files named ``index.rst`` and ``map.rst.inc``), the team
 manager can ask that the repository is added to the list of official *master*
-repositories by sending an email to Fabien (fabien.potencier at
-symfony-project.org).
+repositories by sending an email to Fabien (fabien at symfony.com).
 
 Maintenance
 -----------
diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst
@@ -1,7 +1,7 @@
 How Symfony2 differs from symfony1
 ==================================
 
-The Symfony2 framework embodies a signficant evolution when compared with
+The Symfony2 framework embodies a significant evolution when compared with
 the first version of the framework. Fortunately, with the MVC architecture
 at its core, the skills used to master a symfony1 project continue to be
 very relevant when developing in Symfony2. Sure, ``app.yml`` is gone, but
diff --git a/glossary.rst b/glossary.rst
@@ -50,7 +50,7 @@ Glossary
 
    HTTP Specification
         The *Http Specification* is a document that describes the Hypertext
-        Transfor Protocol - a set of rules laying out the classic client-server
+        Transfer Protocol - a set of rules laying out the classic client-server
         request-response communication. The specification defines the format
         used for a request and response as well as the possible HTTP headers
         that each may have. For more information, read the `Http Uncyclopedia`_
