3 files changed, 165 insertions, 110 deletions

diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile
index d03fada494a9..3d8a2525bcee 100644
--- a/www/google-appengine/Makefile
+++ b/www/google-appengine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	google-appengine
-PORTVERSION=	1.1.7
+PORTVERSION=	1.1.8
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	www devel python
@@ -39,7 +39,7 @@ XARGS_ARGS=	-0
 REINPLACE_ARGS=	-i.bak -e 's,/usr/bin/env python,&${PYTHON_VER},'
 
 GAEDATADIR=	google lib new_project_template templates tools
-GAEDOCSREL=	20081003
+GAEDOCSREL=	20090115
 
 post-patch:
 	@${FIND} ${FIND_FILES} | ${XARGS} ${XARGS_ARGS} ${REINPLACE_CMD}
diff --git a/www/google-appengine/distinfo b/www/google-appengine/distinfo
index 9964e0495bc4..787d1b871090 100644
--- a/www/google-appengine/distinfo
+++ b/www/google-appengine/distinfo
@@ -1,6 +1,6 @@
-MD5 (google_appengine_1.1.7.zip) = 467d440b43eee0a54ef071ca380e9d7e
-SHA256 (google_appengine_1.1.7.zip) = 20c612573b913bb4eb85f4606d24e4cf82db265b692641c56607d3a694d20664
-SIZE (google_appengine_1.1.7.zip) = 2731694
-MD5 (google-appengine-docs-20081003.zip) = 4285bef20ad7a6cfe5215b32bd1eccca
-SHA256 (google-appengine-docs-20081003.zip) = a079d15dca90b41520f7caf162e35ed846b77d9da528d0865a81836b773ee822
-SIZE (google-appengine-docs-20081003.zip) = 2031495
+MD5 (google_appengine_1.1.8.zip) = 19e8b7050cc6b4112d581ccc350c19bc
+SHA256 (google_appengine_1.1.8.zip) = 217ea5f1e88dbcbb933b43facb8d8439c4a77ac0bad66bdf319e9a5cdb1ba10d
+SIZE (google_appengine_1.1.8.zip) = 2860558
+MD5 (google-appengine-docs-20090115.zip) = 82835b39d4c913fc038a155f1a2670d2
+SHA256 (google-appengine-docs-20090115.zip) = b693a04ae03e73c78a5e7e6c3fe7b5a9483007602002f79be7ef2914fd2c1037
+SIZE (google-appengine-docs-20090115.zip) = 2133827
diff --git a/www/google-appengine/pkg-plist b/www/google-appengine/pkg-plist
index a5cf77519dbf..b26efe31384d 100644
--- a/www/google-appengine/pkg-plist
+++ b/www/google-appengine/pkg-plist
@@ -35,133 +35,141 @@ bin/dev_appserver.py
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/gdata.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/images.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/articles/index_building.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/logging.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/logs_admin.png
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/modeling.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/articles/more_google_data.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/articles/paging.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/pure_django.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/quotas.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/rietveld.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/rpc.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/articles/sharding_counters.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/transaction_iso.png
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/transaction_isolation.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/update_schema.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/articles/versions.png
+%%PORTDOCS%%%%DOCSDIR%%/appengine/casestudies.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/css/local_extensions.css
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/appcfgpy.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/configuringanapp.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/configuringindexes.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/creatinggettinganddeletingdata.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/entitiesandmodels.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/exceptions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/expandoclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/gqlqueryclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/gqlreference.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/keyclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/keysandentitygroups.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/modelclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/propertyclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/queriesandindexes.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/queryclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/transactions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/datastore/typesandpropertyclasses.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/devenvironment.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/handlingforms.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/helloworld.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/staticfiles.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/templates.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/uploading.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/usingdatastore.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/usingusers.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/gettingstarted/usingwebapp.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/exceptions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/imageclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/installingPIL.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/transform_before.gif
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/transform_crop_after.png
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/transform_fliph_after.jpg
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/transform_flipv_after.jpg
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/transform_lucky_after.png
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/transform_resize_after.jpg
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/transform_rotate_after.jpg
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/images/usingimages.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/docs/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/attachments.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/emailmessageclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/emailmessagefields.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/exceptions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/mail/sendingmail.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/memcache/clientclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/memcache/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/memcache/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/memcache/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/memcache/usingmemcache.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/appcaching.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/apis.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/creatinggettinganddeletingdata.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/entitiesandmodels.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/expandoclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/gqlqueryclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/gqlreference.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/keyclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/keysandentitygroups.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/modelclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/polymodelclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/propertyclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/queriesandindexes.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/queryclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/transactions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/datastore/typesandpropertyclasses.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/devenvironment.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/handlingforms.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/helloworld.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/staticfiles.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/templates.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/uploading.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/usingdatastore.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/usingusers.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/gettingstarted/usingwebapp.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/imageclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/installingPIL.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/transform_before.gif
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/transform_crop_after.png
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/transform_fliph_after.jpg
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/transform_flipv_after.jpg
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/transform_lucky_after.png
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/transform_resize_after.jpg
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/transform_rotate_after.jpg
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/images/usingimages.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/logging.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/purepython.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/requestsandcgi.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/sandbox.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/thedevwebserver.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/theenvironment.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/attachments.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/emailmessageclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/emailmessagefields.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/mail/sendingmail.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/memcache/clientclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/memcache/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/memcache/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/memcache/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/memcache/usingmemcache.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/runtime.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/devserver.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/uploadinganapp.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/buildingtheresponse.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/redirects.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/requestclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/requestdata.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/requesthandlerclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/requesthandlers.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/responseclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/running.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/utilmodule.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/tools/webapp/wsgiapplicationclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/urlfetch/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/urlfetch/fetchfunction.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/urlfetch/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/urlfetch/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/urlfetch/responseobjects.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/adminusers.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/index.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/loginurls.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/userclass.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/python/users/userobjects.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/quotas.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/docs/revision_history.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/roadmap.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/docs/theadminconsole.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/thedevwebserver.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/urlfetch/exceptions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/urlfetch/fetchfunction.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/urlfetch/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/urlfetch/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/urlfetch/responseobjects.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/adminusers.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/exceptions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/loginurls.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/userclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/users/userobjects.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/docs/usinggdataservices.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/buildingtheresponse.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/index.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/redirects.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/requestclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/requestdata.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/requesthandlerclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/requesthandlers.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/responseclass.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/running.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/utilmodule.html
-%%PORTDOCS%%%%DOCSDIR%%/appengine/docs/webapp/wsgiapplicationclass.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/docs/whatisgoogleappengine.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/downloads.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/groups.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/images/appengine-noborder-120x30.gif
 %%PORTDOCS%%%%DOCSDIR%%/appengine/images/appengine-silver-120x30.gif
 %%PORTDOCS%%%%DOCSDIR%%/appengine/images/appengine_lowres.jpg
