Cleanup jsdoc tags for better jsdoc3 tolerance
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/actions.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/actions.js
index e6359c9..ca16e8c 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/actions.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/actions.js
@@ -608,7 +608,7 @@
 		 * @param {orion.editor.ContentAssist#ProposalAppliedEvent} event

 		 */

 		contentAssistProposalApplied: function(event) {

-			/**

+			/*

 			 * The event.proposal is an object with this shape:

 			 * {   proposal: "[proposal string]", // Actual text of the proposal

 			 *     description: "diplay string", // Optional

diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/annotations.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/annotations.js
index 0c02235..f3031b4 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/annotations.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/annotations.js
@@ -366,7 +366,7 @@
 	/**
 	 * Constructs an annotation model.
 	 * 
-	 * @param {textModel} textModel The text model.
+	 * @param {orion.editor.TextModel} textModel The text model.
 	 * 
 	 * @class This object manages annotations for a <code>TextModel</code>.
 	 * <p>
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
index 403587a..e295731 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
@@ -247,8 +247,8 @@
 			}

 		},

 		/**

-		 * @private

 		 * Retrieves the proposals at the given offset.

+		 * @private

 		 * @param {Number} offset The caret offset.

 		 * @returns {Deferred} A promise that will provide the proposals.

 		 */

diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/mirror.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/mirror.js
index 13115ff..2ba124f 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/mirror.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/mirror.js
@@ -105,8 +105,8 @@
 	/**
 	 * @name orion.mirror.Mirror
 	 * @class A shim for CodeMirror's <code>CodeMirror</code> API.
-	 * @description A Mirror is a partial implementation of the API provided by the <a href="http://codemirror.net/doc/manual.html#api">
-	 * <code>CodeMirror</code> object</a>. Mirror provides functionality related to mode and MIME management.
+	 * @description A Mirror is a partial implementation of the API provided by the <code><a href="http://codemirror.net/doc/manual.html#api">CodeMirror object</a></code>.
+	 * Mirror provides functionality related to mode and MIME management.
 	 * 
 	 * <p>If clients intend to reuse modes provided by CodeMirror without modification, they must expose a Mirror as 
 	 * a property named <code>"CodeMirror"</code> of the global object so that modes may access it to register themselves,
@@ -224,7 +224,6 @@
 	/**
 	 * @name orion.mirror.MirrorLineStyle
 	 * @class Represents the style provided by a CodeMirror mode for a line.
-	 * @description 
 	 */
 	/**
 	 * @name orion.mirror.ModeApplier
@@ -606,11 +605,9 @@
 		 * @param {Number} [lineIndex] The line index of the line having the given style. If omitted, the returned 
 		 * {@link orion.editor.StyleRange[]} objects will have offsets relative to the line, not the document.
 		 * 
-		 * @returns {orion.editor.StyleRange[][]} An array of 2 elements. The first element is an {@link orion.editor.StyleRange[]}
-		 * giving the styles for the line. 
-		 * <p>The second element is an {@link orion.editor.StyleRange[]} containing only those elements of
-		 * the first array that represent syntax errors. (By CodeMirror convention, anything assigned the <code>"cm-error"</code> tag
-		 * is assumed to be an error).</p>
+		 * @returns {Array} An array of 2 elements. The first element is an {@link orion.editor.StyleRange[]} giving the styles for the line. 
+		 * The second element is an {@link orion.editor.StyleRange[]} containing only those elements of the first array that represent
+		 * syntax errors. (By CodeMirror convention, anything assigned the <code>"cm-error"</code> tag is assumed to be an error).</p>
 		 */
 		toStyleRangesAndErrors: function(lineStyle, lineIndex) {
 			function token2Class(token) {
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textMateStyler.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textMateStyler.js
index 8a1de3b..e4269cd 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textMateStyler.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textMateStyler.js
@@ -100,8 +100,11 @@
 	/**
 	 * Checks if flag applies to entire pattern. If so, obtains replacement string by calling processor
 	 * on the unwrapped pattern. Handles 2 possible syntaxes: (?f)pat and (?f:pat)
+	 * @param {String} flag
+	 * @param {String} str
+	 * @param {Function} processor
 	 */
-	processGlobalFlag: function(/**String*/ flag, /**String*/ str, /**Function*/ processor) {
+	processGlobalFlag: function(flag, str, processor) {
 		function getMatchingCloseParen(/*String*/pat, /*Number*/start) {
 			var depth = 0,
 			    len = pat.length,
@@ -515,8 +518,8 @@
 		},
 		
 		/**
-		 * @private
 		 * Adds eclipse.Style objects for scope to our _styles cache.
+		 * @private
 		 * @param {String} scope A scope name, like "constant.character.php".
 		 */
 		addStyles: function(scope) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js b/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js
index 40f2c31..e8a9e22 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js
@@ -406,7 +406,7 @@
 		 * Add a command to the command registry.  Nothing will be shown in the UI
 		 * until this command is referenced in a contribution.
 		 * @param {orion.commands.Command} command The command being added.
-		 * @see #registerCommandContribution
+		 * @see registerCommandContribution
 		 */
 		addCommand: function(command) {
 			this._commandList[command.id] = command;
@@ -555,7 +555,7 @@
 		},
 
 		/**
-		 * @param {"key"|"url"} type
+		 * @param {String} type One of <code>"key"</code>, <code>"url"</code>.
 		 */
 		_addBinding: function(command, type, binding, bindingOnly) {
 			if (!command.id) {
@@ -570,7 +570,7 @@
 
 		/**
 		 * Remembers a key or url binding that has not yet been resolved to a command.
-		 *  @param {"key"|"url"} type
+		 * @param {String} type One of <code>"key"</code>, <code>"url"</code>.
 		 */
 		_addPendingBinding: function(commandId, type, binding, bindingOnly) {
 			this._pendingBindings[commandId] = this._pendingBindings[commandId] || [];
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareView.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareView.js
index b8d7538..54a405f 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareView.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareView.js
@@ -167,7 +167,7 @@
 		 * <p>
 		 * If 0 is returned on the chnageNumber, it means the whole diff block is highlighted.
 		 * </p>
-		 * @returns the 1-based {blockNumber, changeNumber} current diff location.
+		 * @returns {Object} the 1-based {blockNumber, changeNumber} current diff location.
 		 */
 		getCurrentDiffPos: function(){	
 			return this._diffNavigator.getCurrentPosition();
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/progress.js b/bundles/org.eclipse.orion.client.ui/web/orion/progress.js
index c0973dd..ae94378 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/progress.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/progress.js
@@ -225,7 +225,7 @@
 			 * the operation completes.

 			 * @param deferred {orion.Deferred} Deferred to track

 			 * @param message {String} Message to display

-			 * @returns

+			 * @returns {orion.Promise}

 			 */

 			showWhile: function(deferred, message){

 				if(message) {

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/settings/settingsRegistry.js b/bundles/org.eclipse.orion.client.ui/web/orion/settings/settingsRegistry.js
index 529a82c..def9bcb 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/settings/settingsRegistry.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/settings/settingsRegistry.js
@@ -36,7 +36,6 @@
 		/**
 		 * @name orion.settings.Setting#isDefaults
 		 * @function
-		 * @description
 		 * @param {Object} properties A map of AttributeDefinition IDs to values.
 		 * @returns {Boolean} <code>true</code> if <code>properties</code> contains a key for each of this setting's
 		 * AttributeDefinitions, and the corresponding value equals the AttributeDefinition's default value.
@@ -44,37 +43,31 @@
 		/**
 		 * @name orion.settings.Setting#getCategory
 		 * @function
-		 * @description
 		 * @returns {String} The category of this setting.
 		 */
 		/**
 		 * @name orion.settings.Setting#getPid
 		 * @function
-		 * @description
 		 * @returns {String}
 		 */
 		/**
 		 * @name orion.settings.Setting#getObjectClassDefinitionId
 		 * @function
-		 * @description
 		 * @returns {String}
 		 */
 		/**
 		 * @name orion.settings.Setting#getName
 		 * @function
-		 * @description
 		 * @returns {String}
 		 */
 		/**
 		 * @name orion.settings.Setting#getAttributeDefinitions
 		 * @function
-		 * @description
 		 * @returns {orion.metatype.AttributeDefinition[]}
 		 */
 		/**
 		 * @name orion.settings.Setting#getTags
 		 * @function
-		 * @description
 		 * @returns {String[]}
 		 */
 	function SettingImpl(json) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/uiUtils.js b/bundles/org.eclipse.orion.client.ui/web/orion/uiUtils.js
index 11b70f6..409e4c7 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/uiUtils.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/uiUtils.js
@@ -119,7 +119,7 @@
 	 * @param {Boolean} isInitialValid
 	 */
 	function getUserText(id, refNode, shouldHideRefNode, initialText, onComplete, onEditDestroy, promptMessage, selectTo, isInitialValid) {
-		/** @return function(event) */
+		/** @return {Function} function(event) */
 		var done = false;
 		var handler = function(isKeyEvent) {
 			return function(event) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/plugins/esprima/proposalUtils.js b/bundles/org.eclipse.orion.client.ui/web/plugins/esprima/proposalUtils.js
index 319b4ad..128fbc1 100644
--- a/bundles/org.eclipse.orion.client.ui/web/plugins/esprima/proposalUtils.js
+++ b/bundles/org.eclipse.orion.client.ui/web/plugins/esprima/proposalUtils.js
@@ -18,7 +18,7 @@
 	 * Match ignoring case and checking camel case.
 	 * @param prefix
 	 * @param target
-	 * @return
+	 * @return {Boolean}
 	 */
 	looselyMatches: function(prefix, target) {
 		if (target === null || prefix === null) {