Index: /CKEditor/trunk/_dev/docs_build/template/class.tmpl
===================================================================
--- /CKEditor/trunk/_dev/docs_build/template/class.tmpl	(revision 4906)
+++ /CKEditor/trunk/_dev/docs_build/template/class.tmpl	(revision 4907)
@@ -598,5 +598,5 @@
 				<for each="member" in="ownEvents">
 					<a name="event:{+Link.symbolNameToLinkName(member)+}"> </a>
-					<div class="fixedFont">{!
+					<div class="fixedFont" style="float:left">{!
 						if (member.isPrivate) output += "&lt;private&gt; ";
 						if (member.isInner) output += "&lt;inner&gt; ";
@@ -605,7 +605,17 @@
 					
 					<if test="member.type"><span class="light">{{+new Link().toSymbol(member.type)+}}</span></if>
-					<if test="member.isStatic && member.memberOf != '_global_'"><span class="light">{+member.memberOf+}.</span></if><b>{+member.name+}</b>{+makeSignature(member.params)+}
-					
-					</div>
+					<if test="member.isStatic && member.memberOf != '_global_'"><span class="light">{+member.memberOf+}.</span></if>
+					<b>{+member.name+}</b> : &lt;object&gt;.{+new Link().toSymbol('CKEDITOR.event#on').withText('on')+}( '{+member.name+}', function( e ){ ... } )
+					
+					</div>
+					<div style="float:right">
+						<span class="heading">Since:</span>
+							<if test="member.since">
+								{+ member.since +}
+							<else />
+								3.0
+							</if>
+					</div>
+					<div style="clear:both"></div>
 					<div class="description">
 						{+resolveLinks(member.desc)+}
@@ -619,14 +629,22 @@
 					<if test="member.example.length">
 					<for each="example" in="member.example">
-					<pre class="code">{+example+}</pre>
+						<if test="example.desc">
+							<pre class="code">{+example+}</pre>
+						</if>
 					</for>
-					</if>
-					
-						<if test="member.params.length">
+					<else />
+						<pre class="code"><span style="color:red">NO EXAMPLE AVAILABLE</span></pre>
+					</if>
+					
 							<dl class="detailList">
 							<dt class="heading">Parameters:</dt>
+								<dt>
+									<span class="light fixedFont">{{+new Link().toSymbol('CKEDITOR.eventInfo')+}}</span> <b>e</b>
+								</dt>
+								<dd>The standard event object passed to event listeners.</dd>
+
 							<for each="item" in="member.params">
 								<dt>
-									{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+}<b>{+item.name+}</b>
+									{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+}<b>e.{+item.name+}</b>
 									<if test="item.isOptional"><i>Optional<if test="item.defaultValue">, Default: {+item.defaultValue+}</if></i></if>
 								</dt>
@@ -634,5 +652,5 @@
 							</for>
 							</dl>
-						</if>
+
 						<if test="member.deprecated">
 							<dl class="detailList">
@@ -641,11 +659,4 @@
 								{+ resolveLinks(member.deprecated) +}
 							</dt>
-							</dl>
-						</if>
-						<if test="member.since">
-							<dl class="detailList">
-							<dt class="heading">Since:</dt>
-								<dd>{+ member.since +}</dd>
-							</dl>
 							</dl>
 						</if>
Index: /CKEditor/trunk/_source/core/_bootstrap.js
===================================================================
--- /CKEditor/trunk/_source/core/_bootstrap.js	(revision 4906)
+++ /CKEditor/trunk/_source/core/_bootstrap.js	(revision 4907)
@@ -82,4 +82,3 @@
  * @name CKEDITOR#loaded
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
  */
Index: /CKEditor/trunk/_source/core/ckeditor.js
===================================================================
--- /CKEditor/trunk/_source/core/ckeditor.js	(revision 4906)
+++ /CKEditor/trunk/_source/core/ckeditor.js	(revision 4907)
@@ -101,4 +101,3 @@
  * @name CKEDITOR#currentInstance
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
  */
Index: /CKEditor/trunk/_source/core/editor.js
===================================================================
--- /CKEditor/trunk/_source/core/editor.js	(revision 4906)
+++ /CKEditor/trunk/_source/core/editor.js	(revision 4907)
@@ -699,6 +699,5 @@
  * @name CKEDITOR#instanceCreated
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {CKEDITOR.editor} e.editor The editor instance that has been created.
+ * @param {CKEDITOR.editor} editor The editor instance that has been created.
  */
 
@@ -707,6 +706,5 @@
  * @name CKEDITOR#instanceDestroyed
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {CKEDITOR.editor} e.editor The editor instance that has been destroyed.
+ * @param {CKEDITOR.editor} editor The editor instance that has been destroyed.
  */
 
@@ -715,4 +713,3 @@
  * @name CKEDITOR#pluginsLoaded
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
  */
Index: /CKEditor/trunk/_source/core/focusmanager.js
===================================================================
--- /CKEditor/trunk/_source/core/focusmanager.js	(revision 4906)
+++ /CKEditor/trunk/_source/core/focusmanager.js	(revision 4907)
@@ -127,6 +127,5 @@
  * @name CKEDITOR.editor#focus
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {CKEDITOR.editor} e.editor The editor instance.
+ * @param {CKEDITOR.editor} editor The editor instance.
  */
 
@@ -135,5 +134,4 @@
  * @name CKEDITOR.editor#blur
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {CKEDITOR.editor} e.editor The editor instance.
+ * @param {CKEDITOR.editor} editor The editor instance.
  */
Index: /CKEditor/trunk/_source/plugins/clipboard/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/clipboard/plugin.js	(revision 4906)
+++ /CKEditor/trunk/_source/plugins/clipboard/plugin.js	(revision 4907)
@@ -365,6 +365,5 @@
  * @since 3.1
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {String} [e.data.html] The HTML data to be pasted. If not available, e.data.text will be defined.
- * @param {String} [e.data.text] The plain text data to be pasted, available when plain text operations are to used. If not available, e.data.html will be defined.
+ * @param {String} [data.html] The HTML data to be pasted. If not available, e.data.text will be defined.
+ * @param {String} [data.text] The plain text data to be pasted, available when plain text operations are to used. If not available, e.data.html will be defined.
  */
Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 4906)
+++ /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 4907)
@@ -2788,8 +2788,7 @@
  * @name CKEDITOR#dialogDefinition
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {CKEDITOR.dialog.dialogDefinition} e.data The dialog defination that
+ * @param {CKEDITOR.dialog.dialogDefinition} data The dialog defination that
  *		is being loaded.
