Merge pull request #315 from MichalBryxi/patch-2

jenweber · web-flow · commit 27c5b7d0b77b · 2024-01-28T19:39:08.000-05:00
Describe .ember-cli in home directory
diff --git a/guides/appendix/configuration.md b/guides/appendix/configuration.md
@@ -1,4 +1,4 @@
-Ember CLI’s runtime is configurable via a file named `.ember-cli`. The JSON-formatted file is in project's root directory and can include any command-line options for `ember generate`, `ember serve` or `ember test`.
+Ember CLI’s runtime is configurable via a file named `.ember-cli`. The JSON-formatted file is in project's root directory and is merged with file of the same name in user's home directory (if applicable). Project level configuration has precedence. These files can include any command-line options for `ember generate`, `ember serve` or `ember test`.
 
 Command line options are passed in a dasherized form on the command line but they must be in camel cased in `.ember-cli`. For example
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-Ember CLI’s runtime is configurable via a file named `.ember-cli`. The JSON-formatted file is in project's root directory and can include any command-line options for `ember generate`, `ember serve` or `ember test`.
	`1`	+Ember CLI’s runtime is configurable via a file named `.ember-cli`. The JSON-formatted file is in project's root directory and is merged with file of the same name in user's home directory (if applicable). Project level configuration has precedence. These files can include any command-line options for `ember generate`, `ember serve` or `ember test`.
`2`	`2`
`3`	`3`	Command line options are passed in a dasherized form on the command line but they must be in camel cased in `.ember-cli`. For example
`4`	`4`