summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorven <vendethiel@hotmail.fr>2015-06-26 07:58:10 +0200
committerven <vendethiel@hotmail.fr>2015-06-26 07:58:10 +0200
commit53ab3a72c0c8a4e710e51a5ff64412ec3c239144 (patch)
tree3bef6c762bcc04609e0a6cb219c3c169e5aa5748
parentef771384ae672e341ec309cf71cf372143607892 (diff)
parent2162639cd901a81a24eb4a566ba5108da87634cf (diff)
Merge pull request #1062 from perlpilot/master
Add a link about parrot suspension
-rw-r--r--perl6.html.markdown9
1 files changed, 6 insertions, 3 deletions
diff --git a/perl6.html.markdown b/perl6.html.markdown
index 3bb87916..44ad333c 100644
--- a/perl6.html.markdown
+++ b/perl6.html.markdown
@@ -7,10 +7,13 @@ contributors:
- ["Nami-Doc", "http://github.com/Nami-Doc"]
---
-Perl 6 is a highly capable, feature-rich programming language made for the
-upcoming hundred years.
+Perl 6 is a highly capable, feature-rich programming language made for at
+least the next hundred years.
-Perl 6 runs on [the MoarVM](http://moarvm.com) and the JVM.
+The primary Perl 6 compiler is called [Rakudo](http://rakudo.org), which runs on
+the JVM and [the MoarVM](http://moarvm.com) and
+[prior to March 2015](http://pmthium.com/2015/02/suspending-rakudo-parrot/),
+[the Parrot VM](http://parrot.org/).
Meta-note : the triple pound signs are here to denote headlines,
double paragraphs, and single notes.