[Checkins] SVN: grok/branches/1.1/ update changelog, add a upgrade section

[Jan-Wijbrand Kolman]

Log message for revision 112470:
  update changelog, add a upgrade section

Changed:
  U   grok/branches/1.1/CHANGES.txt
  U   grok/branches/1.1/doc/upgrade.txt

-=-
Modified: grok/branches/1.1/CHANGES.txt
===================================================================
--- grok/branches/1.1/CHANGES.txt	2010-05-18 18:08:36 UTC (rev 112469)
+++ grok/branches/1.1/CHANGES.txt	2010-05-18 18:44:59 UTC (rev 112470)
@@ -4,9 +4,8 @@
 1.1 (unreleased)
 ================
 
-- Nothing changed yet.
+- Add zope.pluggablauth as a dependency.
 
-
 1.1rc1 (2010-02-25)
 ===================
 

Modified: grok/branches/1.1/doc/upgrade.txt
===================================================================
--- grok/branches/1.1/doc/upgrade.txt	2010-05-18 18:08:36 UTC (rev 112469)
+++ grok/branches/1.1/doc/upgrade.txt	2010-05-18 18:44:59 UTC (rev 112470)
@@ -13,6 +13,22 @@
 
 .. _upgrade_notes_1.1rc1:
 
+Upgrading to 1.1 (2010-05-18)
+-----------------------------
+
+* When upgrading to a newer version of Grok, you should refer to the
+  newest list of versions as defined for this release of Grok.
+
+  For Grok 1.1, download the following file::
+
+    http://grok.zope.org/releaseinfo/grok-1.1.cfg
+
+  And replace ``versions.cfg`` in your project with this file. Then run::
+
+    ./bin/buildout
+
+.. _upgrade_notes_1.1rc1:
+
 Upgrading to 1.1rc1 (2010-02-25)
 -------------------------------