Merge branch '3.4' into 4.0

* 3.4:
  Fixed more sorting issues in config options
  Removed the full config dump of FrameworkBundle

Author: javiereguiluz

reference/configuration/framework.rst

@@ -1935,170 +1935,6 @@ lock
 The default lock adapter. If not defined, the value is set to ``semaphore`` when
 available, or to ``flock`` otherwise. Store's DSN are also allowed.
 
-Full Default Configuration
---------------------------
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        framework:
-            secret:               ~
-            http_method_override: true
-            trusted_proxies:      []
-            ide:                  ~
-            test:                 ~
-            default_locale:       en
-
-            csrf_protection:
-                enabled:              false
-
-            # form configuration
-            form:
-                enabled:              false
-                csrf_protection:
-                    enabled:          true
-                    field_name:       ~
-
-            # esi configuration
-            esi:
-                enabled:              false
-
-            # fragments configuration
-            fragments:
-                enabled:              false
-                path:                 /_fragment
-
-            # profiler configuration
-            profiler:
-                enabled:              false
-                collect:              true
-                only_exceptions:      false
-                only_master_requests: false
-                dsn:                  file:%kernel.cache_dir%/profiler
-
-            # router configuration
-            router:
-                resource:             ~ # Required
-                type:                 ~
-                http_port:            80
-                https_port:           443
-
-                # * set to true to throw an exception when a parameter does not
-                #   match the requirements
-                # * set to false to disable exceptions when a parameter does not
-                #   match the requirements (and return null instead)
-                # * set to null to disable parameter checks against requirements
-                #
-                # 'true' is the preferred configuration in development mode, while
-                # 'false' or 'null' might be preferred in production
-                strict_requirements:  true
-
-            # session configuration
-            session:
-                storage_id:           session.storage.native
-                handler_id:           session.handler.native_file
-                name:                 ~
-                cookie_lifetime:      ~
-                cookie_path:          ~
-                cookie_domain:        ~
-                cookie_secure:        ~
-                cookie_httponly:      ~
-                gc_divisor:           ~
-                gc_probability:       ~
-                gc_maxlifetime:       ~
-                save_path:            '%kernel.cache_dir%/sessions'
-
-            # serializer configuration
-            serializer:
-               enabled:                   false
-               cache:                      ~
-               name_converter:             ~
-               circular_reference_handler: ~
-
-            # assets configuration
-            assets:
-                base_path:          ~
-                base_urls:          []
-                version:            ~
-                version_format:     '%%s?%%s'
-                packages:
-
-                    # Prototype
-                    name:
-                        base_path:            ~
-                        base_urls:            []
-                        version:              ~
-                        version_format:       '%%s?%%s'
-
-            # templating configuration
-            templating:
-                hinclude_default_template:  ~
-                form:
-                    resources:
-
-                        # Default:
-                        - FrameworkBundle:Form
-                cache:                ~
-                engines:              # Required
-
-                    # Example:
-                    - twig
-                loaders:              []
-
-            # translator configuration
-            translator:
-                enabled:              false
-                fallbacks:            [en]
-                logging:              "%kernel.debug%"
-                paths:                []
-
-            # validation configuration
-            validation:
-                enabled:              false
-                cache:                ~
-                enable_annotations:   false
-                translation_domain:   validators
-                mapping:
-                    paths:            []
-
-            # annotation configuration
-            annotations:
-                cache:                file
-                file_cache_dir:       '%kernel.cache_dir%/annotations'
-                debug:                '%kernel.debug%'
-
-            # PHP errors handling configuration
-            php_errors:
-                log:                  false
-                throw:                '%kernel.debug%'
-
-            # cache configuration
-            cache:
-                app: cache.adapter.filesystem
-                system: cache.adapter.system
-                directory: '%kernel.cache_dir%/pools'
-                default_doctrine_provider: ~
-                default_psr6_provider: ~
-                default_redis_provider: 'redis://localhost'
-                default_memcached_provider: 'memcached://localhost'
-                pools:
-                    # Prototype
-                    name:
-                        adapter: cache.app
-                        public: false
-                        default_lifetime: ~
-                        provider: ~
-                        clearer: ~
-
-            # lock configuration
-            lock:
-                invoice: 'redis://localhost'
-                report: semaphore
-            # lock: ~
-            # lock: 'flock'
-            # lock: ['semaphore', 'redis://localhost']
-
 .. _`HTTP Host header attacks`: http://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
 .. _`Security Advisory Blog post`: https://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning
 .. _`Doctrine Cache`: http://docs.doctrine-project.org/projects/doctrine-common/en/latest/reference/caching.html

reference/configuration/swiftmailer.rst

@@ -29,8 +29,8 @@ Configuration
 
 * `antiflood`_
 
-  * `threshold`_
   * `sleep`_
+  * `threshold`_
 
 * `auth_mode`_
 * `command`_
@@ -47,8 +47,8 @@ Configuration
 * `source_ip`_
 * `spool`_
 
-  * `type`_
   * `path`_
+  * `type`_
 
 * `timeout`_
 * `transport`_