ballerina-platform · Kishanthan · Dec 16, 2019 · Dec 16, 2019 · Dec 16, 2019 · Dec 16, 2019
diff --git a/ballerina-command/src/main/java/org/ballerinalang/command/cmd/DistributionCommand.java b/ballerina-command/src/main/java/org/ballerinalang/command/cmd/DistributionCommand.java
@@ -41,12 +41,7 @@ public DistributionCommand(PrintStream printStream) {
 
     @Override
     public void execute() {
-        if (helpFlag) {
-            printUsageInfo(BallerinaCliCommands.HELP);
-            return;
-        }
-
-        if (distCommands == null) {
+        if (helpFlag || distCommands == null) {
             printUsageInfo(BallerinaCliCommands.DIST);
         }
 

diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-dist-update.help b/ballerina-command/src/main/resources/cli-help/ballerina-dist-update.help
@@ -1,15 +1,14 @@
 NAME
-    ballerina-dist-update - Update to latest distribution version
+       ballerina-dist-update - Update to the latest distribution version
 
 SYNOPSIS
-    ballerina dist update
+       ballerina dist update
+
 
 DESCRIPTION
-     Ballerina dist update command updates to latest version.
+       Dist-update updates Ballerina to the latest distribution version.
 
-OPTIONS
-     Ballerina dist update command takes no options.
 
 EXAMPLES
-     Update current distribution to latest.
-        → ballerina dist update
+       Update Ballerina to the latest distribution version.
+          → ballerina dist update
diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-dist.help b/ballerina-command/src/main/resources/cli-help/ballerina-dist.help
@@ -1,31 +1,25 @@
 NAME
-       DIST - Commands for Ballerina distribution version management
+       Commands for Ballerina distribution version management
 
 SYNOPSIS
-       ballerina [-h | --help]
-                 <command> [<args>]
+       ballerina dist <command> <-h | --help>
+       ballerina dist <command> [<args>]
 
 
 DESCRIPTION
-        This consists of the the sub commands to manage Ballerina distributions.
+       Sub-commands to manage Ballerina distributions.
 
-OPTIONS
 
+OPTIONS
        -h, --help
            Print usage details of a command.
 
 
 BALLERINA COMMANDS
-    Available commands are:
-        list       List available Ballerina distributions
-        fetch      Pull a given distribution version
-        pull       Pull and use a given distribution version
-        use        Switch to a specific distribution version
-        update     Update to latest distribution version
-        remove     Delete locally installed distribution version
-
-
-EXAMPLES
-
-       Get help on how to use the 'ballerina dist' command.
-          → ballerina dist --help
+       Here is a list of available sub-commands:
+           list       List available Ballerina distributions
+           fetch      Pull a given distribution version
+           pull       Pull and use a given distribution version
+           use        Switch to a specific distribution version
+           update     Update to the latest distribution version
+           remove     Delete a locally installed distribution version
diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-help.help b/ballerina-command/src/main/resources/cli-help/ballerina-help.help
@@ -1,8 +1,7 @@
 
-   Update Tool Commands:
+   Update Commands:
         dist            Commands for Ballerina distribution version management
         update          Update the Ballerina command
 
 
 See 'ballerina help <command>' for more information on a specific command.
-
diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-list.help b/ballerina-command/src/main/resources/cli-help/ballerina-list.help
@@ -1,12 +1,14 @@
 NAME
-    ballerina-dist-list - List available Ballerina distributions
+       ballerina-dist-list - List available Ballerina distributions
 
 SYNOPSIS
-    ballerina dist list
+       ballerina dist list
+
 
 DESCRIPTION
-     Ballerina dist list lists available Ballerina distributions.
+       Dist-list lists the Ballerina distributions available both locally and remotely.
+
 
 EXAMPLES
-     List available Ballerina versions.
-        → ballerina dist list
+       List available Ballerina versions.
+          → ballerina dist list
diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-pull.help b/ballerina-command/src/main/resources/cli-help/ballerina-pull.help
@@ -6,15 +6,9 @@ SYNOPSIS
 
 
 DESCRIPTION
-       Dist-pull pulls and uses a given Ballerina version from project repository.
-
-
-OPTIONS
-       Ballerina dist pull command takes no options.
+       Dist-pull pulls and uses a given Ballerina version from the remote repository.
 
 
 EXAMPLES
-       Install Ballerina 1.0.0 version.
+       Pull and use Ballerina 1.0.0.
           → ballerina dist pull jballerina-1.0.0
-
-       This will download and keep jballerina-1.0.0 distribution and set ballerina command.
diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-remove.help b/ballerina-command/src/main/resources/cli-help/ballerina-remove.help
@@ -1,15 +1,14 @@
 NAME
-    ballerina-remove - Remove a given distribution version
+       ballerina-remove - Remove a given distribution version
 
 SYNOPSIS
-    ballerina dist remove <distribution-version>
+       ballerina dist remove <distribution-version>
+
 
 DESCRIPTION
-     removes the given Ballerina version from project repository.
+       Dist-remove removes the given Ballerina version from the project repository.
 
-OPTIONS
-     Ballerina dist remove command takes no options.
 
 EXAMPLES
-     Remove Ballerina 1.0.0 version.
-        → ballerina remove 1.0.0
+       Remove Ballerina 1.0.0.
+          → ballerina dist remove jballerina-1.0.0
diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-update.help b/ballerina-command/src/main/resources/cli-help/ballerina-update.help
@@ -1,15 +1,14 @@
 NAME
-    ballerina-update - Update to latest Ballerina command version
+       ballerina-update - Update to the latest Ballerina command version
 
 SYNOPSIS
-    ballerina update
+       ballerina update
+
 
 DESCRIPTION
-     Ballerina update updates to Ballerina command to latest version.
+       Update updates the Ballerina command to the latest version.
 
-OPTIONS
-     Ballerina update command takes no options.
 
 EXAMPLES
-     Update current Ballerina command to latest.
-        → ballerina update
+       Update the Ballerina command to the latest version.
+          → ballerina update
diff --git a/ballerina-command/src/main/resources/cli-help/ballerina-use.help b/ballerina-command/src/main/resources/cli-help/ballerina-use.help
@@ -1,15 +1,15 @@
 NAME
-    ballerina-dist-use - Use a given distribution version
+       ballerina-dist-use - Use a given distribution version as the default version
 
 SYNOPSIS
-    ballerina dist use <distribution-version>
+       ballerina dist use <distribution-version>
+
 
 DESCRIPTION
-     Use pulls and uses a given Ballerina version from project repository.
+       Use switches to a given Ballerina version from the project repository
+       as the default version.
 
-OPTIONS
-     Ballerina dist use command takes no options.
 
 EXAMPLES
-     Use Ballerina 1.0.0 distribution.
-        → ballerina dist use jballerina-1.0.0
+       Use Ballerina 1.0.0.
+          → ballerina dist use jballerina-1.0.0