Merge branch 'feature/bookdown'

Close #25

Author: weierophinney

.gitattributes

@@ -1,3 +1,4 @@
+/doc export-ignore
 /test export-ignore
 /vendor export-ignore
 .gitattributes export-ignore

.gitignore

@@ -1,3 +1,4 @@
+doc/html/
 vendor/
 composer.lock
 phpunit.xml

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.4 - TBD
+
+### Added
+
+- [#25](https://github.com/zendframework/zend-diactoros/pull/25) adds
+  documentation. Documentation is written in markdown, and can be converted to
+  HTML using [bookdown](http://bookdown.io). New features now MUST include
+  documentation for acceptance.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.0.3 - 2015-06-04
 
 ### Added

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: