Merge f34c8a6 into 09caae3

zendframework · Nov 23, 2018 · b1a43a6 · b1a43a6
2 parents 09caae3 + f34c8a6
commit b1a43a6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-di",
-    "description": "Automated dependency injection and instance manager",
+    "description": "Automated dependency injection for PSR-11 containers",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf",

diff --git a/docs/book/cookbook/aot-guide.md b/docs/book/cookbook/aot-guide.md
@@ -64,10 +64,9 @@ The component installer should ask you where to inject the config provider. Pick
 option 1, which usually is `config/config.php`. If not, or you cannot use the
 component installer, you will need to add it manually by adding an entry for
 `\Zend\Di\ConfigProvider::class` within your application configuration
-example):
+example:
 
 ```php
-<?php
 // config/config.php:
 
 use Zend\ConfigAggregator\ArrayProvider;
@@ -110,8 +109,6 @@ $ mkdir src/AppAoT/src
 Next, create a config provider class in `src/AppAoT/src/ConfigProvider.php`:
 
 ```php
-<?php
-
 namespace AppAoT;
 
 class ConfigProvider
@@ -215,8 +212,6 @@ symfony/console for scripts such as these.
 Add the generator script `bin/di-generate-aot.php`:
 
 ```php
-<?php
-
 namespace AppAoT;
 
 use Psr\Container\ContainerInterface;
@@ -246,8 +241,6 @@ $generator->generate($scanner->getClassNames());
 > example demonstrating manual creation of the generator:
 >
 > ```php
-> <?php
->
 > namespace AppAoT;
 >
 > use Psr\Container\ContainerInterface;
@@ -312,8 +305,6 @@ Create the file `src/AppAoT/src/InjectorDecoratorFactory.php` with the following
 contents:
 
 ```php
-<?php
-
 namespace AppAoT;
 
 use AppAoT\Generated\GeneratedInjector;
@@ -344,8 +335,6 @@ in step 2:
 > `src/AppAoT/gen/` and use runtime wiring.
 
 ```php
-<?php
-
 namespace AppAoT;
 
 use Zend\Di\InjectorInterface;

diff --git a/docs/book/index.html b/docs/book/index.html
diff --git a/docs/book/intro.md b/docs/book/intro.md
@@ -51,7 +51,7 @@ This decision was made for several reasons:
 > implement PSR-11, especially with zend-servicemanager. You can even use
 > factories generated by zend-di for zend-servicemanager.
 
-# Dependency Injection Containers
+## Dependency Injection Containers
 
 When your code is written in such a way that all your dependencies are injected
 into consuming objects, you might find that the simple act of wiring an object
@@ -78,7 +78,7 @@ to obtain the instances of the dependencies.
 While for the simplest use cases no configuration is needed, zend-di allows
 developers to configure how to resolve dependencies for more complex use cases.
 
-# Legacy documentation
+## Legacy documentation
 
 The primary documentation covers version 3.0 and above. We also ship
 documentation covering version 2 features, starting with a chapter covering

diff --git a/docs/book/migration.md b/docs/book/migration.md
@@ -6,7 +6,7 @@ performance, stability, and predictability.
 
 This guide describes how to migrate from Version 2 to 3.
 
-# What has changed?
+## What has changed?
 
 This lists the most impacting changes and potential pitfalls when
 upgrading to `zend-di` version 3.
@@ -36,7 +36,7 @@ upgrading to `zend-di` version 3.
   in favor of the [code generator](codegen.md), which creates zend-servicemanager
   compatible factories.
 
-# Migrating from v2 to v3 with zend-mvc
+## Migrating from v2 to v3 with zend-mvc
 
 When you are using zend-mvc, you can follow these steps to upgrade:
 
@@ -51,7 +51,7 @@ When you are using zend-mvc, you can follow these steps to upgrade:
    replace them with `Zend\Di\Container\AutowireFactory`.
 5. Migrate your zend-di config to the new [configuration format](config.md).
 
-# Migrating configuration
+## Migrating configuration
 
 zend-di configuration is now expected in `$config['dependencies']['auto']`,
 where `$config` is your `config` service.

diff --git a/docs/book/v2/definitions.md b/docs/book/v2/definitions.md
@@ -141,5 +141,3 @@ want to simply define your complete class's definition with an xml, ini, or php
 file describing the structure. This class definition can be fed in via
 `Configuration` or by directly instantiating and registering the `Definition`
 with the `DefinitionList`.
-
-(@todo - example)
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,16 +1,16 @@
 docs_dir: docs/book
 site_dir: docs/html
 pages:
-    - index.md
-    - Intro: intro.md
+    - Home: index.md
+    - Introduction: intro.md
     - "Quick Start": quick-start.md
     - Reference:
         - "PSR-11 Support": psr-11.md
         - Configuration: config.md
         - "Injector": injector.md
         - "Code Generator": codegen.md
         - "v2 Documentation":
-            - Definitions: v2/definitions.md
+            - "Dependency Definitions": v2/definitions.md
             - "Instance Manager": v2/instance-manager.md
             - Configuration: v2/config.md
             - "Debugging And Complex Use Cases": v2/debugging-and-complex-use-cases.md
@@ -20,6 +20,5 @@ pages:
         - "Using AoT with Expressive and zend-servicemanager": cookbook/aot-guide.md
     - "Migration Guide": migration.md
 site_name: zend-di
-site_description: zend-di
+site_description: "Automated dependency injection for PSR-11 containers"
 repo_url: 'https://github.com/zendframework/zend-di'
-copyright: 'Copyright (c) 2005-2017 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'