Merge branch '2.4'

symfony · Mar 10, 2014 · 6c7cb88 · 6c7cb88
2 parents 8eaf232 + 881477c
commit 6c7cb88
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 14 deletions.
diff --git a/book/installation.rst b/book/installation.rst
@@ -247,8 +247,8 @@ If there are any issues, correct them now before moving on.
     .. code-block:: bash
 
 		$ APACHEUSER=`ps aux | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data' | grep -v root | head -1 | cut -d\  -f1`
-		$ sudo setfacl -R -m u:"$APACHEUSER":rwX -m u:`whoami`:rwX app/cache app/logs
-		$ sudo setfacl -dR -m u:"$APACHEUSER":rwX -m u:`whoami`:rwX app/cache app/logs
+		$ sudo setfacl -Rn -m u:"$APACHEUSER":rwX -m u:`whoami`:rwX app/cache app/logs
+		$ sudo setfacl -dRn -m u:"$APACHEUSER":rwX -m u:`whoami`:rwX app/cache app/logs
 
     **3. Without using ACL**
 

diff --git a/changelog.rst b/changelog.rst
@@ -13,45 +13,42 @@ documentation.
     Do you also want to participate in the Symfony Documentation? Take a look
     at the ":doc:`/contributing/documentation/overview`" article.
 
+
 January, 2014
 -------------
 
 New Documentation
 ~~~~~~~~~~~~~~~~~
 
-No changes
+- `d52f3f8 <https://github.com/symfony/symfony-docs/commit/d52f3f8a146356e9e114474e820f8ec6ac5f2374>`_ #3454 [Security] Add host option (ghostika)
+- `6b3c424 <https://github.com/symfony/symfony-docs/commit/6b3c424034fec441a32d8305600c1c26936b8f1e>`_ #3428 Translation - Added info about JsonFileLoader added in 2.4 (singles)
 
 Fixed Documentation
 ~~~~~~~~~~~~~~~~~~~
 
-- `e385d28 <https://github.com/symfony/symfony-docs/commit/e385d28bee7c7418c8175d43befc4954a43a300c>`_ #3503 file extension correction xfliff to xliff (nixilla)
-- `7fe0de3 <https://github.com/symfony/symfony-docs/commit/7fe0de330b2d72155b6b7ec87c59f5a7e7ee4881>`_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka)
-- `8155e4c <https://github.com/symfony/symfony-docs/commit/8155e4cab70e481962a4775274a4412a4465ecdc>`_ #3473 Update proxy_examples.rst (AZielinski)
+- `fb22fa0 <https://github.com/symfony/symfony-docs/commit/fb22fa094fe7cf14e6499836f701c87de4886149>`_ #3456 remove duplicate label (xabbuh)
 - `c205bc6 <https://github.com/symfony/symfony-docs/commit/c205bc6798bac34741f2d4d91450aac75ab14b93>`_ #3468 enclose YAML string with double quotes to fix syntax highlighting (xabbuh)
 - `89963cc <https://github.com/symfony/symfony-docs/commit/89963cc246263e7e7cdecd3cad1f019ff9cb28a5>`_ #3463 Fix typos in cookbook/testing/database (ifdattic)
 - `e0a52ec <https://github.com/symfony/symfony-docs/commit/e0a52ecf0cbcf1b5aa029f323588880080f5c6f3>`_ #3460 remove confusing outdated note on interactive rebasing (xabbuh)
 - `6831b13 <https://github.com/symfony/symfony-docs/commit/6831b1337f99c26d9f04eb82990cc3b3ac128de0>`_ #3455 [Contributing][Code] fix indentation so that the text is rendered properly (xabbuh)
 - `ea5816f <https://github.com/symfony/symfony-docs/commit/ea5816f571309decd946bf30aa0b3b84fffacb9e>`_ #3433 [WIP][Reference][Form Types] Update "radio" form type (bicpi)
 - `42c80d1 <https://github.com/symfony/symfony-docs/commit/42c80d12ac760f40834afef76fd42db83d4d4a33>`_ #3448 Overridden tweak (weaverryan)
+- `bede4c3 <https://github.com/symfony/symfony-docs/commit/bede4c3a0e5d6be62d382c3ebb673b3059fbb566>`_ #3447 Fix error in namespace when use TokenInterface (joanteixi)
 - `d9d7c58 <https://github.com/symfony/symfony-docs/commit/d9d7c58ca41ae370545ae25f13857780c089f970>`_ #3444 Fix issue #3442 (ifdattic)
