Merge branch 'feature/documentation-review' into develop

Close #25
zendframework · Nov 14, 2017 · 1177ce5 · 1177ce5
2 parents 62299b6 + f26e8df
commit 1177ce5
Show file tree

Hide file tree

Showing 29 changed files with 644 additions and 532 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,10 @@
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs export-ignore
+/mkdocs.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
 /test export-ignore
-/vendor export-ignore
-.coveralls.yml export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-.php_cs export-ignore
-phpunit.xml.dist export-ignore
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 .*.sw*
 .*.un~
 nbproject
-doc/html/
+docs/html/
 tmp/
 zf-mkdoc-theme/
 clover.xml

diff --git a/doc/book/cookbook/use-with-psr-containers.md b/doc/book/cookbook/use-with-psr-containers.md
diff --git a/doc/book/cookbook/use-with-servicemanager.md b/doc/book/cookbook/use-with-servicemanager.md
diff --git a/doc/book/intro.md b/doc/book/intro.md
diff --git a/doc/book/migration.md b/doc/book/migration.md
diff --git a/doc/book/psr-11.md b/doc/book/psr-11.md
diff --git a/doc/book/quick-start.md b/doc/book/quick-start.md
diff --git a/CONDUCT.md → docs/CODE_OF_CONDUCT.md b/CONDUCT.md → docs/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
 # Contributor Code of Conduct
 
-The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+This project adheres to [The Code Manifesto](http://codemanifesto.com)
 as its guidelines for contributor interactions.
 
 ## The Code Manifesto