Author: matthias.klose Date: Thu Aug 2 23:28:57 2007 New Revision: 56679 Modified: python/branches/release25-maint/Doc/info/Makefile python/branches/release25-maint/Misc/NEWS Log: - Allow Emacs 22 for building the documentation in info format. Modified: python/branches/release25-maint/Doc/info/Makefile ============================================================================== --- python/branches/release25-maint/Doc/info/Makefile (original) +++ python/branches/release25-maint/Doc/info/Makefile Thu Aug 2 23:28:57 2007 @@ -34,10 +34,10 @@ check-emacs-version: @v="`$(EMACS) --version 2>&1 | egrep '^(GNU |X)Emacs [12]*'`"; \ - if `echo "$$v" | grep '^GNU Emacs 21' >/dev/null 2>&1`; then \ + if `echo "$$v" | grep '^GNU Emacs 2[12]' >/dev/null 2>&1`; then \ echo "Using $(EMACS) to build the info docs"; \ else \ - echo "GNU Emacs 21 is required to build the info docs"; \ + echo "GNU Emacs 21 or 22 is required to build the info docs"; \ echo "Found $$v"; \ false; \ fi Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Thu Aug 2 23:28:57 2007 @@ -106,6 +106,8 @@ - Patch #1673122: Use an explicit path to libtool when building a framework. This avoids picking up GNU libtool from a users PATH. +- Allow Emacs 22 for building the documentation in info format. + What's New in Python 2.5.1? =============================