diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:31:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:31:57 -0700 |
| commit | 8ac131503ddeee5b1de8225510f9d2927e903620 (patch) | |
| tree | f02250a3e6cb8712adc02d23eb2e1b0f5dd3b3fd /ext/intl/doc/msgfmt_api.php | |
| parent | d7c943e2a1f54c445276fc77369918f33c4f6cce (diff) | |
| parent | 4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f (diff) | |
| download | php-git-8ac131503ddeee5b1de8225510f9d2927e903620.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Diffstat (limited to 'ext/intl/doc/msgfmt_api.php')
| -rw-r--r-- | ext/intl/doc/msgfmt_api.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/doc/msgfmt_api.php b/ext/intl/doc/msgfmt_api.php index e4d047b979..3df6f0de11 100644 --- a/ext/intl/doc/msgfmt_api.php +++ b/ext/intl/doc/msgfmt_api.php @@ -31,7 +31,7 @@ class MessageFormatter { /** * Format the message * @param array $args arguments to insert into the pattern string - * @return string the formatted string, or false if an error ocurred + * @return string the formatted string, or false if an error occurred */ public function format($args) {} @@ -124,7 +124,7 @@ class MessageFormatter { * Format the message * @param MessageFormatter $fmt The message formatter * @param array $args arguments to insert into the pattern string - * @return string the formatted string, or false if an error ocurred + * @return string the formatted string, or false if an error occurred */ function msgfmt_format($fmt, $args) {} |