- * @param {CKEDITOR.editor} e.editor The editor instance that will use the
+ * @param {CKEDITOR.editor} editor The editor instance that will use the
  *		dialog.
  */
Index: /CKEditor/trunk/_source/plugins/editingblock/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/editingblock/plugin.js	(revision 4906)
+++ /CKEditor/trunk/_source/plugins/editingblock/plugin.js	(revision 4907)
@@ -240,5 +240,4 @@
  * @name CKEDITOR#instanceReady
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {CKEDITOR.editor} e.editor The editor instance that has been created.
- */
+ * @param {CKEDITOR.editor} editor The editor instance that has been created.
+ */
Index: /CKEditor/trunk/_source/plugins/keystrokes/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/keystrokes/plugin.js	(revision 4906)
+++ /CKEditor/trunk/_source/plugins/keystrokes/plugin.js	(revision 4907)
@@ -222,6 +222,5 @@
  * @name CKEDITOR#key
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
- * @param {Number} e.data.keyCode A number representing the key code (or
+ * @param {Number} data.keyCode A number representing the key code (or
  *		combination). It is the sum of the current key code and the
  *		{@link CKEDITOR.CTRL}, {@link CKEDITOR.SHIFT} and {@link CKEDITOR.ALT}
Index: /CKEditor/trunk/_source/plugins/undo/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/undo/plugin.js	(revision 4906)
+++ /CKEditor/trunk/_source/plugins/undo/plugin.js	(revision 4907)
@@ -510,4 +510,3 @@
  * @name CKEDITOR.editor#saveSnapshot
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
  */
Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 4906)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 4907)
@@ -851,4 +851,3 @@
  * @name CKEDITOR.editor#dataReady
  * @event
- * @param {CKEDITOR.eventInfo} e The standard event object passed to listeners.
  */