+%%PORTDOCS%%%%DOCSDIR%%/appengine/images/buddypoke.gif
+%%PORTDOCS%%%%DOCSDIR%%/appengine/images/cloudstatus.gif
 %%PORTDOCS%%%%DOCSDIR%%/appengine/images/demo_video.jpg
-%%PORTDOCS%%%%DOCSDIR%%/appengine/images/free.gif
-%%PORTDOCS%%%%DOCSDIR%%/appengine/images/noassembly.gif
-%%PORTDOCS%%%%DOCSDIR%%/appengine/images/scale.gif
+%%PORTDOCS%%%%DOCSDIR%%/appengine/images/pixverse.gif
+%%PORTDOCS%%%%DOCSDIR%%/appengine/images/tryitnow.png
 %%PORTDOCS%%%%DOCSDIR%%/appengine/index.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/kb/commontasks.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/kb/general.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/kb/index.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/kb/libraries.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/kb/sms.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/kb/status.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/kb/supported_carriers.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/privacy.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/program_policies.html
 %%PORTDOCS%%%%DOCSDIR%%/appengine/terms.html
+%%PORTDOCS%%%%DOCSDIR%%/appengine/whyappengine.html
 %%PORTDOCS%%%%DOCSDIR%%/css/codesite.pack.01312008.css
 %%PORTDOCS%%%%DOCSDIR%%/css/iehacks.css
 %%PORTDOCS%%%%DOCSDIR%%/css/semantic_headers.css
