Merge remote-tracking branch 'origin/master'

Author: mjpt777

aeron-driver/src/main/java/io/aeron/driver/Configuration.java

@@ -64,8 +64,8 @@ public final class Configuration
     public static final String DIR_WARN_IF_EXISTS_PROP_NAME = "aeron.dir.warn.if.exists";
 
     /**
-     * Should driver attempt to an immediate forced delete of {@link CommonContext#AERON_DIR_PROP_NAME} on start
-     * if it exists.
+     * Should the Media Driver attempt to immediately delete the directory {@link CommonContext#AERON_DIR_PROP_NAME}
+     * on start if it exists before performing any additional checks.
      */
     public static final String DIR_DELETE_ON_START_PROP_NAME = "aeron.dir.delete.on.start";
 

aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java

@@ -814,8 +814,10 @@ public Context warnIfDirectoryExists(final boolean warnIfDirectoryExists)
 
         /**
          * Will the driver attempt to immediately delete {@link #aeronDirectoryName()} on startup.
+         * WARNING: {@link #aeronDirectoryName()} will be recreated regardless, unless set to false
+         * and an active Media Driver is detected.
          *
-         * @return true when directory will be deleted, otherwise false.
+         * @return true when directory will be recreated without checks, otherwise false.
          * @see Configuration#DIR_DELETE_ON_START_PROP_NAME
          */
         public boolean dirDeleteOnStart()
@@ -825,8 +827,10 @@ public boolean dirDeleteOnStart()
 
         /**
          * Should the driver attempt to immediately delete {@link #aeronDirectoryName()} on startup.
+         * WARNING: {@link #aeronDirectoryName()} will be recreated regardless, unless set to false
+         * and an active Media Driver is detected.
          *
-         * @param dirDeleteOnStart Attempt deletion.
+         * @param dirDeleteOnStart Attempt deletion without checks.
          * @return this for a fluent API.
          * @see Configuration#DIR_DELETE_ON_START_PROP_NAME
          */