hg: type-annotations/type-annotations/jdk: 4 new changesets

[jonathan.gibbons at oracle.com]

Changeset: 5ea5f5dfb96a
Author:    uta
Date:      2013-05-14 20:16 +0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5ea5f5dfb96a

8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
Reviewed-by: alanb

! src/share/classes/java/lang/ProcessBuilder.java
! src/windows/classes/java/lang/ProcessImpl.java
+ test/java/lang/Runtime/exec/ExecCommand.java

Changeset: e0135f1a8627
Author:    sundar
Date:      2013-05-14 22:36 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e0135f1a8627

8014519: scriptpad sample does not work with nashorn
Reviewed-by: attila, jlaskey
Contributed-by: rieberandreas at gmail.com

! src/share/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java
! src/share/sample/scripting/scriptpad/src/resources/Main.js
! src/share/sample/scripting/scriptpad/src/resources/conc.js
! src/share/sample/scripting/scriptpad/src/resources/gui.js
! src/share/sample/scripting/scriptpad/src/resources/mm.js
! src/share/sample/scripting/scriptpad/src/resources/scriptpad.js
! src/share/sample/scripting/scriptpad/src/scripts/browse.js
! src/share/sample/scripting/scriptpad/src/scripts/insertfile.js
! src/share/sample/scripting/scriptpad/src/scripts/linewrap.js
! src/share/sample/scripting/scriptpad/src/scripts/mail.js
! src/share/sample/scripting/scriptpad/src/scripts/memmonitor.js
! src/share/sample/scripting/scriptpad/src/scripts/memory.js
! src/share/sample/scripting/scriptpad/src/scripts/memory.sh
! src/share/sample/scripting/scriptpad/src/scripts/textcolor.js

Changeset: 790d292ee761
Author:    khazra
Date:      2013-05-14 12:01 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/790d292ee761

6328537: Improve javadocs for Socket class by adding references to SocketOptions
Summary: Insert references to SocketOptions.java where applicable
Reviewed-by: alanb, chegar

! src/share/classes/java/net/ServerSocket.java
! src/share/classes/java/net/Socket.java

Changeset: 48bbd24b4a0d
Author:    jjg
Date:      2013-05-14 13:06 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/48bbd24b4a0d

Merge