Merge branch '2.8' into 3.3

wouterj · wouterj · commit 94cf481370e5 · 2017-11-12T13:01:54.000+01:00
diff --git a/bundles.rst b/bundles.rst
@@ -181,4 +181,4 @@ Learn more
 
     bundles/*
 
-_`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
+.. _`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -21,9 +21,8 @@ the middle. This way, Encoders will only deal with turning specific
 **formats** into **arrays** and vice versa. The same way, Normalizers
 will deal with turning specific **objects** into **arrays** and vice versa.
 
-Serialization is a complicated topic, and while this component may not work
-in all cases, it can be a useful tool while developing tools to serialize
-and deserialize your objects.
+Serialization is a complex topic. This component may not cover all your use cases out of the box, 
+but it can be useful for developing tools to serialize and deserialize your objects.
 
 Installation
 ------------

Original file line number	Diff line number	Diff line change
`@@ -181,4 +181,4 @@ Learn more`
`181`	`181`
`182`	`182`	`bundles/*`
`183`	`183`
`184`		-_`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
	`184`	+.. _`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories