Typo and spelling corrections

6 files changed, 11 insertions, 11 deletions

diff --git a/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala b/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala
index 9de6ec4ab9..613bbd9aec 100644
--- a/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala
@@ -183,7 +183,7 @@ trait MemberLookupBase {
 
         val member = query.substring(last_index, index).replaceAll("\\\\([#\\.])", "$1")
         // we want to allow javadoc-style links [[#member]] -- which requires us to remove empty members from the first
-        // elemnt in the list
+        // element in the list
         if ((member != "") || (!members.isEmpty))
           members ::= member
         last_index = index + 1
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala
index 2deb669ea9..99af2f627f 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala
@@ -211,7 +211,7 @@ class DotDiagramGenerator(settings: doc.Settings, dotRunner: DotRunner) extends
     // escape HTML characters in node names
     def escape(name: String) = name.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
 
-    // assemble node attribues in a map
+    // assemble node attributes in a map
     val attr = scala.collection.mutable.Map[String, String]()
 
     // link
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/scheduler.js b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/scheduler.js
index 52fb1770ee..eb396bb5d3 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/scheduler.js
+++ b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/scheduler.js
@@ -65,7 +65,7 @@ function Scheduler() {
             scheduler.queues[idx].push(new scheduler.work(fn, self, args));
             if (scheduler.timeout == undefined) doWork();
         } else {
-            throw("queue for add is non existant");
+            throw("queue for add is non-existent");
         }
     }
 
@@ -86,7 +86,7 @@ function Scheduler() {
         if (idx != -1)
             return scheduler.queues[idx].length == 0;
         else
-            throw("queue for label '" + label  + "' is non existant");
+            throw("queue for label '" + label  + "' is non-existent");
     }
 
     this.scheduleLast = function(label, fn) {
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.css b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.css
index f222749dd2..c120698e91 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.css
+++ b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.css
@@ -562,7 +562,7 @@ div#definition > h4#signature > span.modifier_kind > i.unfold-arrow,
   font-weight: bold;
 }
 
-/* Comments text formating */
+/* Comments text formatting */
 
 .cmt {
   color: #103a51;
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/Entity.scala b/src/scaladoc/scala/tools/nsc/doc/model/Entity.scala
index 757f13f79a..e71383f7e7 100644
--- a/src/scaladoc/scala/tools/nsc/doc/model/Entity.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/model/Entity.scala
@@ -256,11 +256,11 @@ trait DocTemplateEntity extends MemberTemplateEntity {
     * only if the `docsourceurl` setting has been set. */
   def sourceUrl: Option[java.net.URL]
 
-  /** All class, trait and object templates which are part of this template's linearization, in lineratization order.
+  /** All class, trait and object templates which are part of this template's linearization, in linearization order.
     * This template's linearization contains all of its direct and indirect super-classes and super-traits. */
   def linearizationTemplates: List[TemplateEntity]
 
-  /** All instantiated types which are part of this template's linearization, in lineratization order.
+  /** All instantiated types which are part of this template's linearization, in linearization order.
     * This template's linearization contains all of its direct and indirect super-types. */
   def linearizationTypes: List[TypeEntity]
 
@@ -511,9 +511,9 @@ trait ImplicitConversion {
 
 /** Shadowing captures the information that the member is shadowed by some other members
  *  There are two cases of implicitly added member shadowing:
- *  1) shadowing from a original class member (the class already has that member)
+ *  1) shadowing from an original class member (the class already has that member)
  *     in this case, it won't be possible to call the member directly, the type checker will fail attempting to adapt
- *     the call arguments (or if they fit it will call the original class' method)
+ *     the call arguments (or if they fit it will call the original class method)
  *  2) shadowing from other possible implicit conversions ()
  *     this will result in an ambiguous implicit converion error
  */
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
index fb9a5ce7eb..6e62ce0317 100644
--- a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -886,8 +886,8 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
           // units.filter should return only one element
           (currentRun.units filter (_.source.file == aSym.sourceFile)).toList match {
             case List(unit) =>
-              // SI-4922 `sym == aSym` is insufficent if `aSym` is a clone of symbol
-              //         of the parameter in the tree, as can happen with type parametric methods.
+              // SI-4922 `sym == aSym` is insufficient if `aSym` is a clone of symbol
+              //         of the parameter in the tree, as can happen with type parameterized methods.
               def isCorrespondingParam(sym: Symbol) = (
                 sym != null &&
                 sym != NoSymbol &&