updated doc

fabpot · fabpot · commit 0f6142bf6b87 · 2010-12-01T10:07:58.000+01:00
diff --git a/guides/bundles/best_practices.rst b/guides/bundles/best_practices.rst
@@ -24,11 +24,6 @@ A bundle is also a PHP namespace, composed of several segments:
   bundles;
 * The **bundle name**.
 
-.. caution::
-
-    The vendor namespace and the category namespaces are only possible as of
-    Symfony2 PR3.
-
 The bundle name must follow these simple rules:
 
 * Use only alphanumeric characters and underscores;
@@ -169,9 +164,9 @@ instead.
 
 .. note::
 
-    If you have a look at :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller`
-    methods, you will see that they are only nice shortcuts to ease the
-    learning curve.
+    If you have a look at
+    :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` methods,
+    you will see that they are only nice shortcuts to ease the learning curve.
 
 Templates
 ---------
diff --git a/guides/internals/kernel.rst b/guides/internals/kernel.rst
@@ -12,7 +12,7 @@ for handling client requests. Its main goal is to "convert"
 All Symfony2 Kernels implement
 :class:`Symfony\\Component\\HttpKernel\\HttpKernelInterface`::
 
-    function handle(Request $request = null, $type = self::MASTER_REQUEST, $raw = false);
+    function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
 
 .. index::
    single: Internals; Controller Resolver
@@ -134,7 +134,7 @@ the type of the request. For instance, if a listener must only be active for
 master requests, add the following code at the beginning of your listener
 method::
 
-    if (HttpKernelInterface::MASTER_REQUEST !== $event->getParameter('request_type')) {
+    if (HttpKernelInterface::MASTER_REQUEST !== $event->get('request_type')) {
         // return immediately
         // if the event is a filter, return the filtered value instead
         return;
@@ -208,11 +208,11 @@ view sub-system.
 
 ``FrameworkBundle`` registers several listeners:
 
-* :class:`Symfony\\Component\\HttpKernel\\Profiler\\ProfilerListener`: collects
-  data for the current request;
+* :class:`Symfony\\Component\\HttpKernel\\Profiler\\ProfilerListener`:
+  collects data for the current request;
 
-* :class:`Symfony\\Bundle\\WebProfilerBundle\\WebDebugToolbarListener`: injects
-  the Web Debug Toolbar;
+* :class:`Symfony\\Bundle\\WebProfilerBundle\\WebDebugToolbarListener`:
+  injects the Web Debug Toolbar;
 
 * :class:`Symfony\\Component\\HttpKernel\\ResponseListener`: fixes the
   Response ``Content-Type``;
