Scaladoc minor fix: Typos in diagrams

As suggested by Heather in pull request #816.

3 files changed, 7 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/Settings.scala b/src/compiler/scala/tools/nsc/doc/Settings.scala
index c7bdf74ebd..aae88aa03e 100644
--- a/src/compiler/scala/tools/nsc/doc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/doc/Settings.scala
@@ -147,7 +147,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
 
   val docDiagramsDotTimeout = IntSetting(
     "-diagrams-dot-timeout",
-    "The timeout before the graphviz dot util is forecefully closed, in seconds (default: 10)",
+    "The timeout before the graphviz dot util is forcefully closed, in seconds (default: 10)",
     10,
     None,
     _ => None
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala b/src/compiler/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala
index adfeb3b012..3040278290 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala
@@ -46,7 +46,7 @@ class DotRunner(settings: doc.Settings) {
       if (dotRestarts == settings.docDiagramsDotRestart.value) {
         settings.printMsg("\n")
         settings.printMsg("**********************************************************************")
-        settings.printMsg("Diagrams will be disabled for this run beucause the graphviz dot tool")
+        settings.printMsg("Diagrams will be disabled for this run because the graphviz dot tool")
         settings.printMsg("has malfunctioned too many times. These scaladoc flags may help:")
         settings.printMsg("")
         val baseList = List(settings.docDiagramsDebug,
diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
index b7c4eed87d..2ce7927f42 100644
--- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -367,7 +367,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
     lazy val memberSyms      = sym.info.members.filter(s => membersShouldDocument(s, this))
 
     // the inherited templates (classes, traits or objects)
-    var memberSymsLazy  = memberSyms.filter(t => templateShouldDocument(t, this) && !inOriginalOnwer(t, this))
+    var memberSymsLazy  = memberSyms.filter(t => templateShouldDocument(t, this) && !inOriginalOwner(t, this))
     // the direct members (methods, values, vars, types and directly contained templates)
     var memberSymsEager = memberSyms.filter(!memberSymsLazy.contains(_))
     // the members generated by the symbols in memberSymsEager
@@ -611,7 +611,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
         }
       else {
         // no class inheritance at this point
-        assert(inOriginalOnwer(bSym, inTpl))
+        assert(inOriginalOwner(bSym, inTpl))
         createDocTemplate(bSym, inTpl)
       }
     }
@@ -716,7 +716,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
           case _ =>
             sys.error("'" + bSym + "' must be in a package")
         }
-      else if (!modelFinished && templateShouldDocument(bSym, inTpl) && inOriginalOnwer(bSym, inTpl))
+      else if (!modelFinished && templateShouldDocument(bSym, inTpl) && inOriginalOwner(bSym, inTpl))
         Some(modelCreation.createTemplate(bSym, inTpl))
       else
         None
@@ -945,7 +945,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
      */
     normalizeTemplate(aSym)
 
-  def inOriginalOnwer(aSym: Symbol, inTpl: TemplateImpl): Boolean =
+  def inOriginalOwner(aSym: Symbol, inTpl: TemplateImpl): Boolean =
     normalizeOwner(aSym.owner) == normalizeOwner(inTpl.sym)
 
   def templateShouldDocument(aSym: Symbol, inTpl: TemplateImpl): Boolean =
@@ -953,7 +953,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
     localShouldDocument(aSym) &&
     !isEmptyJavaObject(aSym) &&
     // either it's inside the original owner or we can document it later:
-    (!inOriginalOnwer(aSym, inTpl) || (aSym.isPackageClass || (aSym.sourceFile != null)))
+    (!inOriginalOwner(aSym, inTpl) || (aSym.isPackageClass || (aSym.sourceFile != null)))
 
   def membersShouldDocument(sym: Symbol, inTpl: TemplateImpl) =
     // pruning modules that shouldn't be documented