@@ -184,11 +192,16 @@ bin/dev_appserver.py
 %%DATADIR%%/google/appengine/__init__.py
 %%DATADIR%%/google/appengine/api/__init__.py
 %%DATADIR%%/google/appengine/api/api_base_pb.py
+%%DATADIR%%/google/appengine/api/apiproxy_rpc.py
 %%DATADIR%%/google/appengine/api/apiproxy_stub.py
 %%DATADIR%%/google/appengine/api/apiproxy_stub_map.py
 %%DATADIR%%/google/appengine/api/app_logging.py
 %%DATADIR%%/google/appengine/api/appinfo.py
 %%DATADIR%%/google/appengine/api/appinfo_errors.py
+%%DATADIR%%/google/appengine/api/capabilities/__init__.py
+%%DATADIR%%/google/appengine/api/capabilities/capability_service_pb.py
+%%DATADIR%%/google/appengine/api/capabilities/capability_stub.py
+%%DATADIR%%/google/appengine/api/croninfo.py
 %%DATADIR%%/google/appengine/api/datastore.py
 %%DATADIR%%/google/appengine/api/datastore_admin.py
 %%DATADIR%%/google/appengine/api/datastore_entities.py
@@ -219,6 +232,12 @@ bin/dev_appserver.py
 %%DATADIR%%/google/appengine/api/yaml_listener.py
 %%DATADIR%%/google/appengine/api/yaml_object.py
 %%DATADIR%%/google/appengine/base/__init__.py
+%%DATADIR%%/google/appengine/base/capabilities_pb.py
+%%DATADIR%%/google/appengine/cron/GrocLexer.py
+%%DATADIR%%/google/appengine/cron/GrocParser.py
+%%DATADIR%%/google/appengine/cron/__init__.py
+%%DATADIR%%/google/appengine/cron/groc.py
+%%DATADIR%%/google/appengine/cron/groctimespecification.py
 %%DATADIR%%/google/appengine/datastore/__init__.py
 %%DATADIR%%/google/appengine/datastore/datastore_index.py
 %%DATADIR%%/google/appengine/datastore/datastore_pb.py
@@ -244,8 +263,12 @@ bin/dev_appserver.py
 %%DATADIR%%/google/appengine/ext/bulkload/constants.py
 %%DATADIR%%/google/appengine/ext/db/__init__.py
 %%DATADIR%%/google/appengine/ext/db/djangoforms.py
+%%DATADIR%%/google/appengine/ext/db/polymodel.py
 %%DATADIR%%/google/appengine/ext/gql/__init__.py
 %%DATADIR%%/google/appengine/ext/preload/__init__.py
+%%DATADIR%%/google/appengine/ext/remote_api/__init__.py
+%%DATADIR%%/google/appengine/ext/remote_api/handler.py
+%%DATADIR%%/google/appengine/ext/remote_api/remote_api_pb.py
 %%DATADIR%%/google/appengine/ext/search/__init__.py
 %%DATADIR%%/google/appengine/ext/webapp/__init__.py
 %%DATADIR%%/google/appengine/ext/webapp/template.py
@@ -256,6 +279,7 @@ bin/dev_appserver.py
 %%DATADIR%%/google/appengine/runtime/apiproxy_errors.py
 %%DATADIR%%/google/appengine/tools/__init__.py
 %%DATADIR%%/google/appengine/tools/appcfg.py
+%%DATADIR%%/google/appengine/tools/appengine_rpc.py
 %%DATADIR%%/google/appengine/tools/bulkload_client.py
 %%DATADIR%%/google/appengine/tools/dev_appserver.py
 %%DATADIR%%/google/appengine/tools/dev_appserver_index.py
@@ -265,9 +289,33 @@ bin/dev_appserver.py
 %%DATADIR%%/google/appengine/tools/os_compat.py
 %%DATADIR%%/google/net/__init__.py
 %%DATADIR%%/google/net/proto/ProtocolBuffer.py
+%%DATADIR%%/google/net/proto/RawMessage.py
 %%DATADIR%%/google/net/proto/__init__.py
 %%DATADIR%%/google/pyglib/__init__.py
 %%DATADIR%%/google/pyglib/gexcept.py
