diff --git a/deployment/fortrabbit.rst b/deployment/fortrabbit.rst
index 30e37468cde..b4250541f3f 100644
--- a/deployment/fortrabbit.rst
+++ b/deployment/fortrabbit.rst
@@ -151,7 +151,7 @@ Make sure this file is imported into the main config file:
             <!-- .. -->
             <framework:config>
                 <!-- .. -->
-                <framework:session save_path="null" />
+                <framework:session save-path="null" />
             </framework:config>
         </container>
 
diff --git a/http_cache/esi.rst b/http_cache/esi.rst
index b6d54eaf49d..5d881be67a2 100644
--- a/http_cache/esi.rst
+++ b/http_cache/esi.rst
@@ -242,7 +242,7 @@ that must be enabled in your configuration:
 
             <!-- ... -->
             <framework:config>
-                <framework:fragments path="/_fragment" />
+                <framework:fragment path="/_fragment" />
             </framework:config>
         </container>
 
diff --git a/logging.rst b/logging.rst
index f81bef52b3a..bfabf722e54 100644
--- a/logging.rst
+++ b/logging.rst
@@ -287,7 +287,7 @@ option of your handler to ``rotating_file``:
                     type="rotating_file"
                     path="%kernel.logs_dir%/%kernel.environment%.log"
                     level="debug"
-                    max_files="10"
+                    max-files="10"
                 />
             </monolog:config>
         </container>
diff --git a/logging/disable_microsecond_precision.rst b/logging/disable_microsecond_precision.rst
index b0f7aa36326..4858a7f0d85 100644
--- a/logging/disable_microsecond_precision.rst
+++ b/logging/disable_microsecond_precision.rst
@@ -35,7 +35,7 @@ log generation. This is recommended for systems that generate a large number of
                 http://symfony.com/schema/dic/monolog
                 http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
 
-            <monolog:config use_microseconds="false">
+            <monolog:config use-microseconds="false">
                 <monolog:handler
                     name="applog"
                     type="stream"
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index 60154002f24..bbdb77365f9 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -883,7 +883,7 @@ This option allows you to define a base path to be used for assets:
                 http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:assets base_path="/images" />
+                <framework:assets base-path="/images" />
             </framework:config>
         </container>
 
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index 58807091f3a..fe7160798bc 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -493,12 +493,12 @@ multiple firewalls, the "context" could actually be shared:
 
         <!-- app/config/security.xml -->
         <security:config>
-            <firewall name="somename" context="my_context">
+            <security:firewall name="somename" context="my_context">
                 <! ... ->
-            </firewall>
-            <firewall name="othername" context="my_context">
+            </security:firewall>
+            <security:firewall name="othername" context="my_context">
                 <! ... ->
-            </firewall>
+            </security:firewall>
         </security:config>
 
     .. code-block:: php
@@ -538,9 +538,9 @@ To use HTTP-Digest authentication you need to provide a realm and a key:
 
         <!-- app/config/security.xml -->
         <security:config>
-            <firewall name="somename">
-                <http-digest key="a_random_string" realm="secure-api" />
-            </firewall>
+            <security:firewall name="somename">
+                <security:http-digest key="a_random_string" realm="secure-api" />
+            </security:firewall>
         </security:config>
 
     .. code-block:: php
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
index 1d6a1a81150..330ff291499 100644
--- a/reference/configuration/swiftmailer.rst
+++ b/reference/configuration/swiftmailer.rst
@@ -233,9 +233,9 @@ Full Default Configuration
                 host="localhost"
                 port="false"
                 encryption=""
-                auth_mode=""
-                sender_address=""
-                disable_delivery=""
+                auth-mode=""
+                sender-address=""
+                disable-delivery=""
                 logging="%kernel.debug%"
                 >
                 <swiftmailer:spool
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
index fc9e9ee8a0c..c57a1365308 100644
--- a/reference/configuration/web_profiler.rst
+++ b/reference/configuration/web_profiler.rst
@@ -34,6 +34,6 @@ Full Default Configuration
         <web-profiler:config
             toolbar="false"
             verbose="true"
-            intercept_redirects="false"
-            excluded_ajax_paths="^/bundles|^/_wdt"
+            intercept-redirects="false"
+            excluded-ajax-paths="^/bundles|^/_wdt"
         />
diff --git a/templating/hinclude.rst b/templating/hinclude.rst
index 457b6f76c73..19d471a6fa2 100644
--- a/templating/hinclude.rst
+++ b/templating/hinclude.rst
@@ -58,7 +58,7 @@ tags:
 
                 <!-- ... -->
                 <framework:config>
-                    <framework:fragments path="/_fragment" />
+                    <framework:fragment path="/_fragment" />
                 </framework:config>
             </container>