Merge branch 'master' of github.com:open-cloud/xos
diff --git a/README.md b/README.md
index ab36a2c..75b07dd 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,15 @@
For a general introduction to XOS and how it is used in CORD, see
http://guide.xosproject.org. The "Developer Guide" at that URL is
-especially helpful, although it is sync'ed with the previous
-release (Burwell), which lags what's in master.
+especially helpful, although it isn't perfectly sync'ed with master.
Additional design notes, presentations, and other collateral are
also available at http://xosproject.org and http://cord.onosproject.org.
One quick way to get started is to build and run the containers in
-*containers* (see the README in that directory for more information).
+`containers/` (see the README in that directory for more information).
Another quick way to get started is to look at the collection of
-canned configurations in *xos/configurations*. The *cord*
+canned configurations in `xos/configurations/`. The `cord`
configuration in that directory corresponds to our current
-CORD development environment, and the README you'll find there
+CORD development environment, and the `README.md` you'll find there
will help you get started.
diff --git a/xos/xos_configuration/README.md b/xos/xos_configuration/README.md
index 044d7e0..b5ba51b 100644
--- a/xos/xos_configuration/README.md
+++ b/xos/xos_configuration/README.md
@@ -1,16 +1,16 @@
# Managing Configurations
-XOS comes with several pre-configured envirnments. The main available configurations are:
+XOS comes with several pre-configured environments. The main available configurations are:
- Frontend Only
-- - CORD
-Every configurations come with different settings and different features, from GUI elements to Services.
+- CORD
+Every configuration comes with different settings and different features, from GUI elements to Services.
-__NOTE: in this folder files should not be added. They will broke the configuration system.__
+__NOTE: files should not be added by hand to this folder. They will break the configuration system.__
## Basic configuration
-A common configuration file is saved in `xos/configurations/common/xos_common_config`. In this file are stored all the common configurations for XOS.
+A common configuration file is saved in `xos/configurations/common/xos_common_config`. This file stores all the common configurations for XOS.
This is the base config:
``
@@ -66,16 +66,16 @@
### How it works
-In some environment some changes to the configuration are needed, to achieve this XOS reads configurations from a `xos/xos_configuration`.
+In some environments changes to the configuration are needed. To achieve this, XOS reads configurations from a `xos/xos_configuration`.
-All the configuration files in this folder will be parsed with [ConfigParser](https://docs.python.org/2/library/configparser.html).
+All the configuration files in this folder are parsed with [ConfigParser](https://docs.python.org/2/library/configparser.html).
-### Exetending a configuration
+### Extending a configuration
_An example is available in the CORD config_
These are the basic step to extend a configuration.
-_From now we'll use `myConf` as placeholder for the current configuration._
+_The following uses `myConf` as a placeholder for the current configuration._
**Local Config**