Merge branch 'master' into 1.4-release

pom.xml

@@ -313,6 +313,7 @@
                  some default development tools files (see RAT-126) -->
             <exclude>.ekstazi/**</exclude>
             <exclude>**/site-content/**</exclude>
+            <exclude>**/site-content.README</exclude>
             <exclude>**/.classpath</exclude>
             <exclude>**/.project</exclude>
             <exclude>**/.settings/**</exclude>
@@ -358,6 +359,7 @@
                  some default development tools files (see RAT-126) -->
             <exclude>.ekstazi/**</exclude>
             <exclude>**/site-content/**</exclude>
+            <exclude>**/site-content.README</exclude>
             <exclude>**/.classpath</exclude>
             <exclude>**/.project</exclude>
             <exclude>**/.settings/**</exclude>
@@ -366,6 +368,8 @@
             <exclude>src/site/resources/release-notes/RELEASE-NOTES-*.txt</exclude>
             <exclude>src/site/resources/txt/userguide/stress/**</exclude>
             <exclude>dist-archive/**</exclude>
+            <exclude>**/*.patch</exclude>
+            <exclude>**/pdf.*.txt</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -490,7 +494,7 @@
       <id>is-child-module</id>
       <activation>
         <file>
-          <missing>${basedir}/CONTRIBUTING.md</missing>
+          <missing>${basedir}/RELEASE-NOTES.txt</missing>
         </file>
       </activation>
       <properties>
@@ -499,13 +503,9 @@
     </profile>
     <profile>
       <!-- Runs if the SVN site checkout does not exist.
-           This is either obtained using svn (for the parent) or an empty directory is created. -->
-      <id>setup-checkout</id>
-      <activation>
-        <file>
-          <missing>${commons.scmPubCheckoutDirectory}</missing>
-        </file>
-      </activation>
+           This is either obtained using svn (for the parent) or an empty directory is created. 
+           The site-content directory is used when updating the live site. -->
+      <id>site-checkout</id>
       <build>
         <plugins>
           <plugin>
@@ -560,7 +560,7 @@ This is avoided by creating an empty directory when svn is not available.
     </profile>
     <profile>
       <!-- Allow the SVN site checkout to be removed in the clean phase. -->
-      <id>clean-checkout</id>
+      <id>clean-site-checkout</id>
       <activation>
         <file>
           <exists>${commons.scmPubCheckoutDirectory}</exists>

src/changes/changes.xml

@@ -75,7 +75,7 @@ It is however not part of the official API and no compatibility
 should be expected in subsequent releases.
 
 It must be noted that, due to the nature of random number
-generation, some of unit tests are bound to fail with some
+generation, some unit tests are bound to fail with some
 probability.  The 'maven-surefire-plugin' is configured to
 re-run tests that fail, and pass the build if they succeed
 within the allotted number of reruns (the test will be marked

src/site/apt/userguide/rng.apt

@@ -1008,4 +1008,4 @@ java -jar target/examples-jmh.jar -h
 
 7. Dependencies
 
-  Apache Commons RNG requires JDK 1.7+ and has no runtime dependencies.
+  Apache Commons RNG requires JDK 1.8+ and has no runtime dependencies.