Refactored OptionsResolver docs to have a better example
Added cookbook page about sessions directory.
Add some clarification to Quick Tour Working with Environments

Also, for the session token: identify what the "weird" hex number is, and and replace "weird" with "long" (a more apt description).
removed duplicate timestamp limitation notice
added timestamp limitation notice for datetime
Merge pull request #2674 from jbafford/i2672

Add some clarification to Quick Tour Working with Environments
fix spelling
Create error_mapping.rst.inc

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | yes
| Applies to    | 2.1+
| Fixed tickets | ~

see http://symfony.com/blog/form-goodness-in-symfony-2-1#error-mapping-fu
added some more information about the security process
include references to error_mapping in field inheritance
align table pipes
wrap lines
move versionadded to top of the file
Added namespace declaration to MainController.php.
Changed </components/yaml/introduction> to </components/yaml/format> per PR feedback.
Fixed wrong used class
Merge pull request #2693 from xabbuh/issue-2686-fixes

fix spelling
Merge pull request #2694 from docteurklein/patch-2

add error_mapping form option documentation
[#2694] Fixing some formatting issues and some minor proofreading for new error_mapping docs
Merge pull request #2696 from fabpot/security-tweaks

added some more information about the security process