Merge branch '3.4' into 4.4

* 3.4:
  Minor update of the terminology used

Author: wouterj

service_container/3.3-di-changes.rst

@@ -194,7 +194,7 @@ each service or load them all at once with this method.
 
     Ok, but can I exclude some paths that I *know* won't contain services?
 
-Yes! The ``exclude`` key is a glob pattern that can be used to *blacklist* paths
+Yes! The ``exclude`` key is a glob pattern that can be used to *ignore* paths
 that you do *not* want to be included as services. But, since unused services are
 automatically removed from the container, ``exclude`` is not that important. The
 biggest benefit is that those paths are not *tracked* by the container, and so may