+- `a6ad607 <https://github.com/symfony/symfony-docs/commit/a6ad607fa9397ba680fdf49e8b74c4bd55143ea2>`_ #3441 [Expression]Change title 'Accessing Public Methods' (Pyrech)
 - `9e2e64b <https://github.com/symfony/symfony-docs/commit/9e2e64b26a355416038b632b7eec89c7c14490cb>`_ #3427 Removed code references to Symfony Standard Distribution (danielcsgomes)
+- `3c2c5fc <https://github.com/symfony/symfony-docs/commit/3c2c5fcb855c456c682fb6dcf3a4dce54f3686ee>`_ #3435 Update custom_password_authenticator.rst (boardyuk)
 - `26b8146 <https://github.com/symfony/symfony-docs/commit/26b8146188a3f8bedf2e681d40509b418c8e7ec0>`_ #3415 [#3334] the data_class option was not introduced in 2.4 (xabbuh)
 - `0b2a491 <https://github.com/symfony/symfony-docs/commit/0b2a49199752f60aa1bcc16d48f4c558160e852e>`_ #3414 add missing code-block directive (xabbuh)
 - `4988118 <https://github.com/symfony/symfony-docs/commit/4988118e127dc51d73e2518982c0a0f4ca9206f1>`_ #3432 [Reference][Form Types] Add "max_length" option in form type (nykopol)
 - `26a7b1b <https://github.com/symfony/symfony-docs/commit/26a7b1b80aa654c9293599743f9c0a38054eb4d3>`_ #3423 [Session Configuration] add clarifying notes on session save handler proxies (cordoval)
+- `f2f5e9a <https://github.com/symfony/symfony-docs/commit/f2f5e9ac94db2eaaf89c151b80d202fc29d49b59>`_ #3421 [Contributing] Cleaning the "contributing patch" page a bit (lemoinem)
 
 Minor Documentation Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- `1131247 <https://github.com/symfony/symfony-docs/commit/11312477437e5367da466727acdc89c97b8ed73a>`_ #3508 Add 'in XML' for additional clarity (ifdattic)
-- `a650b93 <https://github.com/symfony/symfony-docs/commit/a650b9364297aa5eaa5ffd3c018b3f0858d12238>`_ #3506 Nykopol overriden options (weaverryan)
-- `ab10035 <https://github.com/symfony/symfony-docs/commit/ab1003501de3e81bc48226b32b53156e2e7a573a>`_ #3505 replace Akamaï with Akamai (xabbuh)
-- `7f56c20 <https://github.com/symfony/symfony-docs/commit/7f56c201ea4cd9b1e7b7ed36ceb2046352a143f2>`_ #3501 [Security] Fix markup (tyx)
-- `80a90ba <https://github.com/symfony/symfony-docs/commit/80a90ba8b5c2eceeb2d80bb1386fb2620b8e0c6e>`_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic)
-- `e5bc4ea <https://github.com/symfony/symfony-docs/commit/e5bc4eafeab96b8b12070ce0435b8a77ee85c6c1>`_ #3498 Remove second empty data (xabbuh)
-- `d084d87 <https://github.com/symfony/symfony-docs/commit/d084d876e3ab961c92f2753c73b0a73a75ee7a8b>`_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi)
-- `3250aba <https://github.com/symfony/symfony-docs/commit/3250aba13ccf8662aa8e38cb624b3adeab0944bc>`_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic)
 - `f285d93 <https://github.com/symfony/symfony-docs/commit/f285d930377d8cbaedccc3ad46853fa72ee6439d>`_ #3451 some language tweaks (AE, third-person perspective) (xabbuh)
+- `b9bbe5d <https://github.com/symfony/symfony-docs/commit/b9bbe5d5f8cb427f1a52e839f23a0f286da1a010>`_ #3499 Fix YAML syntax highlight + remove trailing whitespace (ifdattic)
 - `2b7e0f6 <https://github.com/symfony/symfony-docs/commit/2b7e0f6f2f9982e600918f447852a6f4c60966a1>`_ #3497 Fix highlighting (WouterJ)
 - `a535ae0 <https://github.com/symfony/symfony-docs/commit/a535ae0383a2a6715021681980877b0205dc3281>`_ #3471 Fixed `````versionadded````` inconsistencies in Symfony 2.3 (danielcsgomes)
 - `f077a8e <https://github.com/symfony/symfony-docs/commit/f077a8e71c4973e7775db8c9fb548a0866d21131>`_ #3465 change wording in versionadded example to be consistent with what we use... (xabbuh)
