3.2.1 changelog; bump revision

Conflicts:
	package.json

changes.md

@@ -3,6 +3,38 @@
 This file describes notable changes in each version of JSDoc 3. To download a specific version of JSDoc 3, see [GitHub's tags page](https://github.com/jsdoc3/jsdoc/tags).
 
 
+## 3.2.1 (October 2013)
+
+### Enhancements
++ JSDoc's parser now fires a `processingComplete` event after JSDoc has completed all post-processing of the parse results. This event has a `doclets` property containing an array of doclets. (#421)
++ When JSDoc's parser fires a `parseComplete` event, the event now includes a `doclets` property containing an array of doclets. (#431)
++ You can now use relative paths in the JSDoc configuration file's `source.exclude` option. Relative paths will be resolved relative to the current working directory. (#405)
++ If a symbol uses the `@default` tag, and its default value is an object literal, this value is now stored as a string, and the doclet will have a `defaultvaluetype` property containing the string `object`. This change enables templates to show the default value with appropriate syntax highlighting. (#419)
++ Inline `{@link}` tags can now contain newlines. (#441)
+
+### Bug fixes
++ Inherited symbols now indicate that they were inherited from the ancestor that defined the symbol, rather than the direct parent. (#422)
++ If the first line of a JavaScript file contains a hashbang (for example, `#!/usr/bin/env node`), the hashbang is now ignored when the file is parsed. (#499)
++ Resolved a crash when a JavaScript file contains a [JavaScript 1.8](https://developer.mozilla.org/en-US/docs/Web/JavaScript/New_in_JavaScript/1.8) keyword, such as `let`. (#477)
++ The type expression `function[]` is now parsed correctly. (#493)
++ If a module is tagged incorrectly, the module's output file now has a valid filename. (#440, #458)
++ For tags that accept names, such as `@module` and `@param`, if a hyphen is used to separate the name and description, the hyphen must appear on the same line as the name. This change prevents a Markdown bullet on the followng line from being interpreted as a separator. (#459)
++ When lenient mode is enabled, a `@param` tag with an invalid type expression no longer causes a crash. (#448)
++ The `@requires` tag can now contain an inline tag in its tag text. (#486)
++ The `@returns` tag can now contain inline tags even if a type is not specified. (#444)
++ When lenient mode is enabled, a `@returns` tag with no value no longer causes a crash. (#451)
++ The `@type` tag now works correctly with type expressions that span multiple lines. (#427)
++ If a string contains inline `{@link}` tags preceded by bracketed link text (for example, `[test]{@link Test#test}`), HTML links are now generated correctly even if the string contains other bracketed text. (#470)
++ On POSIX systems, if you run JSDoc using a symlink to the startup script, JSDoc now works correctly. (#492)
+
+### Default template
++ Pretty-printed source files are now generated by default. To disable this feature, add the property `templates.default.outputSourceFiles: false` to your `conf.json` file. (#454)
++ Links to a specific line in a source file now work correctly. (#475)
++ Pretty-printed source files are now generated using the encoding specified in the `-e/--encoding` option. (#496)
++ If a `@default` tag is added to a symbol whose default value is an object, the value is now displayed in the output file. (#419)
++ Output files now identify symbols as "abstract" rather than "virtual." (#432)
+
+
 ## 3.2.0 (May 2013)
 
 ### Major changes

package.json

@@ -1,7 +1,12 @@
 {
 	"name": "jsdoc",
+<<<<<<< HEAD
 	"version": "3.3.0-dev",
 	"revision": "1379480242214",
+=======
+	"version": "3.2.1",
+	"revision": "1380988759465",
+>>>>>>> e8753db... 3.2.1 changelog; bump revision
 	"description": "An API documentation generator for JavaScript.",
 	"keywords": [ "documentation", "javascript" ],
 	"licenses": [