Merge branch 'standards-update' of https://github.com/jvasseur/symfony-docs into 3.3

* 'standards-update' of https://github.com/jvasseur/symfony-docs:
  Update standards to match actual practices

Author: weaverryan

contributing/code/standards.rst

@@ -226,7 +226,8 @@ Service Naming Conventions
 Documentation
 -------------
 
-* Add PHPDoc blocks for all classes, methods, and functions;
+* Add PHPDoc blocks for all classes, methods, and functions, except when the
+  comments are trivial (e.g. basic getter and setter methods);
 
 * Group annotations together so that annotations of the same type immediately
   follow each other, and annotations of a different type are separated by a