diff --git a/doc/03-cli.md b/doc/03-cli.md
index 14b6e44a2..92d78b8d7 100644
--- a/doc/03-cli.md
+++ b/doc/03-cli.md
@@ -173,6 +173,8 @@ php composer.phar update "vendor/*"
 * **--interactive:** Interactive interface with autocompletion to select the packages to update.
 * **--root-reqs:** Restricts the update to your first degree dependencies.
 
+Specifying one of the words `mirrors`, `lock`, or `nothing` as an argument has the same effect as specifying the option `--lock`, for example `composer update mirrors` is exactly the same as `composer update --lock`.
+
 ## require
 
 The `require` command adds new packages to the `composer.json` file from
diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php
index b3fac0f47..b153c408c 100644
--- a/src/Composer/Command/ShowCommand.php
+++ b/src/Composer/Command/ShowCommand.php
@@ -155,6 +155,10 @@ EOT
 
         if ($input->getOption('self')) {
             $package = $this->getComposer()->getPackage();
+            if ($input->getOption('name-only')) {
+                $io->write($package->getName());
+                return 0;
+            }
             $repos = $installedRepo = new InstalledRepository(array(new RootPackageRepository($package)));
         } elseif ($input->getOption('platform')) {
             $repos = $installedRepo = new InstalledRepository(array($platformRepo));