Feb 24, 2015 · Jan 16, 2015 · Jan 16, 2015 · Feb 16, 2015 · Feb 16, 2015 · Feb 24, 2015
diff --git a/book/controller.rst b/book/controller.rst

 This controller is pretty straightforward:

 * *line 4*: Symfony takes advantage of PHP 5.3 namespace functionality to
 * *line 4*: Symfony takes advantage of PHP's namespace functionality to
  namespace the entire controller class. The ``use`` keyword imports the
  ``Response`` class, which the controller must return.

    throw new \Exception('Something went wrong!');

 In every case, an error page is shown to the end user and a full debug
 error page is shown to the developer (i.e. when you're using ``app_dev.php`` -
 error page is shown to the developer (i.e. when you're using ``app_dev.php`` -
 see :ref:`page-creation-environments`).

 You'll want to customize the error page your user sees. To do that, see the
diff --git a/cookbook/bundles/best_practices.rst b/cookbook/bundles/best_practices.rst
 -----------

 A bundle is also a PHP namespace. The namespace must follow the technical
 interoperability `standards`_ for PHP 5.3 namespaces and class names: it
 starts with a vendor segment, followed by zero or more category segments, and
 it ends with the namespace short name, which must end with a ``Bundle``
 suffix.
 interoperability `standards`_ for PHP namespaces and class names: it starts
 with a vendor segment, followed by zero or more category segments, and it ends
 with the namespace short name, which must end with a ``Bundle`` suffix.

 A namespace becomes a bundle as soon as you add a bundle class to it. The
 bundle class name must follow these simple rules:
diff --git a/cookbook/logging/monolog.rst b/cookbook/logging/monolog.rst
 How to Use Monolog to Write Logs
 ================================

 Monolog_ is a logging library for PHP5.3used by Symfony. It is
 inspired by thePython LogBook library.
 Monolog_ is a logging library for PHP used by Symfony. It is inspired by the
 Python LogBook library.

 Usage
 -----
Original file line number	Diff line number	Diff line change
Expand Up		@@ -116,7 +116,7 @@ Controllers are also called actions.

		This controller is pretty straightforward:

		* line 4: Symfony takes advantage of PHP 5.3 namespace functionality to
		* line 4: Symfony takes advantage of PHP's namespace functionality to
		namespace the entire controller class. The ``use`` keyword imports the
		``Response`` class, which the controller must return.

Expand DownExpand Up		@@ -556,7 +556,7 @@ Symfony will automatically return a 500 HTTP response code.
		throw new \Exception('Something went wrong!');

		In every case, an error page is shown to the end user and a full debug
		error page is shown to the developer (i.e. when you're using ``app_dev.php`` -
		error page is shown to the developer (i.e. when you're using ``app_dev.php`` -
		see :ref:`page-creation-environments`).

		You'll want to customize the error page your user sees. To do that, see the
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,10 +29,9 @@ Bundle Name
		-----------

		A bundle is also a PHP namespace. The namespace must follow the technical
		interoperability `standards`_ for PHP 5.3 namespaces and class names: it
		starts with a vendor segment, followed by zero or more category segments, and
		it ends with the namespace short name, which must end with a ``Bundle``
		suffix.
		interoperability `standards`_ for PHP namespaces and class names: it starts
		with a vendor segment, followed by zero or more category segments, and it ends
Copy link Member xabbuhJan 16, 2015 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I think you can also remove the comma in front of the "and". Copy link MemberAuthor wouterjFeb 16, 2015 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I'm not entirely sure about this one. I think it's valid here to difference that this list is not "A, B or C", but instead "A, B or C, and D". Copy link Member xabbuhFeb 16, 2015 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Let's see what@weaverryan thinks. Copy link Member weaverryanFeb 24, 2015 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. my "gut feeling" is that I agree with Wouter - it helps give the sentence some separation/pause. Is "gut feeling" good enough? ;) Copy link Member xabbuhFeb 24, 2015 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. fair enough :)
		with the namespace short name, which must end with a ``Bundle`` suffix.

		A namespace becomes a bundle as soon as you add a bundle class to it. The
		bundle class name must follow these simple rules:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,8 +4,8 @@
		How to Use Monolog to Write Logs
		================================

		Monolog_ is a logging library for PHP5.3used by Symfony. It is
		inspired by thePython LogBook library.
		Monolog_ is a logging library for PHP used by Symfony. It is inspired by the
		Python LogBook library.

		Usage
		-----
Expand Down