<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -159,28 +159,34 @@ module ActionController #:nodoc:
   #
   #   Hello #{session[:person]}
   #
-  # For removing objects from the session, you can either assign a single key to nil, like &lt;tt&gt;session[:person] = nil&lt;/tt&gt;, or you can
-  # remove the entire session with reset_session.
+  # For removing objects from the session, you can either assign a single key to +nil+:
   #
-  # Sessions are stored in a browser cookie that's cryptographically signed, but unencrypted, by default. This prevents
-  # the user from tampering with the session but also allows him to see its contents.
+  #   # removes :person from session
+  #   session[:person] = nil
   #
-  # Do not put secret information in session!
+  # or you can remove the entire session with +reset_session+.
+  #
+  # Sessions are stored by default in a browser cookie that's cryptographically signed, but unencrypted.
+  # This prevents the user from tampering with the session but also allows him to see its contents.
+  #
+  # Do not put secret information in cookie-based sessions!
   #
   # Other options for session storage are:
   #
-  # ActiveRecordStore: sessions are stored in your database, which works better than PStore with multiple app servers and,
-  # unlike CookieStore, hides your session contents from the user. To use ActiveRecordStore, set
+  # * ActiveRecordStore - Sessions are stored in your database, which works better than PStore with multiple app servers and,
+  #   unlike CookieStore, hides your session contents from the user. To use ActiveRecordStore, set
   #
-  #   config.action_controller.session_store = :active_record_store
+  #     config.action_controller.session_store = :active_record_store
   #
-  # in your &lt;tt&gt;environment.rb&lt;/tt&gt; and run &lt;tt&gt;rake db:sessions:create&lt;/tt&gt;.
+  #   in your &lt;tt&gt;config/environment.rb&lt;/tt&gt; and run &lt;tt&gt;rake db:sessions:create&lt;/tt&gt;.
   #
-  # MemCacheStore: sessions are stored as entries in your memcached cache.  Set the session store type in &lt;tt&gt;environment.rb&lt;/tt&gt;:
+  # * MemCacheStore - Sessions are stored as entries in your memcached cache.
+  #   Set the session store type in &lt;tt&gt;config/environment.rb&lt;/tt&gt;:
   #
-  #   config.action_controller.session_store = :mem_cache_store
+  #     config.action_controller.session_store = :mem_cache_store
   #
-  #  This assumes that memcached has been installed and configured properly.  See the MemCacheStore docs for more information.
+  #   This assumes that memcached has been installed and configured properly.
+  #   See the MemCacheStore docs for more information.
   #
   # == Responses
   #</diff>
      <filename>actionpack/lib/action_controller/base.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>080d5b7acb696190e0c2d1cba46951371f27bc26</id>
    </parent>
  </parents>
  <author>
    <name>Xavier Noria</name>
    <email>fxn@hashref.com</email>
  </author>
  <url>http://github.com/lifo/docrails/commit/88e4de5ab71388bd7f58713dfd15bb594971ae79</url>
  <id>88e4de5ab71388bd7f58713dfd15bb594971ae79</id>
  <committed-date>2008-05-07T02:23:54-07:00</committed-date>
  <authored-date>2008-05-07T02:23:54-07:00</authored-date>
  <message>revised a few details in session docs</message>
  <tree>aa17f53d8ce7ec8bb1906fe6185a7d9b82072a27</tree>
  <committer>
    <name>Xavier Noria</name>
    <email>fxn@hashref.com</email>
  </committer>
</commit>
