Sync docs from master to gh-pages

This commit is contained in:
Dave Syer
2016-05-05 18:40:46 +00:00
parent 3ee4f52456
commit 09a0b11722

View File

@@ -1624,7 +1624,7 @@ mainly in relation to the loss of metadata. The JSON is structured as
an ordered list of property sources, for example, with names that
correlate with the source. The YAML and properties forms are coalesced
into a single map, even if the origin of the values has multiple
sources, and the names of teh original source files are lost. The YAML
sources, and the names of the original source files are lost. The YAML
representation is not necessarily a faithful representation of the
YAML source in a backing repository either: it is constructed from a
list of flat property sources, and assumptions have to be made about
@@ -2040,7 +2040,7 @@ grabbing it in the bootstrap context and injecting one).</p>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-05-05 08:32:35 UTC
Last updated 2016-05-05 18:38:55 UTC
</div>
</div>
</body>