Skip to content

fix some issues #12631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2019
Merged

fix some issues #12631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/class_loader/class_loader.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contributing/code/conventions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...::

/**
Expand Down
2 changes: 1 addition & 1 deletion contributing/code/maintenance.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion form/type_guesser.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~
Expand Down
4 changes: 2 additions & 2 deletions reference/dic_tags.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
// ...
}
Expand Down
2 changes: 1 addition & 1 deletion translation/debug.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down