Merge
authorrriggs
Mon, 23 Mar 2015 10:58:27 -0400
changeset 29602 47f15b73f5e3
parent 29601 d6e9fbd8497a (diff)
parent 29599 e2c48b046f91 (current diff)
child 29603 8bdfa87650e4
Merge
--- a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java	Mon Mar 23 14:20:39 2015 +0100
+++ b/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java	Mon Mar 23 10:58:27 2015 -0400
@@ -82,7 +82,7 @@
  * <li><a name="redirect-output">a destination for <i>standard output</i>
  * and <i>standard error</i></a>.  By default, the subprocess writes standard
  * output and standard error to pipes.  Java code can access these pipes
- * via the input streams returned by {@link Process#getInputStream()} and
+ * via the input streams returned by {@link Process#getOutputStream()} and
  * {@link Process#getErrorStream()}.  However, standard output and
  * standard error may be redirected to other destinations using
  * {@link #redirectOutput(Redirect) redirectOutput} and
@@ -988,14 +988,14 @@
      *         <li>the standard input to the subprocess was
      *         {@linkplain #redirectInput redirected from a file}
      *         and the security manager's
-     *         {@link SecurityManager#checkRead checkRead} method
+     *         {@link SecurityManager#checkRead(String) checkRead} method
      *         denies read access to the file, or
      *
      *         <li>the standard output or standard error of the
      *         subprocess was
      *         {@linkplain #redirectOutput redirected to a file}
      *         and the security manager's
-     *         {@link SecurityManager#checkWrite checkWrite} method
+     *         {@link SecurityManager#checkWrite(String) checkWrite} method
      *         denies write access to the file
      *
      *         </ul>