Merge remote-tracking branch 'adambard/master'

Conflicts:
	java.html.markdown

1 files changed, 3 insertions, 3 deletions

diff --git a/chapel.html.markdown b/chapel.html.markdown
index 02a96b04..e20be998 100644
--- a/chapel.html.markdown
+++ b/chapel.html.markdown
@@ -307,7 +307,7 @@ var stringSet: domain(string); // empty set of strings
 stringSet += "a";
 stringSet += "b";
 stringSet += "c";
-stringSet += "a"; // Redundant add "a"  
+stringSet += "a"; // Redundant add "a"
 stringSet -= "c"; // Remove "c"
 writeln( stringSet );
 
@@ -524,12 +524,12 @@ genericProc( 1.0+2.0i, 3.0+4.0i );
 // The param modifier on the arg is used to enforce this constraint.
 proc whereProc( param N : int ): void
  where ( N > 0 ) {
-  writeln( "N is greater than 0" );  
+  writeln( "N is greater than 0" );
 }
 
 proc whereProc( param N : int ): void
  where ( N < 0 ) {
-  writeln( "N is less than 0" );  
+  writeln( "N is less than 0" );
 }
 
 whereProc( 10 );