Merge branch 'hotfix/bookdown'

Close #14
zendframework · Jun 24, 2015 · 958b60e · 958b60e
2 parents 850b7a7 + 3c63c0a
commit 958b60e
Show file tree

Hide file tree

Showing 13 changed files with 547 additions and 424 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+doc/html/
 vendor/
 composer.lock
 phpunit.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,12 @@ Versions prior to 1.0 were originally released as `phly/conduit`; please visit
 its [CHANGELOG](https://github.com/phly/conduit/blob/master/CHANGELOG.md) for
 details.
 
-## 1.0.2 - TBD
+## 1.0.2 - 2015-06-24
 
 ### Added
 
-- Nothing.
+- [#14](https://github.com/zendframework/zend-stratigility/pull/14) adds
+  [bookdown](http://bookdown.io) documentation.
 
 ### Deprecated
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -34,6 +34,15 @@ to upgrade and/or update in order to protect their applications.
 
 For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
 
+## Documentation
+
+Documentation is in [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/),
+and rendered using [bookdown](http://bookdown.io). Please read and follow the [general documentation
+guidelines](https://github.com/zendframework/documentation/blob/master/CONTRIBUTING.md) when
+providing documentation.
+
+All new features **must** include documentation before they may be accepted and merged.
+
 ## RUNNING TESTS
 
 To run tests: