summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-09-23 04:58:32 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-09-23 04:58:32 -0700
commit6f6d102a83f1b890f4061082b4b1ec5733c8dde2 (patch)
tree0f784f3937b7883500f1fb9b6fb28279439702cd
parenta456f4648a82e22b9fa66f05835c01173c16c7c8 (diff)
parent74dfb539dfe52d080fede15c90ac45c2c69dca86 (diff)
downloadscala-6f6d102a83f1b890f4061082b4b1ec5733c8dde2.tar.gz
scala-6f6d102a83f1b890f4061082b4b1ec5733c8dde2.tar.bz2
scala-6f6d102a83f1b890f4061082b4b1ec5733c8dde2.zip
Merge pull request #2953 from jiaweihli/master
Fix typo in documentation.
-rw-r--r--src/library/scala/sys/process/ProcessBuilder.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/sys/process/ProcessBuilder.scala b/src/library/scala/sys/process/ProcessBuilder.scala
index a144d51609..feced71dae 100644
--- a/src/library/scala/sys/process/ProcessBuilder.scala
+++ b/src/library/scala/sys/process/ProcessBuilder.scala
@@ -123,7 +123,7 @@ import ProcessBuilder._
* 1. `#&&` conditionally executes the second command if the previous one finished with
* exit value 0. It mirrors shell's `&&`.
* 1. `#||` conditionally executes the third command if the exit value of the previous
- * command is different than zero. It mirrors shell's `&&`.
+ * command is different than zero. It mirrors shell's `||`.
*
* Finally, `!` at the end executes the commands, and returns the exit value.
* Whatever is printed will be sent to the Scala process standard output. If