Skip to content

Commit 527fd9a

Browse files
committed
Merge pull request scala#3313 from OlivierBlanvillain/upstream
Fix typos in documentation
2 parents 66a12fc + dafcbeb commit 527fd9a

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/library/scala/collection/convert/DecorateAsJava.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ trait DecorateAsJava {
287287
* will be visible via the Scala interface and vice versa.
288288
*
289289
* If the Scala `concurrent.Map` was previously obtained from an implicit or
290-
* explicit call of `asConcurrentMap(java.util.concurrect.ConcurrentMap)`
290+
* explicit call of `asConcurrentMap(java.util.concurrent.ConcurrentMap)`
291291
* then the original Java `ConcurrentMap` will be returned.
292292
*
293293
* @param m The Scala `concurrent.Map` to be converted.

src/library/scala/collection/convert/WrapAsJava.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ trait WrapAsJava {
244244
* will be visible via the Scala interface and vice versa.
245245
*
246246
* If the Scala `concurrent.Map` was previously obtained from an implicit or
247-
* explicit call of `mapAsScalaConcurrentMap(java.util.concurrect.ConcurrentMap)`
247+
* explicit call of `mapAsScalaConcurrentMap(java.util.concurrent.ConcurrentMap)`
248248
* then the original Java ConcurrentMap will be returned.
249249
*
250250
* @param m The Scala `concurrent.Map` to be converted.

src/library/scala/ref/WeakReference.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package scala.ref
1111

1212
/**
13-
* A wrapper class for java.lag.ref.WeakReference
13+
* A wrapper class for java.lang.ref.WeakReference
1414
* The new functionality is (1) results are Option values, instead of using null.
1515
* (2) There is an extractor that maps the weak reference itself into an option.
1616
* @author Sean McDirmid

src/library/scala/sys/process/ProcessBuilder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import ProcessBuilder._
6262
* there's a few methods that create a new `ProcessBuilder` with a
6363
* pre-configured input or output. They are `#<`, `#>` and `#>>`, and may take
6464
* as input either another `ProcessBuilder` (like the pipe described above), or
65-
* something else such as a `java.io.File` or a `java.lang.InputStream`.
65+
* something else such as a `java.io.File` or a `java.io.InputStream`.
6666
* For example:
6767
* {{{
6868
* new URL("http://databinder.net/dispatch/About") #> "grep JSON" #>> new File("About_JSON") !

0 commit comments

Comments
 (0)