summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDivay Prakash <divayprakash@users.noreply.github.com>2018-11-01 12:41:26 +0530
committerGitHub <noreply@github.com>2018-11-01 12:41:26 +0530
commit2ad287ab7deed233bdf832d0c4c35f2ba9d1f09f (patch)
tree37a77b54063e40924a004aa8ba3740355aeb8cc7
parent6e49da308eee27ad33e8217fe79aa2d9575bbd4a (diff)
parent3aada35d9a938e1af78328c8ee170ac71846fb10 (diff)
Merge pull request #3380 from hpost/patch-1
[kotlin/en] Mention parameterless main function
-rw-r--r--kotlin.html.markdown4
1 files changed, 3 insertions, 1 deletions
diff --git a/kotlin.html.markdown b/kotlin.html.markdown
index 81242bac..9bc8b420 100644
--- a/kotlin.html.markdown
+++ b/kotlin.html.markdown
@@ -20,7 +20,9 @@ package com.learnxinyminutes.kotlin
/*
The entry point to a Kotlin program is a function named "main".
-The function is passed an array containing any command line arguments.
+The function is passed an array containing any command-line arguments.
+Since Kotlin 1.3 the "main" function can also be defined without
+any parameters.
*/
fun main(args: Array<String>) {
/*