From 27a30a933a5d1ebcfb4a98d0335fb306f1f6a220 Mon Sep 17 00:00:00 2001
From: PanAeon <vitalii.voloshyn@gmail.com>
Date: Tue, 24 Oct 2017 19:08:56 +0100
Subject: [PATCH 1/2] fix sbt help new does not explain how to use sbt new

---
 .../src/main/scala/sbt/BasicCommandStrings.scala   | 10 ++++++++--
 .../src/main/scala/sbt/BasicCommands.scala         | 14 ++++++++++++--
 notes/1.0.3/help-sbt-new.md                        | 13 +++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 notes/1.0.3/help-sbt-new.md

diff --git a/main-command/src/main/scala/sbt/BasicCommandStrings.scala b/main-command/src/main/scala/sbt/BasicCommandStrings.scala
index 7d5f120d7..064c8de61 100644
--- a/main-command/src/main/scala/sbt/BasicCommandStrings.scala
+++ b/main-command/src/main/scala/sbt/BasicCommandStrings.scala
@@ -41,8 +41,14 @@ $HelpCommand <regular expression>
   def CompletionsBrief = (CompletionsCommand, CompletionsDetailed)
 
   def templateBrief = (TemplateCommand, "Creates a new sbt build.")
-  def templateDetailed = TemplateCommand + """ [--options] <template>
-  Create a new sbt build based on the given template."""
+  def templateDetailed =
+    TemplateCommand + """ [--options] <template>
+  Create a new sbt build based on the given template.
+  sbt provides out-of-the-box support for Giter8 templates. See foundweekends.org/giter8/ for details.
+  
+  Example:
+    sbt new scala/scala-seed.g8
+  """
 
   def HistoryHelpBrief =
     (HistoryCommands.Start -> "History command help.  Lists and describes all history commands.")
diff --git a/main-command/src/main/scala/sbt/BasicCommands.scala b/main-command/src/main/scala/sbt/BasicCommands.scala
index 2ae3e6431..2ccf28d77 100644
--- a/main-command/src/main/scala/sbt/BasicCommands.scala
+++ b/main-command/src/main/scala/sbt/BasicCommands.scala
@@ -87,10 +87,20 @@ object BasicCommands {
   }
 
   def runHelp(s: State, h: Help)(arg: Option[String]): State = {
-    val message = try Help.message(h, arg)
+
+    val (extraArgs, remainingCommands) = s.remainingCommands match {
+      case xs :+ exec if exec.commandLine == "shell" => (xs, exec :: Nil)
+      case xs                                        => (xs, Nil)
+    }
+
+    val topic = (arg.toList ++ extraArgs.map(_.commandLine)) match {
+      case Nil => None
+      case xs  => Some(xs.mkString(" "))
+    }
+    val message = try Help.message(h, topic)
     catch { case NonFatal(ex) => ex.toString }
     System.out.println(message)
-    s
+    s.copy(remainingCommands = remainingCommands)
   }
 
   def completionsCommand: Command =
diff --git a/notes/1.0.3/help-sbt-new.md b/notes/1.0.3/help-sbt-new.md
new file mode 100644
index 000000000..4ef46fa9b
--- /dev/null
+++ b/notes/1.0.3/help-sbt-new.md
@@ -0,0 +1,13 @@
+[@panaeon]: https://github.com/panaeon
+
+[#2932]: https://github.com/sbt/sbt/issues/2939
+
+### Bug fixes
+
+- Make sure that when `sbt help <command>` is executed from the command line it behaves similar to `sbt "help <command>"`.
+- Add basic example and link to gitter8 templates page to `sbt new` help message.
+
+### Note:
+Unfortunately `sbt help shell` will print default general help message and drop to the sbt shell instead of displaying sbt shell help. 
+Also now `help` command will consume commands after it so `;help smth; other cmd` will not work.
+

From 94277b1ed002802221102a702e634c7385659991 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 27 Jun 2018 23:24:16 -0400
Subject: [PATCH 2/2] Can't call help from scripted

---
 sbt/src/sbt-test/actions/multiple-with-error/test | 2 +-
 sbt/src/sbt-test/project/inside-ci/test           | 2 +-
 sbt/src/sbt-test/project/sbt-version-change/test  | 2 +-
 sbt/src/sbt-test/project/scripted-bad-def/test    | 2 +-
 sbt/src/sbt-test/project/source-plugins/pending   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbt/src/sbt-test/actions/multiple-with-error/test b/sbt/src/sbt-test/actions/multiple-with-error/test
index ff83f1b3d..c35330bc1 100644
--- a/sbt/src/sbt-test/actions/multiple-with-error/test
+++ b/sbt/src/sbt-test/actions/multiple-with-error/test
@@ -1,3 +1,3 @@
 # Issue 732: reload followed by a command that results in an error exits in interactive mode
 -> ;reload;not-a-command
-> help
+> about
diff --git a/sbt/src/sbt-test/project/inside-ci/test b/sbt/src/sbt-test/project/inside-ci/test
index 08a542bb3..360ba64e4 100644
--- a/sbt/src/sbt-test/project/inside-ci/test
+++ b/sbt/src/sbt-test/project/inside-ci/test
@@ -1,2 +1,2 @@
 # just need to verify it loads
-> help
\ No newline at end of file
+> about
diff --git a/sbt/src/sbt-test/project/sbt-version-change/test b/sbt/src/sbt-test/project/sbt-version-change/test
index b46c8dd3c..e8efe77c5 100644
--- a/sbt/src/sbt-test/project/sbt-version-change/test
+++ b/sbt/src/sbt-test/project/sbt-version-change/test
@@ -1,4 +1,4 @@
-> help
+> about
 $ copy-file changes/build.properties project/build.properties
 > reload
 > checkSbtVersionWarning
diff --git a/sbt/src/sbt-test/project/scripted-bad-def/test b/sbt/src/sbt-test/project/scripted-bad-def/test
index 3845dd842..119d567f2 100644
--- a/sbt/src/sbt-test/project/scripted-bad-def/test
+++ b/sbt/src/sbt-test/project/scripted-bad-def/test
@@ -9,5 +9,5 @@ $ delete bad.sbt
 
 # due to the previous reload failing, this will force the project to be reloaded first
 # and this should then succeed
-> help
+> about
 
diff --git a/sbt/src/sbt-test/project/source-plugins/pending b/sbt/src/sbt-test/project/source-plugins/pending
index 08a542bb3..360ba64e4 100644
--- a/sbt/src/sbt-test/project/source-plugins/pending
+++ b/sbt/src/sbt-test/project/source-plugins/pending
@@ -1,2 +1,2 @@
 # just need to verify it loads
-> help
\ No newline at end of file
+> about