From 458d427c0e4af4502e14400110b5327aa2513781 Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Sat, 6 Jan 2007 22:34:12 +0000
Subject: [PATCH] Fixed the docs for noConflict, fixed a bug with pager.

---
 build/docs/js/pager.js |    4 +++-
 src/jquery/jquery.js   |   14 +++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build/docs/js/pager.js b/build/docs/js/pager.js
index 8370bef..44f2e69 100644
--- a/build/docs/js/pager.js
+++ b/build/docs/js/pager.js
@@ -68,7 +68,9 @@ $.fn.pager = function(step) {
         pager = $("<ul class='nav-page'></ul>");
 
       for ( var i = 0; i < names.length; i++ )
-        $("<a href=''></a>").rel( i ).html( names[i] ).click(function() {
+        $("<a href=''></a>").attr({
+          rel: i, innerHTML: names[i]
+        }).click(function() {
           return handleCrop( this.rel );
         }).wrap("<li></li>").parent().appendTo(pager);
 
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 893a397..3b0f82e 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1130,28 +1130,32 @@ jQuery.extend({
 	 * using the 'jQuery' variable. For example, where you used to do
 	 * $("div p"), you now must do jQuery("div p").
 	 *
-	 * @example $.noConflict();
+	 * @example jQuery.noConflict();
+	 * // Do something with jQuery
+	 * jQuery("div p").hide();
+	 * // Do something with another library's $()
+	 * $("content").style.display = 'none';
 	 * @desc Maps the original object that was referenced by $ back to $
 	 *
-	 * @example $.noConflict();
+	 * @example jQuery.noConflict();
 	 * (function($) { 
 	 *   $(function() {
 	 *     // more code using $ as alias to jQuery
 	 *   });
 	 * })(jQuery);
-	 * // other code using $ as an alias to the original implementation (not jQuery)
+	 * // other code using $ as an alias to the other library
 	 * @desc Reverts the $ alias and then creates and executes a
 	 * function to provide the $ as a jQuery alias inside the functions
 	 * scope. Inside the function the original $ object is not available.
 	 * This works well for most plugins that don't rely on any other library.
 	 * 
 	 *
-	 * @name noConflict
+	 * @name $.noConflict
 	 * @type undefined
 	 * @cat Core 
 	 */
 	noConflict: function() {
-		if(jQuery._$)
+		if ( jQuery._$ )
 			$ = jQuery._$;
 	},
 
-- 
1.7.10.4