summaryrefslogtreecommitdiff
path: root/src/scaladoc/scala/tools/nsc/doc/model/Entity.scala
diff options
context:
space:
mode:
authorJanek Bogucki <janekdb@gmail.com>2016-11-11 07:04:37 +0000
committerJanek Bogucki <janekdb@gmail.com>2016-11-11 07:04:37 +0000
commitdc047d43aaf6aec669c87ae16d5445d4e2e512fe (patch)
treebac4164abc88fab18801acf9ebeac7a8758095fc /src/scaladoc/scala/tools/nsc/doc/model/Entity.scala
parentf8bc01ee6ff7c3f2cacb62692598f9efcdb78874 (diff)
downloadscala-dc047d43aaf6aec669c87ae16d5445d4e2e512fe.tar.gz
scala-dc047d43aaf6aec669c87ae16d5445d4e2e512fe.tar.bz2
scala-dc047d43aaf6aec669c87ae16d5445d4e2e512fe.zip
Typo and spelling corrections
Diffstat (limited to 'src/scaladoc/scala/tools/nsc/doc/model/Entity.scala')
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/model/Entity.scala8
1 files changed, 4 insertions, 4 deletions
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
*/