Merge branch 'master' into patch-2

Author: dobooth

src/guides/v2.3/coding-standards/docblock-standard-general.md

@@ -797,8 +797,8 @@ For example, padding for visual alignment can be done in two ways:
 /**
  * ...
  *
- * @param string   $parentId
- * @param string   $childId
+ * @param string $parentId
+ * @param string $childId
  * @param int|null $position
  * @return int
  * @see _insertChild() for position explanation

src/guides/v2.3/extension-dev-guide/cli-cmds/cli-howto.md

@@ -92,17 +92,14 @@ Following is a summary of the process:
             */
            protected function configure()
            {
-               $options = [
-                    new InputOption(
-                        self::NAME,
-                        null,
-                        InputOption::VALUE_REQUIRED,
-                        'Name'
-                    )
-               ];
                $this->setName('my:first:command');
                $this->setDescription('This is my first console command.');
-               $this->setDefinition($options);
+               $this->addOption(
+                   self::NAME,
+                   null,
+                   InputOption::VALUE_REQUIRED,
+                   'Name'
+               );
 
                parent::configure();
            }