+%%DATADIR%%/lib/antlr3/AUTHORS
+%%DATADIR%%/lib/antlr3/LICENSE
+%%DATADIR%%/lib/antlr3/MANIFEST.in
+%%DATADIR%%/lib/antlr3/OWNERS
+%%DATADIR%%/lib/antlr3/README
+%%DATADIR%%/lib/antlr3/antlr3/__init__.py
+%%DATADIR%%/lib/antlr3/antlr3/compat.py
+%%DATADIR%%/lib/antlr3/antlr3/constants.py
+%%DATADIR%%/lib/antlr3/antlr3/dfa.py
+%%DATADIR%%/lib/antlr3/antlr3/dottreegen.py
+%%DATADIR%%/lib/antlr3/antlr3/exceptions.py
+%%DATADIR%%/lib/antlr3/antlr3/extras.py
+%%DATADIR%%/lib/antlr3/antlr3/main.py
+%%DATADIR%%/lib/antlr3/antlr3/recognizers.py
+%%DATADIR%%/lib/antlr3/antlr3/streams.py
+%%DATADIR%%/lib/antlr3/antlr3/tokens.py
+%%DATADIR%%/lib/antlr3/antlr3/tree.py
+%%DATADIR%%/lib/antlr3/antlr3/treewizard.py
+%%DATADIR%%/lib/antlr3/antlr_python_runtime.egg-info/PKG-INFO
+%%DATADIR%%/lib/antlr3/antlr_python_runtime.egg-info/SOURCES.txt
+%%DATADIR%%/lib/antlr3/antlr_python_runtime.egg-info/dependency_links.txt
+%%DATADIR%%/lib/antlr3/antlr_python_runtime.egg-info/top_level.txt
+%%DATADIR%%/lib/antlr3/setup.py
 %%DATADIR%%/lib/django/AUTHORS
 %%DATADIR%%/lib/django/INSTALL
 %%DATADIR%%/lib/django/LICENSE
@@ -1382,6 +1430,9 @@ bin/dev_appserver.py
 @dirrm %%DATADIR%%/lib/django/django/bin
 @dirrm %%DATADIR%%/lib/django/django
 @dirrm %%DATADIR%%/lib/django
+@dirrm %%DATADIR%%/lib/antlr3/antlr_python_runtime.egg-info
+@dirrm %%DATADIR%%/lib/antlr3/antlr3
+@dirrm %%DATADIR%%/lib/antlr3
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/google/pyglib
 @dirrm %%DATADIR%%/google/net/proto
@@ -1391,6 +1442,7 @@ bin/dev_appserver.py
 @dirrm %%DATADIR%%/google/appengine/ext/zipserve
 @dirrm %%DATADIR%%/google/appengine/ext/webapp
 @dirrm %%DATADIR%%/google/appengine/ext/search
+@dirrm %%DATADIR%%/google/appengine/ext/remote_api
 @dirrm %%DATADIR%%/google/appengine/ext/preload
 @dirrm %%DATADIR%%/google/appengine/ext/gql
 @dirrm %%DATADIR%%/google/appengine/ext/db
@@ -1401,9 +1453,11 @@ bin/dev_appserver.py
 @dirrm %%DATADIR%%/google/appengine/ext/admin
 @dirrm %%DATADIR%%/google/appengine/ext
 @dirrm %%DATADIR%%/google/appengine/datastore
+@dirrm %%DATADIR%%/google/appengine/cron
 @dirrm %%DATADIR%%/google/appengine/base
 @dirrm %%DATADIR%%/google/appengine/api/memcache
 @dirrm %%DATADIR%%/google/appengine/api/images
+@dirrm %%DATADIR%%/google/appengine/api/capabilities
 @dirrm %%DATADIR%%/google/appengine/api
 @dirrm %%DATADIR%%/google/appengine
 @dirrm %%DATADIR%%/google
@@ -1416,15 +1470,16 @@ bin/dev_appserver.py
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/css
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/kb
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/webapp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/users
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/urlfetch
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/users
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/urlfetch
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/tools/webapp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/tools
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/memcache
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/mail
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/gettingstarted
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python/datastore
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/python
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/memcache
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/mail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/gettingstarted
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs/datastore
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/css
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/appengine/articles/extending_models