diff --git a/components/class_loader/class_loader.rst b/components/class_loader/class_loader.rst index e82485c03c0..3f5f6f5ac42 100644 --- a/components/class_loader/class_loader.rst +++ b/components/class_loader/class_loader.rst @@ -26,7 +26,7 @@ is straightforward:: $loader = new ClassLoader(); - // to enable searching the include path (eg. for PEAR packages) + // to enable searching the include path (e.g. for PEAR packages) $loader->setUseIncludePath(true); // ... register namespaces and prefixes here - see below diff --git a/contributing/code/conventions.rst b/contributing/code/conventions.rst index 834cb223bfe..7099ace5db5 100644 --- a/contributing/code/conventions.rst +++ b/contributing/code/conventions.rst @@ -97,7 +97,7 @@ contain deprecated methods. A new method cannot be introduced as deprecated. -A feature is marked as deprecated by adding a ``@deprecated`` PHPdoc to +A feature is marked as deprecated by adding a ``@deprecated`` PHPDoc to relevant classes, methods, properties, ...:: /** diff --git a/contributing/code/maintenance.rst b/contributing/code/maintenance.rst index de643e98af6..854cd74b219 100644 --- a/contributing/code/maintenance.rst +++ b/contributing/code/maintenance.rst @@ -13,7 +13,7 @@ acceptable changes. .. note:: - When documentation (or phpdoc) is not in sync with the code, code behavior + When documentation (or PHPDoc) is not in sync with the code, code behavior should always be considered as being the correct one. Besides bug fixes, other minor changes can be accepted in a patch version: diff --git a/form/type_guesser.rst b/form/type_guesser.rst index 985235ecd04..17983267899 100644 --- a/form/type_guesser.rst +++ b/form/type_guesser.rst @@ -146,7 +146,7 @@ With this knowledge, you can implement the ``guessType()`` method of the } This type guesser can now guess the field type for a property if it has -PHPdoc! +PHPDoc! Guessing Field Options ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index 7a5f2017966..45ddcc9c332 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -1109,9 +1109,9 @@ required option: ``alias``, which defines the name of the extractor:: protected $prefix; /** - * Extracts translation messages from a template directory to the catalogue. + * Extracts translation messages from a template directory to the catalog. */ - public function extract($directory, MessageCatalogue $catalogue) + public function extract($directory, MessageCatalogue $catalog) { // ... } diff --git a/translation/debug.rst b/translation/debug.rst index eb0f0d38d89..816807da7f6 100644 --- a/translation/debug.rst +++ b/translation/debug.rst @@ -7,7 +7,7 @@ How to Find Missing or Unused Translation Messages ================================================== When maintaining an application or bundle, you may add or remove translation -messages and forget to update the message catalogues. The ``debug:translation`` +messages and forget to update the message catalogs. The ``debug:translation`` command helps you to find these missing or unused translation messages. Thanks to the messages extractors, the command will detect the translation