diff graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java @ 21649:1c76a5662753

Merge with 645f170013a451083414ff695412c465e9d2ebf0
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Mon, 01 Jun 2015 17:47:28 -0700
parents 31fc2fce38f3
children 2f9e4d984d16
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java	Sun May 31 17:23:14 2015 -0700
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java	Mon Jun 01 17:47:28 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  * implementation of this type and registering it using {@link Registration} annotation, your
  * language becomes accessible to users of the {@link TruffleVM Truffle virtual machine} - all they
  * will need to do is to include your JAR into their application and all the Truffle goodies (multi
- * language support, multi tennat hosting, debugging, etc.) will be made available to them.
+ * language support, multitenant hosting, debugging, etc.) will be made available to them.
  */
 public abstract class TruffleLanguage {
     private final Env env;
@@ -56,7 +56,7 @@
     /**
      * The annotation to use to register your language to the {@link TruffleVM Truffle} system. By
      * annotating your implementation of {@link TruffleLanguage} by this annotation you are just a
-     * <em>one JAR drop to the classpath</em> away from your users. Once they include your JAR in
+     * <em>one JAR drop to the class path</em> away from your users. Once they include your JAR in
      * their application, your language will be available to the {@link TruffleVM Truffle virtual
      * machine}.
      */
@@ -72,11 +72,11 @@
         String name();
 
         /**
-         * List of mimetypes associated with your language. Users will use them (directly or
-         * inderectly) when {@link TruffleVM#eval(java.lang.String, java.lang.String) executing}
+         * List of MIME types associated with your language. Users will use them (directly or
+         * indirectly) when {@link TruffleVM#eval(java.lang.String, java.lang.String) executing}
          * their code snippets or their {@link TruffleVM#eval(java.net.URI) files}.
          *
-         * @return array of mime types assigned to your language files
+         * @return array of MIME types assigned to your language files
          */
         String[] mimeType();
     }