Merge pull request #10739 from som-snytt/issue/9609-doc-doc-options

-d is also a scaladoc option

src/compiler/scala/tools/nsc/settings/MutableSettings.scala

@@ -558,7 +558,7 @@ class MutableSettings(val errorFn: String => Unit, val pathFactory: PathFactory)
   }
 
   /** Set the output directory for all sources. */
-  class OutputSetting private[nsc](default: String) extends StringSetting("-d", "directory|jar", "destination for generated classfiles.", default, None)
+  class OutputSetting private[nsc](default: String) extends StringSetting("-d", "directory|jar", "Destination for generated artifacts.", default, None)
 
   /**
    * Each [[MultiChoiceSetting]] takes a MultiChoiceEnumeration as domain. The enumeration may

src/scaladoc/scala/tools/nsc/doc/Settings.scala

@@ -249,17 +249,17 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_),
   )
 
   // For improved help output.
-  def scaladocSpecific = Set[Settings#Setting](
-    docformat, doctitle, docfooter, docversion, docUncompilable, docsourceurl, docgenerator, docRootContent,
+  def scalaDocSpecific = Set[Settings#Setting](
+    outdir, docformat, doctitle, docfooter, docversion, docUncompilable, docsourceurl, docgenerator, docRootContent,
     docExternalDoc,
     docAuthor, docDiagrams, docDiagramsDebug, docDiagramsDotPath,
     docDiagramsDotTimeout, docDiagramsDotRestart,
     docImplicits, docImplicitsDebug, docImplicitsShowAll, docImplicitsHide, docImplicitsSoundShadowing,
     docDiagramsMaxNormalClasses, docDiagramsMaxImplicitClasses,
     docNoPrefixes, docNoLinkWarnings, docRawOutput, docSkipPackages,
     docExpandAllTypes, docGroups, docNoJavaComments
-  ).map(s => s.withAbbreviation("-" + s.name))
-  val isScaladocSpecific: String => Boolean = scaladocSpecific map (_.name)
+  ).map(s => s.withAbbreviation(s"-${s.name}"))
+  val isScaladocSpecific: String => Boolean = scalaDocSpecific.map(_.name)
 
   override def isScaladoc = true