Fixed the docs for noConflict, fixed a bug with pager.

diff --git a/build/docs/js/pager.js b/build/docs/js/pager.js
index 8370befd27cbcdf8dc1839e8de348635baa59af5..44f2e6942fed343bdc9f791024d7a75ab13220aa 100644 (file)
--- 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 893a397d7971cb800d5a91c9990053121788fc02..3b0f82e31531262472cd3ea8dd23198a3ec773fb 100644 (file)
--- 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._$;
        },