Ticket #9833: render_json_docfix.diff

actionpack/lib/action_controller/base.rb

@@ -748 +748 @@
-      #
-      # === Rendering JSON
-      #
-text/x-
-eval'd
+application/
+parsed (or eval'd)
-      #
-name
+"name"
-      #   render :json => {:name => "David"}.to_json
-      #
+      # It's not necessary to call <tt>to_json</tt> on the object you want to render, since <tt>render</tt> will
+      # automatically do that for you:
+      #
+      #   # Also renders '{"name": "David"}'
+      #   render :json => {:name => "David"}
+      #
-      # Sometimes the result isn't handled directly by a script (such as when the request comes from a SCRIPT tag),
-callback
+<tt>:callback</tt>
-      #
-name
+"name"
-      #   render :json => {:name => "David"}.to_json, :callback => 'show'
-      #
-      # === Rendering an inline template

actionpack/lib/action_controller/mime_type.rb

@@ -52 +52 @@
-        EXTENSION_LOOKUP[extension]
-      end
-
-
+e
-      # rendering different HTML versions depending on the user agent, like an iPhone.
-      def register_alias(string, symbol, extension_synonyms = [])
-        register(string, symbol, [], extension_synonyms, true)