diff --git a/src/ORM/Registry/DefaultRegistry.php b/src/ORM/Registry/DefaultRegistry.php
index d5e8764bf63..602c1d2739d 100644
--- a/src/ORM/Registry/DefaultRegistry.php
+++ b/src/ORM/Registry/DefaultRegistry.php
@@ -87,7 +87,8 @@ public function config($alias = null, $options = null)
         }
         if (isset($this->_instances[$alias])) {
             throw new RuntimeException(sprintf(
-                'You cannot configure "%s", it has already been constructed.', $alias
+                'You cannot configure "%s", it has already been constructed.',
+                $alias
             ));
         }
         return $this->_config[$alias] = $options;
@@ -132,7 +133,8 @@ public function get($alias, array $options = [])
         if (isset($this->_instances[$alias])) {
             if (!empty($options) && $this->_options[$alias] !== $options) {
                 throw new RuntimeException(sprintf(
-                    'You cannot configure "%s", it already exists in the registry.', $alias
+                    'You cannot configure "%s", it already exists in the registry.',
+                    $alias
                 ));
             }
             return $this->_instances[$alias];
@@ -186,7 +188,7 @@ protected function _create(array $options)
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function exists($alias)
     {
@@ -194,7 +196,7 @@ public function exists($alias)
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function set($alias, Table $object)
     {
@@ -202,7 +204,7 @@ public function set($alias, Table $object)
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function clear()
     {
@@ -225,13 +227,13 @@ public function genericInstances()
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function remove($alias)
     {
         unset(
-            $this->_instances[$alias], 
-            $this->_config[$alias], 
+            $this->_instances[$alias],
+            $this->_config[$alias],
             $this->_fallbacked[$alias]
         );
     }
diff --git a/src/ORM/TableRegistry.php b/src/ORM/TableRegistry.php
index a027d9b8a98..4d8c5946d38 100644
--- a/src/ORM/TableRegistry.php
+++ b/src/ORM/TableRegistry.php
@@ -70,7 +70,7 @@ class TableRegistry
     /**
      * Sets and returns singleton instance of Registry.
      *
-     * @param \Cake\ORM\Registry\RegistryInterface $instance
+     * @param \Cake\ORM\Registry\RegistryInterface $instance Instance of registry to set.
      * @return \Cake\ORM\Registry\RegistryInterface
      */
     public static function instance(RegistryInterface $instance = null)
@@ -89,8 +89,8 @@ public static function instance(RegistryInterface $instance = null)
     /**
      * Proxy for static calls on a singleton.
      *
-     * @param string $name
-     * @param array $arguments
+     * @param string $name Method name.
+     * @param array $arguments Method arguments.
      * @return mixed
      */
     public static function __callStatic($name, $arguments)