Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'docs/62' into develop
Browse files Browse the repository at this point in the history
Forward port #62
  • Loading branch information
michalbundyra committed Nov 1, 2019
2 parents f252750 + 02eea25 commit dc968b4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -512,7 +512,7 @@ tagged releases now make more sense, as plugins are installed via composer
- to act as a Composer plugin.
- to add awareness of additional configuration locations:
- `modules.config.php` (Apigility)
- `development.config.php` (zend-development-mode)
- `development.config.php` (zf-development-mode)
- `config.php` (Expressive with expressive-config-manager)
- to discover and prompt for known configuration locations when installing a
package.
Expand Down
4 changes: 2 additions & 2 deletions docs/book/index.md
Expand Up @@ -54,7 +54,7 @@ the component:
* `config/application.config.php` (vanilla ZF2 application)
* `config/modules.config.php` ([Apigility](https://apigility.org) application)
* `config/development.config.php.dist` and `config/development.config.php`
(applications using [zend-development-mode](https://github.com/zendframework/zend-development-mode))
(applications using [zf-development-mode](https://github.com/zfcampus/zf-development-mode))

Components are added at the **top** of the application's list of modules.

Expand Down Expand Up @@ -96,7 +96,7 @@ the module:
* `config/application.config.php` (vanilla ZF2 application)
* `config/modules.config.php` ([Apigility](https://apigility.org) application)
* `config/development.config.php.dist` and `config/development.config.php`
(applications using [zend-development-mode](https://github.com/zendframework/zend-development-mode))
(applications using [zf-development-mode](https://github.com/zfcampus/zf-development-mode))

Modules are added at the **bottom** of the application's list of modules.

Expand Down

0 comments on commit dc968b4

Please sign in to comment.