Fix issue #617: Reintroduce pull requests #643 and #664

README.md

@@ -504,17 +504,12 @@ Custom delimiters can be used in place of `{{` and `}}` by setting the new value
 
 #### Setting in JavaScript
 
-The `Mustache.tags` property holds an array consisting of the opening and closing tag values. Set custom values by passing a new array of tags to `parse()`, which gets honored over the default values, or by overriding the `tags` property itself:
+The `Mustache.tags` property holds an array consisting of the opening and closing tag values. Set custom values by setting this property.
 
 ```js
 var customTags = [ '<%', '%>' ];
 ```
 
-##### Pass Value into Parse Method
-```js
-Mustache.parse(template, customTags);
-```
-
 ##### Override Tags Property
 ```js
 Mustache.tags = customTags;

mustache.js

@@ -439,7 +439,8 @@
   };
 
   /**
-   * Parses and caches the given `template` and returns the array of tokens
+   * Parses and caches the given `template` according to the given `tags` or
+   * `mustache.tags` if `tags` is omitted,  and returns the array of tokens
    * that is generated from the parse.
    */
   Writer.prototype.parse = function parse (template, tags) {