[Checkins] SVN: grok/branches/d2m-ztk-support/ add changes description, fix sphinx config

[Michael Haubenwallner]

Log message for revision 105596:
  add changes description, fix sphinx config

Changed:
  U   grok/branches/d2m-ztk-support/CHANGES.txt
  U   grok/branches/d2m-ztk-support/doc/conf.py

-=-
Modified: grok/branches/d2m-ztk-support/CHANGES.txt
===================================================================
--- grok/branches/d2m-ztk-support/CHANGES.txt	2009-11-13 11:22:54 UTC (rev 105595)
+++ grok/branches/d2m-ztk-support/CHANGES.txt	2009-11-13 11:50:05 UTC (rev 105596)
@@ -29,7 +29,14 @@
 
 * Remove the ``grok.View`` permission declaration in ``etc/site.zcml.in``, 
   should have gone in 1.0b2 already
+  
+* this release depends on grokcore.view 1.13
 
+* add ZTK support (currently ZTK 1.0dev)
+
+* grokdocs now uses ZTK pinned versions
+
+
 1.0 (2009-10-07)
 ================
 

Modified: grok/branches/d2m-ztk-support/doc/conf.py
===================================================================
--- grok/branches/d2m-ztk-support/doc/conf.py	2009-11-13 11:22:54 UTC (rev 105595)
+++ grok/branches/d2m-ztk-support/doc/conf.py	2009-11-13 11:50:05 UTC (rev 105596)
@@ -19,15 +19,13 @@
 
 version = 'Unknown'
 setupfilepath = path.join(path.dirname(path.abspath(curdir)), 'setup.py')
-reg = re.compile("^\s*version=.(.+).,.*")
-for line in open(setupfilepath, 'r').read().split():
+reg = re.compile("^\s*version = .(.+).,.*")
+for line in open(setupfilepath, 'r').read().split('\n'):
     m = reg.match(line)
     if m:
         version = m.groups()[0]
 
 
-
-
 # If your extensions are in another directory, add it here.
 #sys.path.append('some/directory')
 
@@ -49,7 +47,7 @@
 
 # General substitutions.
 project = 'Official Grok'
-copyright = '2006-2008, The Zope Foundation'
+copyright = '2006-2009, The Zope Foundation'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.