diff --git a/docs/guide/concept-service-locator.md b/docs/guide/concept-service-locator.md index 6308618afc..fe020df211 100644 --- a/docs/guide/concept-service-locator.md +++ b/docs/guide/concept-service-locator.md @@ -128,4 +128,4 @@ Added benefit is the option for a developer to override configuration in a modul Any request for a service to be retrieved from a module will be passed on to its parent in case the module is not able to satisfy it. -Note that configuration from components in a module is never merged with configuration from a component in a parent module. The Service Locator pattern allows us to define named services but one cannot assume servicees with the same name use the same configuration parameters. +Note that configuration from components in a module is never merged with configuration from a component in a parent module. The Service Locator pattern allows us to define named services but one cannot assume services with the same name use the same configuration parameters. diff --git a/docs/guide/glossary.md b/docs/guide/glossary.md index 43623e3c1b..1c448c2466 100644 --- a/docs/guide/glossary.md +++ b/docs/guide/glossary.md @@ -40,7 +40,7 @@ Extension is a set of classes, asset bundles and configurations that adds more f ## installation -Installation is a process of preparing something to work either by following a readme file or by executing specially prepared script. In case of Yii it's setting permissions and fullfilling software requirements. +Installation is a process of preparing something to work either by following a readme file or by executing specially prepared script. In case of Yii it's setting permissions and fulfilling software requirements. # M @@ -64,4 +64,4 @@ Namespace refers to a [PHP language feature](http://php.net/manual/en/language.n ## vendor -Vendor is an organization or individual developer providing code in form of extensions, modules or libraries. \ No newline at end of file +Vendor is an organization or individual developer providing code in form of extensions, modules or libraries. diff --git a/docs/guide/output-data-providers.md b/docs/guide/output-data-providers.md index 9de89e17e4..3bb51c3267 100644 --- a/docs/guide/output-data-providers.md +++ b/docs/guide/output-data-providers.md @@ -344,7 +344,7 @@ class CsvDataProvider extends BaseDataProvider While you can build conditions for active data provider manually as described in [Filtering Data](output-data-widgets.md#filtering-data) and [Separate Filter Form](output-data-widgets.md#separate-filter-form) -sections of data widgets guide, Yii has data filters that are very useful if you need flexible filter condtions. +sections of data widgets guide, Yii has data filters that are very useful if you need flexible filter conditions. Data filters could be used as follows: ```php diff --git a/docs/guide/output-formatting.md b/docs/guide/output-formatting.md index 2d9291afd8..0e58a161e6 100644 --- a/docs/guide/output-formatting.md +++ b/docs/guide/output-formatting.md @@ -99,7 +99,7 @@ echo Yii::$app->formatter->asDate('now', 'php:Y-m-d'); // 2014-10-06 > Info: Some letters of the PHP format syntax are not supported by ICU and thus the PHP intl extension and can not be used > in Yii formatter. Most of these (`w`, `t`, `L`, `B`, `u`, `I`, `Z`) are not really useful for formatting dates but rather -> used when doing date math. `S` and `U` however may be useful. Their behavior can be achived by doing the following: +> used when doing date math. `S` and `U` however may be useful. Their behavior can be achieved by doing the following: > > - for `S`, which is the English ordinal suffix for the day of the month (e.g. st, nd, rd or th.), the following replacement can be used: > diff --git a/docs/guide/security-best-practices.md b/docs/guide/security-best-practices.md index bbd94b554d..6e12299707 100644 --- a/docs/guide/security-best-practices.md +++ b/docs/guide/security-best-practices.md @@ -2,7 +2,7 @@ Security best practices ======================= Below we'll review common security principles and describe how to avoid threats when developing applications using Yii. -Most of these priciples are not unique to Yii alone but apply to website or software development in general, +Most of these principles are not unique to Yii alone but apply to website or software development in general, so you will also find links for further reading on the general ideas behind these.