@@ -64,3 +61,75 @@ Minor Documentation Changes
 - `7c5a914 <https://github.com/symfony/symfony-docs/commit/7c5a9141d6dd716e692b27904190225be324f332>`_ #3369 Indicate that Group Sequence Providers can use YAML (karptonite)
 - `1e0311e <https://github.com/symfony/symfony-docs/commit/1e0311ef0124fda8ad0cb07f73a3a52ce3303f2b>`_ #3416 add empty_data option where required option is used (xabbuh)
 - `2be3f52 <https://github.com/symfony/symfony-docs/commit/2be3f52cf5178606e54826e0766f31ce110ee122>`_ #3422 [Cookbook][Custom Authentication Provider] add a note of warning for when forbidding anonymous users (cordoval)
+- `e255de9 <https://github.com/symfony/symfony-docs/commit/e255de9bfec27f1f8e920f8e9efdfc8576b85229>`_ #3429 [Reference][Form Types] Document "with_minutes" time/datetime option (bicpi)
+
+February, 2014
+--------------
+
+New Documentation
+~~~~~~~~~~~~~~~~~
+
+- `9dcf467 <https://github.com/symfony/symfony-docs/commit/9dcf467b1cfb247f6acfbc892b55fd33cbe5e02b>`_ #3613 Javiereguiluz revamped quick tour (weaverryan)
+- `89c6f1d <https://github.com/symfony/symfony-docs/commit/89c6f1d8437d2c950f3a641140579b437d5346ef>`_ #3439 [Review] Added detailed Backwards Compatibility Promise text (webmozart)
+- `0029408 <https://github.com/symfony/symfony-docs/commit/0029408c86b8829c6a37b68b8be94a09f5a48eb1>`_ #3558 Created Documentation CHANGELOG (WouterJ)
+- `f6dd678 <https://github.com/symfony/symfony-docs/commit/f6dd67829ff83b9e14486902b6a285dbeb4b3e6d>`_ #3548 Update forms.rst (atmosf3ar)
+- `9676f2c <https://github.com/symfony/symfony-docs/commit/9676f2c61156e80503639762de0b339d1aeabb6d>`_ #3523 [Components][EventDispatcher] describe that the event name and the event dispatcher are passed to even... (xabbuh)
+- `5c367b4 <https://github.com/symfony/symfony-docs/commit/5c367b4dfa5c3adc8993702b1ae8f686c74419c8>`_ #3517 Fixed OptionsResolver component docs (WouterJ)
+- `527c8b6 <https://github.com/symfony/symfony-docs/commit/527c8b6d9042bc8719c5dbe2c1c68a57feeb6eb7>`_ #3496 Added a section about using named assets (vmattila)
+
+Fixed Documentation
+~~~~~~~~~~~~~~~~~~~
+
+- `adcbb5d <https://github.com/symfony/symfony-docs/commit/adcbb5de6c3b8d6ba59e619315ef13fe45318494>`_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut)
+- `5c4336a <https://github.com/symfony/symfony-docs/commit/5c4336a325ec98bc0eb7ef35baf86bcb9628e490>`_ #3570 Callback: [Validator, validate] expects validate to be static (nixilla)
+- `a21fb26 <https://github.com/symfony/symfony-docs/commit/a21fb260978eaa27b1cb94fccb0bd0af71b6df7f>`_ #3559 Remove reference to copying parameters.yml from Git cookbook (pwaring)
+- `de71a51 <https://github.com/symfony/symfony-docs/commit/de71a5143f6d30fff7e890cea250d047a63916d2>`_ #3551 [Cookbook][Dynamic Form Modification] Fix sample code (rybakit)
+- `143db2f <https://github.com/symfony/symfony-docs/commit/143db2f75caa9ef6d7e1c230d0ac9d59c17fde5f>`_ #3550 Update introduction.rst (taavit)
+- `384538b <https://github.com/symfony/symfony-docs/commit/384538bcb030c4ae6f8df06840ccd725fca28661>`_ #3549 Fixed createPropertyAccessorBuilder usage (antonbabenko)
+- `d275302 <https://github.com/symfony/symfony-docs/commit/d27530241cf75de4846fe9040bc6ce2235b924f3>`_ #3541 Update generic_event.rst (Lumbendil)
+- `819949c <https://github.com/symfony/symfony-docs/commit/819949cce72a4253ef9a4df6f7d260f83d08e5c6>`_ #3537 Add missing variable assignment (colinodell)
+- `d7e8262 <https://github.com/symfony/symfony-docs/commit/d7e8262a350b7fa40f34a89b7d3796b06c660db2>`_ #3535 fix form type name. (yositani2002)
+- `821af3b <https://github.com/symfony/symfony-docs/commit/821af3ba55c53246670a9bc62a3360ca064777d8>`_ #3493 Type fix in remove.rst (weaverryan)
+- `003230f <https://github.com/symfony/symfony-docs/commit/003230fc6c8657c9b12976789618aff30a83fce6>`_ #3530 Update form_customization.rst (dczech)
+- `a43f15a <https://github.com/symfony/symfony-docs/commit/a43f15ac376fc1bcac2c0010a1ad0d44319f984f>`_ #3519 [Book][Service Container] Fix syntax highlighting (iamdto)
+- `86e02c6 <https://github.com/symfony/symfony-docs/commit/86e02c6f04b4cdfc43707e0bb73bc7d336f50cac>`_ #3514 Fixed some small typos in code example (RobinvdVleuten)
+- `696313c <https://github.com/symfony/symfony-docs/commit/696313cf8eef0e72685f3e943d6d6d094f1157ed>`_ #3513 [Component-DI] Fixed typo (saro0h)
+- `27dcebd <https://github.com/symfony/symfony-docs/commit/27dcebd1c53cca2d8d991fa4b5060288d8f17c57>`_ #3509 Fix typo: side.bar.twig => sidebar.twig (ifdattic)
+- `0dc8c26 <https://github.com/symfony/symfony-docs/commit/0dc8c261384974d91b64391c36fa20478e5ebf78>`_ #3507 Fix a typo (missing `````) in ``:doc:`` link (ifdattic)
+- `272197b <https://github.com/symfony/symfony-docs/commit/272197be5d22e637546801f95e6c3db3e2c07f2d>`_ #3504 fix include directive so that the contents are really included (xabbuh)
+- `e385d28 <https://github.com/symfony/symfony-docs/commit/e385d28bee7c7418c8175d43befc4954a43a300c>`_ #3503 file extension correction xfliff to xliff (nixilla)
+- `6d34aa6 <https://github.com/symfony/symfony-docs/commit/6d34aa6038b8317259d2e8fffd186ad24fef5bc5>`_ #3478 Update custom_password_authenticator.rst (piotras-s)
+- `a171700 <https://github.com/symfony/symfony-docs/commit/a171700fb8d9695947bc1b16c6f61c183f296657>`_ #3477 Api key user provider should use "implements" instead of "extends" (skowi)
+- `7fe0de3 <https://github.com/symfony/symfony-docs/commit/7fe0de330b2d72155b6b7ec87c59f5a7e7ee4881>`_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka)
+- `8155e4c <https://github.com/symfony/symfony-docs/commit/8155e4cab70e481962a4775274a4412a4465ecdc>`_ #3473 Update proxy_examples.rst (AZielinski)
+
+Minor Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- `0928249 <https://github.com/symfony/symfony-docs/commit/0928249282cb29336aca665fbe9a8904ec71e994>`_ #3568 Update checkbox_compound.rst.inc (joshuaadickerson)
+- `38def3b <https://github.com/symfony/symfony-docs/commit/38def3bd2cd03208b95dfebfbe76aaf994e049ac>`_ #3567 Update checkbox_compound.rst.inc (joshuaadickerson)
+- `15d8ab8 <https://github.com/symfony/symfony-docs/commit/15d8ab892168efacb34c53b22b222ef669e90897>`_ #3553 Minimize horizontal scrolling in code blocks to improve readability (ifdattic)
+- `5120863 <https://github.com/symfony/symfony-docs/commit/512086321061d3d2d9ae53975d430f7f3d90babf>`_ #3547 Update acl.rst (iqfoundry)
+- `b7ac326 <https://github.com/symfony/symfony-docs/commit/b7ac326369845cba198f06514bbe1eaeb6002992>`_ #3557 Minimize horizontal scrolling in code block to improve readability (ifdattic)
+- `d974c77 <https://github.com/symfony/symfony-docs/commit/d974c773c9e1a9122244fe2a1aedbe32ee232490>`_ #3556 Fix PSR error (ifdattic)
+- `f4bb017 <https://github.com/symfony/symfony-docs/commit/f4bb017d99b225c2ab06490633cb9d30bc0e456c>`_ #3555 Wrap variables in {} for safer interpolation (ifdattic)
+- `5f02bca <https://github.com/symfony/symfony-docs/commit/5f02bca0959e20d54c9977d0428bd9bb1324f009>`_ #3552 Fix typos (ifdattic)
+- `6e32c47 <https://github.com/symfony/symfony-docs/commit/6e32c473b0bb04620ce3723d962c5650c56b1568>`_ #3546 Fix README: contributions should be based off 2.3 or higher (colinodell)
+- `ffa8f76 <https://github.com/symfony/symfony-docs/commit/ffa8f76d3582fe4cc78cc788f6f9c7018ebca75e>`_ #3545 Example of getting entity managers directly from the container (colinodell)
+- `6a2a55b <https://github.com/symfony/symfony-docs/commit/6a2a55b2ebf898f20081c4e627f21f700b4fee85>`_ #3579 Fix build errors (xabbuh)
+- `dce2e23 <https://github.com/symfony/symfony-docs/commit/dce2e23b4407bb7c468ba2d970981a97b4801d34>`_ #3532 Added tip for Entity Listeners (slavafomin)
+- `73adf8b <https://github.com/symfony/symfony-docs/commit/73adf8b6f3d9e55addd19363a3ce010429ce3f05>`_ #3528 Clarify service parameters usages (WouterJ)
+- `f634600 <https://github.com/symfony/symfony-docs/commit/f634600ce3dcb5fa4a18567faa67bc8e2a29dd29>`_ #3531 Remove horizontal scrolling in code block (ifdattic)
+- `9ba4fa7 <https://github.com/symfony/symfony-docs/commit/9ba4fa7d35bfc02cab66e1f7f595a39c6ddf3e2a>`_ #3527 Changes to components domcrawler (ifdattic)
+- `8973c81 <https://github.com/symfony/symfony-docs/commit/8973c812c57dca77037da16eb72f3c7c565ef73a>`_ #3526 Changes for Console component (ifdattic)
+- `6848bed <https://github.com/symfony/symfony-docs/commit/6848bed188528fb3b11d4f491aa5e3af6440ddb7>`_ #3538 Rebasing #3518 (weaverryan)
+- `c838df8 <https://github.com/symfony/symfony-docs/commit/c838df869dade91aa41a703da0485194daacf2c7>`_ #3511 [Component-DI] Removed useless else statement in code example (saro0h)
+- `1af6742 <https://github.com/symfony/symfony-docs/commit/1af67425f9653b539f898888d30b42e8e69aa5aa>`_ #3510 add empty line (lazyants)
+- `1131247 <https://github.com/symfony/symfony-docs/commit/11312477437e5367da466727acdc89c97b8ed73a>`_ #3508 Add 'in XML' for additional clarity (ifdattic)
+- `a650b93 <https://github.com/symfony/symfony-docs/commit/a650b9364297aa5eaa5ffd3c018b3f0858d12238>`_ #3506 Nykopol overriden options (weaverryan)
+- `ab10035 <https://github.com/symfony/symfony-docs/commit/ab1003501de3e81bc48226b32b53156e2e7a573a>`_ #3505 replace Akamaï with Akamai (xabbuh)
+- `7f56c20 <https://github.com/symfony/symfony-docs/commit/7f56c201ea4cd9b1e7b7ed36ceb2046352a143f2>`_ #3501 [Security] Fix markup (tyx)
+- `80a90ba <https://github.com/symfony/symfony-docs/commit/80a90ba8b5c2eceeb2d80bb1386fb2620b8e0c6e>`_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic)
+- `e5bc4ea <https://github.com/symfony/symfony-docs/commit/e5bc4eafeab96b8b12070ce0435b8a77ee85c6c1>`_ #3498 Remove second empty data (xabbuh)
+- `d084d87 <https://github.com/symfony/symfony-docs/commit/d084d876e3ab961c92f2753c73b0a73a75ee7a8b>`_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi)
+- `3250aba <https://github.com/symfony/symfony-docs/commit/3250aba13ccf8662aa8e38cb624b3adeab0944bc>`_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic)