[Swift-commit] r8021 - trunk/docs/userguide

[tga at ci.uchicago.edu]

Author: tga
Date: 2014-07-14 15:54:30 -0500 (Mon, 14 Jul 2014)
New Revision: 8021

Modified:
   trunk/docs/userguide/configuration.new
Log:
Minor typo in docs

Modified: trunk/docs/userguide/configuration.new
===================================================================
--- trunk/docs/userguide/configuration.new	2014-07-14 20:48:01 UTC (rev 8020)
+++ trunk/docs/userguide/configuration.new	2014-07-14 20:54:30 UTC (rev 8021)
@@ -81,7 +81,7 @@
 
 If two properties with the same name are present in a configuration file, they are either
 merged or the latter one overrides the earlier one. This depends on the type of property.
-Simple values are always overriden, while objects are merged. For example:
+Simple values are always overridden, while objects are merged. For example:
 
 -----
 key: 1