RELEASE 1.0.0

CHANGELOG.md

@@ -1,5 +1,5 @@
-<a name"1.0.0-alpha1"></a>
-### 1.0.0-alpha1 (2015-05-13)
+<a name"1.0.0"></a>
+## 1.0.0 (2015-05-27)
 
 #### Release Information
 This is a major code refactor with some big changes such as:
@@ -19,6 +19,8 @@ This is a major code refactor with some big changes such as:
   [#109](http://github.com/showdownjs/showdown/issues/109), [#111](http://github.com/showdownjs/showdown/issues/111),
   [#118](http://github.com/showdownjs/showdown/issues/118), [#122](http://github.com/showdownjs/showdown/issues/122)
   - add unique id prefix and suffix to headers ([c367a4b9](http://github.com/showdownjs/showdown/commit/c367a4b9), closes [#81](http://github.com/showdownjs/showdown/issues/81), [#82](http://github.com/showdownjs/showdown/issues/82))
+* **options.omitExtraWLInCodeBlocks:** fix for options.omitExtraWLInCodeBlocks only applying in gitHub flavoured code b ([e6f40e19](http://github.com/showdownjs/showdown/commit/e6f40e19))
+* **showdown:** fix for options merging into globalOptions ([ddd6011d](http://github.com/showdownjs/showdown/commit/ddd6011d), closes [#153](http://github.com/showdownjs/showdown/issues/153))
 
 #### Features
 
@@ -27,6 +29,7 @@ The system, however, is not final and will probably be changed until the final v
 * **allowBlockIndents:** indented inline block elements can now be parsed as markdown ([f6326b84](http://github.com/showdownjs/showdown/commit/f6326b84))
 * **omitExtraWLInCodeBlocks:**  add option to omit extra newline at the end of codeblocks ([141e3f5](http://github.com/showdownjs/showdown/commit/141e3f5))
 * **prefixHeaderId:** add options to prefix header ids to prevent id clash ([141e3f5](http://github.com/showdownjs/showdown/commit/141e3f5))
+* **Converter.options:** add getOption(), setOption() and getOptions() to Converter object ([db6f79b0](http://github.com/showdownjs/showdown/commit/db6f79b0))
 
 #### Breaking Changes
 * **NAMESPACE:** showdown's namespace changed.

dist/showdown.js

@@ -26,7 +26,7 @@ showdown.extensions = {};
  * Set a global option
  * @static
  * @param {string} key
- * @param {string} value
+ * @param {*} value
  * @returns {showdown}
  */
 showdown.setOption = function (key, value) {
@@ -285,7 +285,7 @@ showdown.Converter = function (converterOptions) {
   /**
    * Set an option of this Converter instance
    * @param {string} key
-   * @param {string} value
+   * @param {*} value
    */
   function setOption (key, value) {
     options[key] = value;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "showdown",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0",
   "description": "A Markdown to HTML converter written in Javascript",
   "authors": "Estevão Santos",
   "contributors": [