From e51b82149ae924c364dc064469e7df32cf070671 Mon Sep 17 00:00:00 2001
From: Richard Littauer <richard.littauer@gmail.com>
Date: Tue, 2 Feb 2016 16:58:45 -0500
Subject: [PATCH 1/2] Cleaned up `ipfs id` mans

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
---
 core/commands/id.go | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/commands/id.go b/core/commands/id.go
index 82e2448d1..48adee112 100644
--- a/core/commands/id.go
+++ b/core/commands/id.go
@@ -19,13 +19,6 @@ import (
 	u "github.com/ipfs/go-ipfs/util"
 )
 
-const offlineIdErrorMessage = `ID command fails when run without daemon, we are working to fix this.
-In the meantime, please run the daemon if you want to use 'ipfs id':
-
-    ipfs daemon &
-    ipfs id QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
-`
-
 type IdOutput struct {
 	ID              string
 	PublicKey       string
@@ -38,15 +31,15 @@ var IDCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "Show IPFS Node ID info.",
 		ShortDescription: `
-Prints out information about the specified peer,
-if no peer is specified, prints out local peers info.
+Prints out information about the specified peer.
+If no peer is specified, prints out information for local peers.
 
-ipfs id supports the format option for output with the following keys:
-<id> : the peers id
-<aver>: agent version
-<pver>: protocol version
-<pubkey>: public key
-<addrs>: addresses (newline delimited)
+'ipfs id' supports the format option for output with the following keys:
+<id> : The peers id.
+<aver>: Agent version.
+<pver>: Protocol version.
+<pubkey>: Public key.
+<addrs>: Addresses (newline delimited).
 `,
 	},
 	Arguments: []cmds.Argument{

From 15d827b912c94e67152ed771e7a463cac9c4f429 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Wed, 3 Feb 2016 09:22:53 -0800
Subject: [PATCH 2/2] reword error message to confuse whyrusleeping less

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
---
 core/commands/id.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/commands/id.go b/core/commands/id.go
index 48adee112..722aec67a 100644
--- a/core/commands/id.go
+++ b/core/commands/id.go
@@ -19,6 +19,15 @@ import (
 	u "github.com/ipfs/go-ipfs/util"
 )
 
+const offlineIdErrorMessage = `'ipfs id' currently cannot query information on remote
+peers without a running daemon; we are working to fix this.
+In the meantime, if you want to query remote peers using 'ipfs id',
+please run the daemon:
+
+    ipfs daemon &
+    ipfs id QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
+`
+
 type IdOutput struct {
 	ID              string
 	PublicKey       string