diff --git a/main/src/main/scala/sbt/CommandStrings.scala b/main/src/main/scala/sbt/CommandStrings.scala
index af2f680af..eed77abce 100644
--- a/main/src/main/scala/sbt/CommandStrings.scala
+++ b/main/src/main/scala/sbt/CommandStrings.scala
@@ -24,11 +24,11 @@ EvalCommand + """ <expression>
 	def showHelp = Help(ShowCommand, (ShowCommand + " <key>", actBrief), actDetailed)
 	def actBrief = "Displays the result of evaluating the setting or task associated with 'key'."
 	def actDetailed =
-ShowCommand + """ <setting>
+s"""ShowCommand <setting>
 
 	Displays the value of the specified setting.
 
-""" + ShowCommand + """ <task>
+$ShowCommand <task>
 
 	Evaluates the specified task and display the value returned by the task."""
 
@@ -81,7 +81,7 @@ InspectCommand + """ <key>
 	Otherwise, the type of task ("Task" or "Input task") is displayed.
 
 	"Dependencies" shows the settings that this setting depends on.
-	
+
 	"Reverse dependencies" shows the settings that depend on this setting.
 
 	When a key is resolved to a value, it may not actually be defined in the requested scope.
@@ -91,7 +91,7 @@ InspectCommand + """ <key>
 
 	"Related" shows all of the scopes in which the key is defined.
 
-""" + 
+""" +
 InspectCommand + """ tree <key>
 
 	Displays `key` and its dependencies in a tree structure.
@@ -140,13 +140,13 @@ This is a list of %s defined for the current project.
 It does not list the scopes the %<s are defined in; use the 'inspect' command for that.""".format(label)
 
 	def settingsBrief(label: String) = (label, "Lists the " + label + " defined for the current project.")
-	def settingsDetailed(label: String) = 
+	def settingsDetailed(label: String) =
 """
 Syntax summary
 	%s [-(v|-vv|...|-V)] [<filter>]
 
 %<s
-	Displays the main %<s defined directly or indirectly for the current project. 
+	Displays the main %<s defined directly or indirectly for the current project.
 
 -v
 	Displays additional tasks.  More 'v's increase the number of tasks displayed.
@@ -199,7 +199,7 @@ ProjectCommand +
 	For example, 'project ....' is equivalent to three consecutive 'project ..' commands."""
 
 	def projectsBrief = "Lists the names of available projects or temporarily adds/removes extra builds to the session."
-	def projectsDetailed = 
+	def projectsDetailed =
 ProjectsCommand + """
 	List the names of available builds and the projects defined in those builds.
 
@@ -263,8 +263,8 @@ load-commands -base ~/.sbt/commands
 
 	def crossHelp: Help = Help.more(CrossCommand, CrossDetailed)
 	def switchHelp: Help = Help.more(SwitchCommand, SwitchDetailed)
-	
-	def CrossDetailed = 
+
+	def CrossDetailed =
 s"""$CrossCommand <command>
 	Runs <command> for each Scala version specified for cross-building.