GoogleCloudPlatform · waprin · May 26, 2016 · May 26, 2016
diff --git a/managed_vms/.gitignore → appengine/flexible/.gitignore b/managed_vms/.gitignore → appengine/flexible/.gitignore
diff --git a/managed_vms/README.md → appengine/flexible/README.md b/managed_vms/README.md → appengine/flexible/README.md
@@ -1,6 +1,6 @@
-## Google App Engine Managed VMs Python Samples
+## Google App Engine Flexible Environment Python Samples
 
-These are samples for using Python on Google App Engine Managed VMs. These samples are typically referenced from the [docs](https://cloud.google.com/appengine/docs).
+These are samples for using Python on Google App Engine Flexible Environment. These samples are typically referenced from the [docs](https://cloud.google.com/appengine/docs).
 
 See our other [Google Cloud Platform github repos](https://github.com/GoogleCloudPlatform) for sample applications and
 scaffolding for other frameworks and use cases.
@@ -23,7 +23,7 @@ In general, the samples typically require:
 
    ```
    git clone https://github.com/GoogleCloudPlatform/python-docs-samples.git
-   cd python-docs-samples/managed_vms
+   cd python-docs-samples/appengine/flexible
    ```
 
 4. Open a sample folder, create a virtualenv, install dependencies, and run the sample:

diff --git a/managed_vms/analytics/README.md → appengine/flexible/analytics/README.md b/managed_vms/analytics/README.md → appengine/flexible/analytics/README.md
@@ -1,6 +1,6 @@
-# Google Analytics Measurement Protocol sample for Google App Engine Managed VMs
+# Google Analytics Measurement Protocol sample for Google App Engine Flexible
 
-This sample demonstrates how to use the [Google Analytics Measurement Protocol](https://developers.google.com/analytics/devguides/collection/protocol/v1/) (or any other SQL server) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use the [Google Analytics Measurement Protocol](https://developers.google.com/analytics/devguides/collection/protocol/v1/) (or any other SQL server) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 

diff --git a/managed_vms/analytics/app.yaml → appengine/flexible/analytics/app.yaml b/managed_vms/analytics/app.yaml → appengine/flexible/analytics/app.yaml
diff --git a/managed_vms/analytics/main.py → appengine/flexible/analytics/main.py b/managed_vms/analytics/main.py → appengine/flexible/analytics/main.py
diff --git a/managed_vms/analytics/main_test.py → appengine/flexible/analytics/main_test.py b/managed_vms/analytics/main_test.py → appengine/flexible/analytics/main_test.py
diff --git a/managed_vms/analytics/requirements.txt → ...ngine/flexible/analytics/requirements.txt b/managed_vms/analytics/requirements.txt → ...ngine/flexible/analytics/requirements.txt
diff --git a/managed_vms/cloudsql/README.md → appengine/flexible/cloudsql/README.md b/managed_vms/cloudsql/README.md → appengine/flexible/cloudsql/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud SQL sample for Google App Engine Managed VMs
+# Python Google Cloud SQL sample for Google App Engine Flexible
 
-This sample demonstrates how to use [Google Cloud SQL](https://cloud.google.com/sql/) (or any other SQL server) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Google Cloud SQL](https://cloud.google.com/sql/) (or any other SQL server) on [Google App Engine Flexible](https://cloud.google.com/appengine).
 
 ## Setup
 

diff --git a/managed_vms/cloudsql/app.yaml → appengine/flexible/cloudsql/app.yaml b/managed_vms/cloudsql/app.yaml → appengine/flexible/cloudsql/app.yaml
diff --git a/managed_vms/cloudsql/create_tables.py → appengine/flexible/cloudsql/create_tables.py b/managed_vms/cloudsql/create_tables.py → appengine/flexible/cloudsql/create_tables.py
diff --git a/managed_vms/cloudsql/main.py → appengine/flexible/cloudsql/main.py b/managed_vms/cloudsql/main.py → appengine/flexible/cloudsql/main.py
diff --git a/managed_vms/cloudsql/main_test.py → appengine/flexible/cloudsql/main_test.py b/managed_vms/cloudsql/main_test.py → appengine/flexible/cloudsql/main_test.py
diff --git a/managed_vms/cloudsql/requirements.txt → appengine/flexible/cloudsql/requirements.txt b/managed_vms/cloudsql/requirements.txt → appengine/flexible/cloudsql/requirements.txt
diff --git a/managed_vms/datastore/README.md → appengine/flexible/datastore/README.md b/managed_vms/datastore/README.md → appengine/flexible/datastore/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud Datastore sample for Google App Engine Managed VMs
+# Python Google Cloud Datastore sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Google Cloud Datastore](https://cloud.google.com/datastore/) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Google Cloud Datastore](https://cloud.google.com/datastore/) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 

diff --git a/managed_vms/datastore/app.yaml → appengine/flexible/datastore/app.yaml b/managed_vms/datastore/app.yaml → appengine/flexible/datastore/app.yaml
diff --git a/managed_vms/datastore/main.py → appengine/flexible/datastore/main.py b/managed_vms/datastore/main.py → appengine/flexible/datastore/main.py
diff --git a/managed_vms/datastore/main_test.py → appengine/flexible/datastore/main_test.py b/managed_vms/datastore/main_test.py → appengine/flexible/datastore/main_test.py
diff --git a/managed_vms/datastore/requirements.txt → ...ngine/flexible/datastore/requirements.txt b/managed_vms/datastore/requirements.txt → ...ngine/flexible/datastore/requirements.txt
diff --git a/managed_vms/disk/app.yaml → appengine/flexible/disk/app.yaml b/managed_vms/disk/app.yaml → appengine/flexible/disk/app.yaml
diff --git a/managed_vms/disk/main.py → appengine/flexible/disk/main.py b/managed_vms/disk/main.py → appengine/flexible/disk/main.py
diff --git a/managed_vms/disk/main_test.py → appengine/flexible/disk/main_test.py b/managed_vms/disk/main_test.py → appengine/flexible/disk/main_test.py
diff --git a/managed_vms/disk/requirements.txt → appengine/flexible/disk/requirements.txt b/managed_vms/disk/requirements.txt → appengine/flexible/disk/requirements.txt
diff --git a/managed_vms/django_cloudsql/README.md → appengine/flexible/django_cloudsql/README.md b/managed_vms/django_cloudsql/README.md → appengine/flexible/django_cloudsql/README.md
@@ -1,7 +1,7 @@
 # Getting started with Django on Google Cloud Platform
 
 This repository is an example of how to run a [Django](https://www.djangoproject.com/) 
-app on Google Managed VMs. It uses the [Writing your first Django app](https://docs.djangoproject.com/en/1.9/intro/tutorial01/) as the example app to deploy.
+app on Google App Engine Flexible Environment. It uses the [Writing your first Django app](https://docs.djangoproject.com/en/1.9/intro/tutorial01/) as the example app to deploy.
 
 
 ## Setup the database

diff --git a/managed_vms/django_cloudsql/app.yaml → appengine/flexible/django_cloudsql/app.yaml b/managed_vms/django_cloudsql/app.yaml → appengine/flexible/django_cloudsql/app.yaml
diff --git a/managed_vms/django_cloudsql/manage.py → appengine/flexible/django_cloudsql/manage.py b/managed_vms/django_cloudsql/manage.py → appengine/flexible/django_cloudsql/manage.py
diff --git a/appengine/__init__.py → ...exible/django_cloudsql/mysite/__init__.py b/appengine/__init__.py → ...exible/django_cloudsql/mysite/__init__.py
diff --git a/...ed_vms/django_cloudsql/mysite/settings.py → ...exible/django_cloudsql/mysite/settings.py b/...ed_vms/django_cloudsql/mysite/settings.py → ...exible/django_cloudsql/mysite/settings.py
diff --git a/managed_vms/django_cloudsql/mysite/urls.py → ...e/flexible/django_cloudsql/mysite/urls.py b/managed_vms/django_cloudsql/mysite/urls.py → ...e/flexible/django_cloudsql/mysite/urls.py
diff --git a/managed_vms/django_cloudsql/mysite/wsgi.py → ...e/flexible/django_cloudsql/mysite/wsgi.py b/managed_vms/django_cloudsql/mysite/wsgi.py → ...e/flexible/django_cloudsql/mysite/wsgi.py
diff --git a/...ed_vms/django_cloudsql/mysite/__init__.py → ...lexible/django_cloudsql/polls/__init__.py b/...ed_vms/django_cloudsql/mysite/__init__.py → ...lexible/django_cloudsql/polls/__init__.py
diff --git a/managed_vms/django_cloudsql/polls/admin.py → ...e/flexible/django_cloudsql/polls/admin.py b/managed_vms/django_cloudsql/polls/admin.py → ...e/flexible/django_cloudsql/polls/admin.py
diff --git a/managed_vms/django_cloudsql/polls/apps.py → ...ne/flexible/django_cloudsql/polls/apps.py b/managed_vms/django_cloudsql/polls/apps.py → ...ne/flexible/django_cloudsql/polls/apps.py
diff --git a/managed_vms/django_cloudsql/polls/models.py → .../flexible/django_cloudsql/polls/models.py b/managed_vms/django_cloudsql/polls/models.py → .../flexible/django_cloudsql/polls/models.py
diff --git a/managed_vms/django_cloudsql/polls/tests.py → ...e/flexible/django_cloudsql/polls/tests.py b/managed_vms/django_cloudsql/polls/tests.py → ...e/flexible/django_cloudsql/polls/tests.py
diff --git a/managed_vms/django_cloudsql/polls/urls.py → ...ne/flexible/django_cloudsql/polls/urls.py b/managed_vms/django_cloudsql/polls/urls.py → ...ne/flexible/django_cloudsql/polls/urls.py
diff --git a/managed_vms/django_cloudsql/polls/views.py → ...e/flexible/django_cloudsql/polls/views.py b/managed_vms/django_cloudsql/polls/views.py → ...e/flexible/django_cloudsql/polls/views.py
diff --git a/managed_vms/django_cloudsql/requirements.txt → ...flexible/django_cloudsql/requirements.txt b/managed_vms/django_cloudsql/requirements.txt → ...flexible/django_cloudsql/requirements.txt
diff --git a/managed_vms/endpoints/.gitignore → appengine/flexible/endpoints/.gitignore b/managed_vms/endpoints/.gitignore → appengine/flexible/endpoints/.gitignore
diff --git a/...vms/endpoints/Dockerfile.container-engine → ...ble/endpoints/Dockerfile.container-engine b/...vms/endpoints/Dockerfile.container-engine → ...ble/endpoints/Dockerfile.container-engine
diff --git a/managed_vms/endpoints/README.md → appengine/flexible/endpoints/README.md b/managed_vms/endpoints/README.md → appengine/flexible/endpoints/README.md
@@ -11,7 +11,7 @@ This sample consists of two parts:
 
 ### Running the backend
 
-For more info on running Flexible applications locally, see [the getting started documentation](https://cloud.google.com/appengine/docs/managed-vms/python/hello-world).
+For more info on running Flexible applications locally, see [the getting started documentation](https://cloud.google.com/python/getting-started/hello-world).
 
 Install all the dependencies:
 

diff --git a/managed_vms/endpoints/app.yaml → appengine/flexible/endpoints/app.yaml b/managed_vms/endpoints/app.yaml → appengine/flexible/endpoints/app.yaml
diff --git a/managed_vms/endpoints/clients/echo-client.py → ...flexible/endpoints/clients/echo-client.py b/managed_vms/endpoints/clients/echo-client.py → ...flexible/endpoints/clients/echo-client.py
diff --git a/...dpoints/clients/google-id-token-client.py → ...dpoints/clients/google-id-token-client.py b/...dpoints/clients/google-id-token-client.py → ...dpoints/clients/google-id-token-client.py
diff --git a/...ms/endpoints/clients/google-jwt-client.py → ...le/endpoints/clients/google-jwt-client.py b/...ms/endpoints/clients/google-jwt-client.py → ...le/endpoints/clients/google-jwt-client.py
diff --git a/managed_vms/endpoints/index.html → appengine/flexible/endpoints/index.html b/managed_vms/endpoints/index.html → appengine/flexible/endpoints/index.html
diff --git a/managed_vms/endpoints/main.py → appengine/flexible/endpoints/main.py b/managed_vms/endpoints/main.py → appengine/flexible/endpoints/main.py
diff --git a/managed_vms/endpoints/requirements.txt → ...ngine/flexible/endpoints/requirements.txt b/managed_vms/endpoints/requirements.txt → ...ngine/flexible/endpoints/requirements.txt
diff --git a/managed_vms/endpoints/swagger.yaml → appengine/flexible/endpoints/swagger.yaml b/managed_vms/endpoints/swagger.yaml → appengine/flexible/endpoints/swagger.yaml
diff --git a/managed_vms/extending_runtime/.dockerignore → .../flexible/extending_runtime/.dockerignore b/managed_vms/extending_runtime/.dockerignore → .../flexible/extending_runtime/.dockerignore
diff --git a/managed_vms/extending_runtime/Dockerfile → ...ine/flexible/extending_runtime/Dockerfile b/managed_vms/extending_runtime/Dockerfile → ...ine/flexible/extending_runtime/Dockerfile
diff --git a/managed_vms/extending_runtime/app.yaml → ...ngine/flexible/extending_runtime/app.yaml b/managed_vms/extending_runtime/app.yaml → ...ngine/flexible/extending_runtime/app.yaml
diff --git a/managed_vms/extending_runtime/main.py → appengine/flexible/extending_runtime/main.py b/managed_vms/extending_runtime/main.py → appengine/flexible/extending_runtime/main.py
diff --git a/managed_vms/extending_runtime/main_test.py → ...e/flexible/extending_runtime/main_test.py b/managed_vms/extending_runtime/main_test.py → ...e/flexible/extending_runtime/main_test.py
diff --git a/...ed_vms/extending_runtime/requirements.txt → ...exible/extending_runtime/requirements.txt b/...ed_vms/extending_runtime/requirements.txt → ...exible/extending_runtime/requirements.txt
diff --git a/...ms/extending_runtime_compat/.dockerignore → ...le/extending_runtime_compat/.dockerignore b/...ms/extending_runtime_compat/.dockerignore → ...le/extending_runtime_compat/.dockerignore
diff --git a/...d_vms/extending_runtime_compat/Dockerfile → ...xible/extending_runtime_compat/Dockerfile b/...d_vms/extending_runtime_compat/Dockerfile → ...xible/extending_runtime_compat/Dockerfile
@@ -1,4 +1,4 @@
-# Extend the Managed VMs python-compat runtime.
+# Extend the App Engine Flexible python-compat runtime.
 FROM gcr.io/google_appengine/python-compat-multicore
 
 # Install the fortunes binary from the debian repositories.

diff --git a/...ed_vms/extending_runtime_compat/README.md → ...exible/extending_runtime_compat/README.md b/...ed_vms/extending_runtime_compat/README.md → ...exible/extending_runtime_compat/README.md
@@ -1,6 +1,6 @@
-## Google App Engine Managed VMs extending runtime python-compat
+## Google App Engine Flexible Environment extending runtime python-compat
 
-This sample demonstrates how to extend the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Managed VMs](https://cloud.google.com/appengine/docs/python/managed-vms/hello-world)
+This sample demonstrates how to extend the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Flexible Environment](https://cloud.google.com/python/getting-started/hello-world)
 
 ### Running & deploying the sample
 

diff --git a/...ged_vms/extending_runtime_compat/app.yaml → ...lexible/extending_runtime_compat/app.yaml b/...ged_vms/extending_runtime_compat/app.yaml → ...lexible/extending_runtime_compat/app.yaml
diff --git a/managed_vms/extending_runtime_compat/main.py → ...flexible/extending_runtime_compat/main.py b/managed_vms/extending_runtime_compat/main.py → ...flexible/extending_runtime_compat/main.py
diff --git a/...vms/extending_runtime_compat/main_test.py → ...ble/extending_runtime_compat/main_test.py b/...vms/extending_runtime_compat/main_test.py → ...ble/extending_runtime_compat/main_test.py
diff --git a/appengine/ndb/transactions/requirements.txt → ...extending_runtime_compat/requirements.txt b/appengine/ndb/transactions/requirements.txt → ...extending_runtime_compat/requirements.txt
diff --git a/managed_vms/hello_world/app.yaml → appengine/flexible/hello_world/app.yaml b/managed_vms/hello_world/app.yaml → appengine/flexible/hello_world/app.yaml
diff --git a/managed_vms/hello_world/main.py → appengine/flexible/hello_world/main.py b/managed_vms/hello_world/main.py → appengine/flexible/hello_world/main.py
diff --git a/managed_vms/hello_world/main_test.py → appengine/flexible/hello_world/main_test.py b/managed_vms/hello_world/main_test.py → appengine/flexible/hello_world/main_test.py
diff --git a/managed_vms/hello_world/requirements.txt → ...ine/flexible/hello_world/requirements.txt b/managed_vms/hello_world/requirements.txt → ...ine/flexible/hello_world/requirements.txt
diff --git a/managed_vms/hello_world_compat/README.md → ...ine/flexible/hello_world_compat/README.md b/managed_vms/hello_world_compat/README.md → ...ine/flexible/hello_world_compat/README.md
@@ -1,6 +1,6 @@
-## Google App Engine Managed VMs python-compat Hello World
+## Google App Engine Flexible Environment python-compat Hello World
 
-This sample demonstrates using the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Managed VMs](https://cloud.google.com/appengine/docs/python/managed-vms/hello-world)
+This sample demonstrates using the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Flexible Environment](https://cloud.google.com/python/getting-started/hello-world)
 
 ### Running & deploying the sample
 

diff --git a/managed_vms/hello_world_compat/app.yaml → ...gine/flexible/hello_world_compat/app.yaml b/managed_vms/hello_world_compat/app.yaml → ...gine/flexible/hello_world_compat/app.yaml
diff --git a/managed_vms/hello_world_compat/main.py → ...ngine/flexible/hello_world_compat/main.py b/managed_vms/hello_world_compat/main.py → ...ngine/flexible/hello_world_compat/main.py
diff --git a/managed_vms/hello_world_compat/main_test.py → .../flexible/hello_world_compat/main_test.py b/managed_vms/hello_world_compat/main_test.py → .../flexible/hello_world_compat/main_test.py
diff --git a/...extending_runtime_compat/requirements.txt → ...xible/hello_world_compat/requirements.txt b/...extending_runtime_compat/requirements.txt → ...xible/hello_world_compat/requirements.txt
diff --git a/managed_vms/hello_world_django/.gitignore → ...ne/flexible/hello_world_django/.gitignore b/managed_vms/hello_world_django/.gitignore → ...ne/flexible/hello_world_django/.gitignore
diff --git a/managed_vms/hello_world_django/README.md → ...ine/flexible/hello_world_django/README.md b/managed_vms/hello_world_django/README.md → ...ine/flexible/hello_world_django/README.md
@@ -1,7 +1,7 @@
-# Django sample for Google App Engine Managed VMs
+# Django sample for Google App Engine Flexible Environment
 
 This is a basic hello world [Django](https://www.djangoproject.com/) example
-for [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+for [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Running locally
 

diff --git a/managed_vms/hello_world_django/app.yaml → ...gine/flexible/hello_world_django/app.yaml b/managed_vms/hello_world_django/app.yaml → ...gine/flexible/hello_world_django/app.yaml
diff --git a/...ged_vms/django_cloudsql/polls/__init__.py → ...hello_world_django/helloworld/__init__.py b/...ged_vms/django_cloudsql/polls/__init__.py → ...hello_world_django/helloworld/__init__.py
diff --git a/...ms/hello_world_django/helloworld/views.py → ...le/hello_world_django/helloworld/views.py b/...ms/hello_world_django/helloworld/views.py → ...le/hello_world_django/helloworld/views.py
diff --git a/managed_vms/hello_world_django/manage.py → ...ine/flexible/hello_world_django/manage.py b/managed_vms/hello_world_django/manage.py → ...ine/flexible/hello_world_django/manage.py
diff --git a/...hello_world_django/helloworld/__init__.py → ...llo_world_django/project_name/__init__.py b/...hello_world_django/helloworld/__init__.py → ...llo_world_django/project_name/__init__.py
diff --git a/...llo_world_django/project_name/settings.py → ...llo_world_django/project_name/settings.py b/...llo_world_django/project_name/settings.py → ...llo_world_django/project_name/settings.py
diff --git a/...s/hello_world_django/project_name/urls.py → ...e/hello_world_django/project_name/urls.py b/...s/hello_world_django/project_name/urls.py → ...e/hello_world_django/project_name/urls.py
diff --git a/...s/hello_world_django/project_name/wsgi.py → ...e/hello_world_django/project_name/wsgi.py b/...s/hello_world_django/project_name/wsgi.py → ...e/hello_world_django/project_name/wsgi.py
diff --git a/...d_vms/hello_world_django/requirements.txt → ...xible/hello_world_django/requirements.txt b/...d_vms/hello_world_django/requirements.txt → ...xible/hello_world_django/requirements.txt
diff --git a/managed_vms/kinto/Dockerfile → appengine/flexible/kinto/Dockerfile b/managed_vms/kinto/Dockerfile → appengine/flexible/kinto/Dockerfile
diff --git a/managed_vms/kinto/README.md → appengine/flexible/kinto/README.md b/managed_vms/kinto/README.md → appengine/flexible/kinto/README.md
@@ -1,7 +1,7 @@
 # Kinto Example
 
 This is a basic example of running Mozillas [Kinto](https://github.com/Kinto/kinto/blob/master/docs/index.rst)
-on Managed VMs. Kinto provides a framework to sync JSON data across many devices and provide push notifications.
+on App Engine Flexible. Kinto provides a framework to sync JSON data across many devices and provide push notifications.
 This example uses a custom runtime to install Kinto and edit the config to run it on port 8080, which is the port that
 the base Docker image is expecting. 
 

diff --git a/managed_vms/kinto/app.yaml → appengine/flexible/kinto/app.yaml b/managed_vms/kinto/app.yaml → appengine/flexible/kinto/app.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # This file specifies your Python application's runtime configuration.
-# See https://cloud.google.com/appengine/docs/managed-vms/config for details.
+# See https://cloud.google.com/appengine/docs/flexible/python/configuring-your-app-with-app-yaml
 
 runtime: custom
 vm: true

diff --git a/managed_vms/kinto/requirements.txt → appengine/flexible/kinto/requirements.txt b/managed_vms/kinto/requirements.txt → appengine/flexible/kinto/requirements.txt
diff --git a/managed_vms/mailgun/README.md → appengine/flexible/mailgun/README.md b/managed_vms/mailgun/README.md → appengine/flexible/mailgun/README.md
@@ -1,6 +1,6 @@
-# Python Mailgun email sample for Google App Engine Managed VMs
+# Python Mailgun email sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Mailgun](https://www.mailgun.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Mailgun](https://www.mailgun.com) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 For more information about Mail, see their [documentation](https://documentation.mailgun.com/).
 

diff --git a/managed_vms/mailgun/app.yaml → appengine/flexible/mailgun/app.yaml b/managed_vms/mailgun/app.yaml → appengine/flexible/mailgun/app.yaml
diff --git a/managed_vms/mailgun/example-attachment.txt → ...e/flexible/mailgun/example-attachment.txt b/managed_vms/mailgun/example-attachment.txt → ...e/flexible/mailgun/example-attachment.txt
diff --git a/managed_vms/mailgun/main.py → appengine/flexible/mailgun/main.py b/managed_vms/mailgun/main.py → appengine/flexible/mailgun/main.py
diff --git a/managed_vms/mailgun/main_test.py → appengine/flexible/mailgun/main_test.py b/managed_vms/mailgun/main_test.py → appengine/flexible/mailgun/main_test.py
diff --git a/managed_vms/mailgun/requirements.txt → appengine/flexible/mailgun/requirements.txt b/managed_vms/mailgun/requirements.txt → appengine/flexible/mailgun/requirements.txt
diff --git a/managed_vms/mailgun/templates/index.html → ...ine/flexible/mailgun/templates/index.html b/managed_vms/mailgun/templates/index.html → ...ine/flexible/mailgun/templates/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>Mailgun on Google App Engine Managed VMs</title>
+  <title>Mailgun on Google App Engine Flexible Environment</title>
 </head>
 <body>
 <!-- [START form] -->

diff --git a/managed_vms/mailjet/README.md → appengine/flexible/mailjet/README.md b/managed_vms/mailjet/README.md → appengine/flexible/mailjet/README.md
diff --git a/managed_vms/mailjet/app.yaml → appengine/flexible/mailjet/app.yaml b/managed_vms/mailjet/app.yaml → appengine/flexible/mailjet/app.yaml
diff --git a/managed_vms/mailjet/main.py → appengine/flexible/mailjet/main.py b/managed_vms/mailjet/main.py → appengine/flexible/mailjet/main.py
diff --git a/appengine/mailjet/main_test.py → appengine/flexible/mailjet/main_test.py b/appengine/mailjet/main_test.py → appengine/flexible/mailjet/main_test.py
diff --git a/managed_vms/mailjet/requirements.txt → appengine/flexible/mailjet/requirements.txt b/managed_vms/mailjet/requirements.txt → appengine/flexible/mailjet/requirements.txt
diff --git a/managed_vms/mailjet/templates/index.html → ...ine/flexible/mailjet/templates/index.html b/managed_vms/mailjet/templates/index.html → ...ine/flexible/mailjet/templates/index.html
diff --git a/managed_vms/memcache/app.yaml → appengine/flexible/memcache/app.yaml b/managed_vms/memcache/app.yaml → appengine/flexible/memcache/app.yaml
diff --git a/managed_vms/memcache/main.py → appengine/flexible/memcache/main.py b/managed_vms/memcache/main.py → appengine/flexible/memcache/main.py
diff --git a/managed_vms/memcache/main_test.py → appengine/flexible/memcache/main_test.py b/managed_vms/memcache/main_test.py → appengine/flexible/memcache/main_test.py
diff --git a/managed_vms/memcache/requirements.txt → appengine/flexible/memcache/requirements.txt b/managed_vms/memcache/requirements.txt → appengine/flexible/memcache/requirements.txt
diff --git a/managed_vms/pubsub/README.md → appengine/flexible/pubsub/README.md b/managed_vms/pubsub/README.md → appengine/flexible/pubsub/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud Pub/Sub sample for Google App Engine Managed VMs
+# Python Google Cloud Pub/Sub sample for Google App Engine Flexible Environment
 
-This demonstrates how to send and receive messages using [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This demonstrates how to send and receive messages using [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 

diff --git a/managed_vms/pubsub/app.yaml → appengine/flexible/pubsub/app.yaml b/managed_vms/pubsub/app.yaml → appengine/flexible/pubsub/app.yaml
diff --git a/managed_vms/pubsub/main.py → appengine/flexible/pubsub/main.py b/managed_vms/pubsub/main.py → appengine/flexible/pubsub/main.py
diff --git a/managed_vms/pubsub/main_test.py → appengine/flexible/pubsub/main_test.py b/managed_vms/pubsub/main_test.py → appengine/flexible/pubsub/main_test.py
diff --git a/managed_vms/pubsub/requirements.txt → appengine/flexible/pubsub/requirements.txt b/managed_vms/pubsub/requirements.txt → appengine/flexible/pubsub/requirements.txt
diff --git a/managed_vms/pubsub/sample_message.json → ...ngine/flexible/pubsub/sample_message.json b/managed_vms/pubsub/sample_message.json → ...ngine/flexible/pubsub/sample_message.json
diff --git a/managed_vms/pubsub/templates/index.html → ...gine/flexible/pubsub/templates/index.html b/managed_vms/pubsub/templates/index.html → ...gine/flexible/pubsub/templates/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>Pub/Sub Python on Google App Engine Managed VMs</title>
+  <title>Pub/Sub Python on Google App Engine Flexible Environment</title>
 </head>
 <body>
 <div>

diff --git a/managed_vms/sendgrid/README.md → appengine/flexible/sendgrid/README.md b/managed_vms/sendgrid/README.md → appengine/flexible/sendgrid/README.md
@@ -1,6 +1,6 @@
-# Python SendGrid email sample for Google App Engine Managed VMs
+# Python SendGrid email sample for Google App Engine Flexible
 
-This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on [Google App Engine Flexible](https://cloud.google.com/appengine).
 
 For more information about SendGrid, see their [documentation](https://sendgrid.com/docs/User_Guide/index.html).
 

diff --git a/managed_vms/sendgrid/app.yaml → appengine/flexible/sendgrid/app.yaml b/managed_vms/sendgrid/app.yaml → appengine/flexible/sendgrid/app.yaml
diff --git a/managed_vms/sendgrid/main.py → appengine/flexible/sendgrid/main.py b/managed_vms/sendgrid/main.py → appengine/flexible/sendgrid/main.py
diff --git a/managed_vms/sendgrid/main_test.py → appengine/flexible/sendgrid/main_test.py b/managed_vms/sendgrid/main_test.py → appengine/flexible/sendgrid/main_test.py
diff --git a/managed_vms/sendgrid/requirements.txt → appengine/flexible/sendgrid/requirements.txt b/managed_vms/sendgrid/requirements.txt → appengine/flexible/sendgrid/requirements.txt
diff --git a/managed_vms/sendgrid/templates/index.html → ...ne/flexible/sendgrid/templates/index.html b/managed_vms/sendgrid/templates/index.html → ...ne/flexible/sendgrid/templates/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>SendGrid on Google App Engine Managed VMs</title>
+  <title>SendGrid on Google App Engine Flexible Environment</title>
 </head>
 <body>
 <!-- [START form] -->

diff --git a/managed_vms/static_files/README.md → appengine/flexible/static_files/README.md b/managed_vms/static_files/README.md → appengine/flexible/static_files/README.md
@@ -1,4 +1,4 @@
-# Python / Flask static files sample for Google App Engine Managed VMs
+# Python / Flask static files sample for Google App Engine Flexible Environment
 
 This demonstrates how to use [Flask](http://flask.pocoo.org/) to serve static files in your application.
 

diff --git a/managed_vms/static_files/app.yaml → appengine/flexible/static_files/app.yaml b/managed_vms/static_files/app.yaml → appengine/flexible/static_files/app.yaml
diff --git a/managed_vms/static_files/main.py → appengine/flexible/static_files/main.py b/managed_vms/static_files/main.py → appengine/flexible/static_files/main.py
diff --git a/managed_vms/static_files/main_test.py → appengine/flexible/static_files/main_test.py b/managed_vms/static_files/main_test.py → appengine/flexible/static_files/main_test.py
diff --git a/managed_vms/static_files/requirements.txt → ...ne/flexible/static_files/requirements.txt b/managed_vms/static_files/requirements.txt → ...ne/flexible/static_files/requirements.txt
diff --git a/managed_vms/static_files/static/main.css → ...ine/flexible/static_files/static/main.css b/managed_vms/static_files/static/main.css → ...ine/flexible/static_files/static/main.css
diff --git a/...ged_vms/static_files/templates/index.html → ...lexible/static_files/templates/index.html b/...ged_vms/static_files/templates/index.html → ...lexible/static_files/templates/index.html
diff --git a/managed_vms/storage/README.md → appengine/flexible/storage/README.md b/managed_vms/storage/README.md → appengine/flexible/storage/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud Storage sample for Google App Engine Managed VMs
+# Python Google Cloud Storage sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Google Cloud Storage](https://cloud.google.com/storage/) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Google Cloud Storage](https://cloud.google.com/storage/) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 

diff --git a/managed_vms/storage/app.yaml → appengine/flexible/storage/app.yaml b/managed_vms/storage/app.yaml → appengine/flexible/storage/app.yaml
diff --git a/managed_vms/storage/main.py → appengine/flexible/storage/main.py b/managed_vms/storage/main.py → appengine/flexible/storage/main.py
diff --git a/managed_vms/storage/main_test.py → appengine/flexible/storage/main_test.py b/managed_vms/storage/main_test.py → appengine/flexible/storage/main_test.py
diff --git a/managed_vms/storage/requirements.txt → appengine/flexible/storage/requirements.txt b/managed_vms/storage/requirements.txt → appengine/flexible/storage/requirements.txt
diff --git a/managed_vms/twilio/README.md → appengine/flexible/twilio/README.md b/managed_vms/twilio/README.md → appengine/flexible/twilio/README.md
@@ -1,6 +1,6 @@
-# Python Twilio voice and SMS sample for Google App Engine Managed VMs
+# Python Twilio voice and SMS sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Twilio](https://www.twilio.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Twilio](https://www.twilio.com) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 For more information about Twilio, see their [Python quickstart tutorials](https://www.twilio.com/docs/quickstart/python).
 

diff --git a/managed_vms/twilio/app.yaml → appengine/flexible/twilio/app.yaml b/managed_vms/twilio/app.yaml → appengine/flexible/twilio/app.yaml
diff --git a/managed_vms/twilio/main.py → appengine/flexible/twilio/main.py b/managed_vms/twilio/main.py → appengine/flexible/twilio/main.py
diff --git a/managed_vms/twilio/main_test.py → appengine/flexible/twilio/main_test.py b/managed_vms/twilio/main_test.py → appengine/flexible/twilio/main_test.py
diff --git a/managed_vms/twilio/requirements.txt → appengine/flexible/twilio/requirements.txt b/managed_vms/twilio/requirements.txt → appengine/flexible/twilio/requirements.txt
diff --git a/managed_vms/websockets/README.md → appengine/flexible/websockets/README.md b/managed_vms/websockets/README.md → appengine/flexible/websockets/README.md
@@ -1,6 +1,6 @@
-# Python websockets sample for Google App Engine Managed VMs
+# Python websockets sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use websockets on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use websockets on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 

diff --git a/managed_vms/websockets/app.yaml → appengine/flexible/websockets/app.yaml b/managed_vms/websockets/app.yaml → appengine/flexible/websockets/app.yaml
diff --git a/managed_vms/websockets/main.py → appengine/flexible/websockets/main.py b/managed_vms/websockets/main.py → appengine/flexible/websockets/main.py
diff --git a/managed_vms/websockets/requirements.txt → ...gine/flexible/websockets/requirements.txt b/managed_vms/websockets/requirements.txt → ...gine/flexible/websockets/requirements.txt
diff --git a/managed_vms/websockets/templates/index.html → .../flexible/websockets/templates/index.html b/managed_vms/websockets/templates/index.html → .../flexible/websockets/templates/index.html
@@ -17,7 +17,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>Google App Engine Managed VMs - Python Websockets Echo</title>
+  <title>Google App Engine Flexible Environment - Python Websockets Echo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>

diff --git a/appengine/README.md → appengine/standard/README.md b/appengine/README.md → appengine/standard/README.md
diff --git a/...llo_world_django/project_name/__init__.py → appengine/standard/__init__.py b/...llo_world_django/project_name/__init__.py → appengine/standard/__init__.py
diff --git a/appengine/angular/README.md → appengine/standard/angular/README.md b/appengine/angular/README.md → appengine/standard/angular/README.md
diff --git a/appengine/angular/app.yaml → appengine/standard/angular/app.yaml b/appengine/angular/app.yaml → appengine/standard/angular/app.yaml
diff --git a/appengine/angular/app/css/app.css → appengine/standard/angular/app/css/app.css b/appengine/angular/app/css/app.css → appengine/standard/angular/app/css/app.css
diff --git a/appengine/angular/app/index.html → appengine/standard/angular/app/index.html b/appengine/angular/app/index.html → appengine/standard/angular/app/index.html
diff --git a/appengine/angular/app/js/app.js → appengine/standard/angular/app/js/app.js b/appengine/angular/app/js/app.js → appengine/standard/angular/app/js/app.js
diff --git a/appengine/angular/app/partials/insert.html → ...standard/angular/app/partials/insert.html b/appengine/angular/app/partials/insert.html → ...standard/angular/app/partials/insert.html
diff --git a/appengine/angular/app/partials/main.html → ...e/standard/angular/app/partials/main.html b/appengine/angular/app/partials/main.html → ...e/standard/angular/app/partials/main.html
diff --git a/appengine/angular/app/partials/update.html → ...standard/angular/app/partials/update.html b/appengine/angular/app/partials/update.html → ...standard/angular/app/partials/update.html
diff --git a/appengine/angular/main.py → appengine/standard/angular/main.py b/appengine/angular/main.py → appengine/standard/angular/main.py
diff --git a/appengine/angular/model.py → appengine/standard/angular/model.py b/appengine/angular/model.py → appengine/standard/angular/model.py
diff --git a/appengine/angular/scripts/deploy.sh → appengine/standard/angular/scripts/deploy.sh b/appengine/angular/scripts/deploy.sh → appengine/standard/angular/scripts/deploy.sh
diff --git a/appengine/angular/scripts/run.sh → appengine/standard/angular/scripts/run.sh b/appengine/angular/scripts/run.sh → appengine/standard/angular/scripts/run.sh
diff --git a/appengine/app_identity/asserting/app.yaml → .../standard/app_identity/asserting/app.yaml b/appengine/app_identity/asserting/app.yaml → .../standard/app_identity/asserting/app.yaml
diff --git a/appengine/app_identity/asserting/main.py → ...e/standard/app_identity/asserting/main.py b/appengine/app_identity/asserting/main.py → ...e/standard/app_identity/asserting/main.py
diff --git a/...ngine/app_identity/asserting/main_test.py → ...ndard/app_identity/asserting/main_test.py b/...ngine/app_identity/asserting/main_test.py → ...ndard/app_identity/asserting/main_test.py
diff --git a/appengine/app_identity/incoming/app.yaml → ...e/standard/app_identity/incoming/app.yaml b/appengine/app_identity/incoming/app.yaml → ...e/standard/app_identity/incoming/app.yaml
diff --git a/appengine/app_identity/incoming/main.py → ...ne/standard/app_identity/incoming/main.py b/appengine/app_identity/incoming/main.py → ...ne/standard/app_identity/incoming/main.py
diff --git a/appengine/app_identity/incoming/main_test.py → ...andard/app_identity/incoming/main_test.py b/appengine/app_identity/incoming/main_test.py → ...andard/app_identity/incoming/main_test.py
diff --git a/appengine/app_identity/signing/app.yaml → ...ne/standard/app_identity/signing/app.yaml b/appengine/app_identity/signing/app.yaml → ...ne/standard/app_identity/signing/app.yaml
diff --git a/appengine/app_identity/signing/main.py → ...ine/standard/app_identity/signing/main.py b/appengine/app_identity/signing/main.py → ...ine/standard/app_identity/signing/main.py
diff --git a/appengine/app_identity/signing/main_test.py → ...tandard/app_identity/signing/main_test.py b/appengine/app_identity/signing/main_test.py → ...tandard/app_identity/signing/main_test.py
diff --git a/appengine/appstats/app.yaml → appengine/standard/appstats/app.yaml b/appengine/appstats/app.yaml → appengine/standard/appstats/app.yaml
diff --git a/appengine/appstats/appengine_config.py → ...ine/standard/appstats/appengine_config.py b/appengine/appstats/appengine_config.py → ...ine/standard/appstats/appengine_config.py
diff --git a/appengine/appstats/main.py → appengine/standard/appstats/main.py b/appengine/appstats/main.py → appengine/standard/appstats/main.py
diff --git a/appengine/appstats/main_test.py → appengine/standard/appstats/main_test.py b/appengine/appstats/main_test.py → appengine/standard/appstats/main_test.py
diff --git a/appengine/background/README.md → appengine/standard/background/README.md b/appengine/background/README.md → appengine/standard/background/README.md
diff --git a/appengine/background/app.yaml → appengine/standard/background/app.yaml b/appengine/background/app.yaml → appengine/standard/background/app.yaml
diff --git a/appengine/background/main.py → appengine/standard/background/main.py b/appengine/background/main.py → appengine/standard/background/main.py
diff --git a/appengine/background/main_test.py → appengine/standard/background/main_test.py b/appengine/background/main_test.py → appengine/standard/background/main_test.py
diff --git a/appengine/bigquery/.gitignore → appengine/standard/bigquery/.gitignore b/appengine/bigquery/.gitignore → appengine/standard/bigquery/.gitignore
diff --git a/appengine/bigquery/README.md → appengine/standard/bigquery/README.md b/appengine/bigquery/README.md → appengine/standard/bigquery/README.md
diff --git a/appengine/bigquery/app.yaml → appengine/standard/bigquery/app.yaml b/appengine/bigquery/app.yaml → appengine/standard/bigquery/app.yaml
diff --git a/appengine/bigquery/appengine_config.py → ...ine/standard/bigquery/appengine_config.py b/appengine/bigquery/appengine_config.py → ...ine/standard/bigquery/appengine_config.py
diff --git a/appengine/bigquery/client_secrets.json → ...ine/standard/bigquery/client_secrets.json b/appengine/bigquery/client_secrets.json → ...ine/standard/bigquery/client_secrets.json
diff --git a/appengine/bigquery/main.py → appengine/standard/bigquery/main.py b/appengine/bigquery/main.py → appengine/standard/bigquery/main.py
diff --git a/appengine/bigquery/main_test.py → appengine/standard/bigquery/main_test.py b/appengine/bigquery/main_test.py → appengine/standard/bigquery/main_test.py
diff --git a/appengine/bigquery/requirements.txt → appengine/standard/bigquery/requirements.txt b/appengine/bigquery/requirements.txt → appengine/standard/bigquery/requirements.txt
diff --git a/...ine/bigquery/resources/datasets-list.json → ...ard/bigquery/resources/datasets-list.json b/...ine/bigquery/resources/datasets-list.json → ...ard/bigquery/resources/datasets-list.json
diff --git a/appengine/blobstore/README.md → appengine/standard/blobstore/README.md b/appengine/blobstore/README.md → appengine/standard/blobstore/README.md
diff --git a/appengine/blobstore/app.yaml → appengine/standard/blobstore/app.yaml b/appengine/blobstore/app.yaml → appengine/standard/blobstore/app.yaml
diff --git a/appengine/blobstore/main.py → appengine/standard/blobstore/main.py b/appengine/blobstore/main.py → appengine/standard/blobstore/main.py
diff --git a/appengine/blobstore/main_test.py → appengine/standard/blobstore/main_test.py b/appengine/blobstore/main_test.py → appengine/standard/blobstore/main_test.py
diff --git a/appengine/channel/README.md → appengine/standard/channel/README.md b/appengine/channel/README.md → appengine/standard/channel/README.md
diff --git a/appengine/channel/app.yaml → appengine/standard/channel/app.yaml b/appengine/channel/app.yaml → appengine/standard/channel/app.yaml
diff --git a/appengine/channel/chatactoe.py → appengine/standard/channel/chatactoe.py b/appengine/channel/chatactoe.py → appengine/standard/channel/chatactoe.py
diff --git a/appengine/channel/index.html → appengine/standard/channel/index.html b/appengine/channel/index.html → appengine/standard/channel/index.html
diff --git a/appengine/cloudsql/README.md → appengine/standard/cloudsql/README.md b/appengine/cloudsql/README.md → appengine/standard/cloudsql/README.md
diff --git a/appengine/cloudsql/app.yaml → appengine/standard/cloudsql/app.yaml b/appengine/cloudsql/app.yaml → appengine/standard/cloudsql/app.yaml
diff --git a/appengine/cloudsql/main.py → appengine/standard/cloudsql/main.py b/appengine/cloudsql/main.py → appengine/standard/cloudsql/main.py
diff --git a/appengine/cloudsql/main_test.py → appengine/standard/cloudsql/main_test.py b/appengine/cloudsql/main_test.py → appengine/standard/cloudsql/main_test.py
diff --git a/appengine/conftest.py → appengine/standard/conftest.py b/appengine/conftest.py → appengine/standard/conftest.py
diff --git a/appengine/endpoints/backend/app.yaml → ...ngine/standard/endpoints/backend/app.yaml b/appengine/endpoints/backend/app.yaml → ...ngine/standard/endpoints/backend/app.yaml
diff --git a/appengine/endpoints/backend/main.py → appengine/standard/endpoints/backend/main.py b/appengine/endpoints/backend/main.py → appengine/standard/endpoints/backend/main.py
diff --git a/appengine/endpoints/backend/main_test.py → ...e/standard/endpoints/backend/main_test.py b/appengine/endpoints/backend/main_test.py → ...e/standard/endpoints/backend/main_test.py
diff --git a/appengine/endpoints/multiapi/app.yaml → ...gine/standard/endpoints/multiapi/app.yaml b/appengine/endpoints/multiapi/app.yaml → ...gine/standard/endpoints/multiapi/app.yaml
diff --git a/appengine/endpoints/multiapi/main.py → ...ngine/standard/endpoints/multiapi/main.py b/appengine/endpoints/multiapi/main.py → ...ngine/standard/endpoints/multiapi/main.py
diff --git a/appengine/endpoints/multiapi/main_test.py → .../standard/endpoints/multiapi/main_test.py b/appengine/endpoints/multiapi/main_test.py → .../standard/endpoints/multiapi/main_test.py
diff --git a/appengine/i18n/README.md → appengine/standard/i18n/README.md b/appengine/i18n/README.md → appengine/standard/i18n/README.md
diff --git a/appengine/i18n/app.yaml → appengine/standard/i18n/app.yaml b/appengine/i18n/app.yaml → appengine/standard/i18n/app.yaml
diff --git a/appengine/i18n/appengine_config.py → appengine/standard/i18n/appengine_config.py b/appengine/i18n/appengine_config.py → appengine/standard/i18n/appengine_config.py
diff --git a/appengine/i18n/i18n_utils.py → appengine/standard/i18n/i18n_utils.py b/appengine/i18n/i18n_utils.py → appengine/standard/i18n/i18n_utils.py
diff --git a/appengine/i18n/js.mapping → appengine/standard/i18n/js.mapping b/appengine/i18n/js.mapping → appengine/standard/i18n/js.mapping
diff --git a/...i18n/locales/en/LC_MESSAGES/jsmessages.mo → ...i18n/locales/en/LC_MESSAGES/jsmessages.mo b/...i18n/locales/en/LC_MESSAGES/jsmessages.mo → ...i18n/locales/en/LC_MESSAGES/jsmessages.mo
diff --git a/...i18n/locales/en/LC_MESSAGES/jsmessages.po → ...i18n/locales/en/LC_MESSAGES/jsmessages.po b/...i18n/locales/en/LC_MESSAGES/jsmessages.po → ...i18n/locales/en/LC_MESSAGES/jsmessages.po
diff --git a/...e/i18n/locales/en/LC_MESSAGES/messages.mo → ...d/i18n/locales/en/LC_MESSAGES/messages.mo b/...e/i18n/locales/en/LC_MESSAGES/messages.mo → ...d/i18n/locales/en/LC_MESSAGES/messages.mo
diff --git a/...e/i18n/locales/en/LC_MESSAGES/messages.po → ...d/i18n/locales/en/LC_MESSAGES/messages.po b/...e/i18n/locales/en/LC_MESSAGES/messages.po → ...d/i18n/locales/en/LC_MESSAGES/messages.po
diff --git a/...i18n/locales/ja/LC_MESSAGES/jsmessages.mo → ...i18n/locales/ja/LC_MESSAGES/jsmessages.mo b/...i18n/locales/ja/LC_MESSAGES/jsmessages.mo → ...i18n/locales/ja/LC_MESSAGES/jsmessages.mo
diff --git a/...i18n/locales/ja/LC_MESSAGES/jsmessages.po → ...i18n/locales/ja/LC_MESSAGES/jsmessages.po b/...i18n/locales/ja/LC_MESSAGES/jsmessages.po → ...i18n/locales/ja/LC_MESSAGES/jsmessages.po
diff --git a/...e/i18n/locales/ja/LC_MESSAGES/messages.mo → ...d/i18n/locales/ja/LC_MESSAGES/messages.mo b/...e/i18n/locales/ja/LC_MESSAGES/messages.mo → ...d/i18n/locales/ja/LC_MESSAGES/messages.mo
diff --git a/...e/i18n/locales/ja/LC_MESSAGES/messages.po → ...d/i18n/locales/ja/LC_MESSAGES/messages.po b/...e/i18n/locales/ja/LC_MESSAGES/messages.po → ...d/i18n/locales/ja/LC_MESSAGES/messages.po
diff --git a/appengine/i18n/locales/jsmessages.pot → ...gine/standard/i18n/locales/jsmessages.pot b/appengine/i18n/locales/jsmessages.pot → ...gine/standard/i18n/locales/jsmessages.pot
diff --git a/appengine/i18n/locales/messages.pot → appengine/standard/i18n/locales/messages.pot b/appengine/i18n/locales/messages.pot → appengine/standard/i18n/locales/messages.pot
diff --git a/...i18n/locales/pl/LC_MESSAGES/jsmessages.mo → ...i18n/locales/pl/LC_MESSAGES/jsmessages.mo b/...i18n/locales/pl/LC_MESSAGES/jsmessages.mo → ...i18n/locales/pl/LC_MESSAGES/jsmessages.mo
diff --git a/...i18n/locales/pl/LC_MESSAGES/jsmessages.po → ...i18n/locales/pl/LC_MESSAGES/jsmessages.po b/...i18n/locales/pl/LC_MESSAGES/jsmessages.po → ...i18n/locales/pl/LC_MESSAGES/jsmessages.po
diff --git a/appengine/i18n/main.mapping → appengine/standard/i18n/main.mapping b/appengine/i18n/main.mapping → appengine/standard/i18n/main.mapping
diff --git a/appengine/i18n/main.py → appengine/standard/i18n/main.py b/appengine/i18n/main.py → appengine/standard/i18n/main.py
diff --git a/appengine/i18n/static/js/main.js → appengine/standard/i18n/static/js/main.js b/appengine/i18n/static/js/main.js → appengine/standard/i18n/static/js/main.js
diff --git a/appengine/i18n/templates/i18n_js.jinja2 → ...ne/standard/i18n/templates/i18n_js.jinja2 b/appengine/i18n/templates/i18n_js.jinja2 → ...ne/standard/i18n/templates/i18n_js.jinja2
diff --git a/appengine/i18n/templates/index.jinja2 → ...gine/standard/i18n/templates/index.jinja2 b/appengine/i18n/templates/index.jinja2 → ...gine/standard/i18n/templates/index.jinja2
diff --git a/...gine/i18n/templates/javascript_tag.jinja2 → ...dard/i18n/templates/javascript_tag.jinja2 b/...gine/i18n/templates/javascript_tag.jinja2 → ...dard/i18n/templates/javascript_tag.jinja2
diff --git a/appengine/i18n/templates/null_i18n_js.jinja2 → ...andard/i18n/templates/null_i18n_js.jinja2 b/appengine/i18n/templates/null_i18n_js.jinja2 → ...andard/i18n/templates/null_i18n_js.jinja2
diff --git a/appengine/images/api/README.md → appengine/standard/images/api/README.md b/appengine/images/api/README.md → appengine/standard/images/api/README.md
@@ -10,4 +10,4 @@ These samples are used on the following documentation page:
 
 <!-- end-auto-doc-link -->
 
-Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
+Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
diff --git a/appengine/images/api/app.yaml → appengine/standard/images/api/app.yaml b/appengine/images/api/app.yaml → appengine/standard/images/api/app.yaml
diff --git a/appengine/images/api/blobstore.py → appengine/standard/images/api/blobstore.py b/appengine/images/api/blobstore.py → appengine/standard/images/api/blobstore.py
diff --git a/appengine/images/api/blobstore_test.py → ...ine/standard/images/api/blobstore_test.py b/appengine/images/api/blobstore_test.py → ...ine/standard/images/api/blobstore_test.py
diff --git a/appengine/images/api/favicon.ico → appengine/standard/images/api/favicon.ico b/appengine/images/api/favicon.ico → appengine/standard/images/api/favicon.ico
diff --git a/appengine/images/api/main.py → appengine/standard/images/api/main.py b/appengine/images/api/main.py → appengine/standard/images/api/main.py
diff --git a/appengine/images/api/main_test.py → appengine/standard/images/api/main_test.py b/appengine/images/api/main_test.py → appengine/standard/images/api/main_test.py
diff --git a/appengine/images/guestbook/README.md → ...ngine/standard/images/guestbook/README.md b/appengine/images/guestbook/README.md → ...ngine/standard/images/guestbook/README.md
@@ -10,4 +10,4 @@ These samples are used on the following documentation page:
 
 <!-- end-auto-doc-link -->
 
-Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
+Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
diff --git a/appengine/images/guestbook/app.yaml → appengine/standard/images/guestbook/app.yaml b/appengine/images/guestbook/app.yaml → appengine/standard/images/guestbook/app.yaml
diff --git a/appengine/images/guestbook/favicon.ico → ...ine/standard/images/guestbook/favicon.ico b/appengine/images/guestbook/favicon.ico → ...ine/standard/images/guestbook/favicon.ico
diff --git a/appengine/images/guestbook/index.yaml → ...gine/standard/images/guestbook/index.yaml b/appengine/images/guestbook/index.yaml → ...gine/standard/images/guestbook/index.yaml
diff --git a/appengine/images/guestbook/main.py → appengine/standard/images/guestbook/main.py b/appengine/images/guestbook/main.py → appengine/standard/images/guestbook/main.py
diff --git a/appengine/images/guestbook/main_test.py → ...ne/standard/images/guestbook/main_test.py b/appengine/images/guestbook/main_test.py → ...ne/standard/images/guestbook/main_test.py
diff --git a/appengine/localtesting/README.md → appengine/standard/localtesting/README.md b/appengine/localtesting/README.md → appengine/standard/localtesting/README.md
diff --git a/appengine/localtesting/datastore_test.py → ...e/standard/localtesting/datastore_test.py b/appengine/localtesting/datastore_test.py → ...e/standard/localtesting/datastore_test.py
diff --git a/appengine/localtesting/env_vars_test.py → ...ne/standard/localtesting/env_vars_test.py b/appengine/localtesting/env_vars_test.py → ...ne/standard/localtesting/env_vars_test.py
diff --git a/appengine/localtesting/login_test.py → ...ngine/standard/localtesting/login_test.py b/appengine/localtesting/login_test.py → ...ngine/standard/localtesting/login_test.py
diff --git a/appengine/localtesting/mail_test.py → appengine/standard/localtesting/mail_test.py b/appengine/localtesting/mail_test.py → appengine/standard/localtesting/mail_test.py
diff --git a/appengine/localtesting/queue.yaml → appengine/standard/localtesting/queue.yaml b/appengine/localtesting/queue.yaml → appengine/standard/localtesting/queue.yaml
diff --git a/appengine/localtesting/resources/queue.yaml → ...tandard/localtesting/resources/queue.yaml b/appengine/localtesting/resources/queue.yaml → ...tandard/localtesting/resources/queue.yaml
diff --git a/appengine/localtesting/runner.py → appengine/standard/localtesting/runner.py b/appengine/localtesting/runner.py → appengine/standard/localtesting/runner.py
diff --git a/appengine/localtesting/task_queue_test.py → .../standard/localtesting/task_queue_test.py b/appengine/localtesting/task_queue_test.py → .../standard/localtesting/task_queue_test.py
diff --git a/appengine/logging/reading_logs/app.yaml → ...ne/standard/logging/reading_logs/app.yaml b/appengine/logging/reading_logs/app.yaml → ...ne/standard/logging/reading_logs/app.yaml
diff --git a/appengine/logging/reading_logs/main.py → ...ine/standard/logging/reading_logs/main.py b/appengine/logging/reading_logs/main.py → ...ine/standard/logging/reading_logs/main.py
diff --git a/appengine/logging/reading_logs/main_test.py → ...tandard/logging/reading_logs/main_test.py b/appengine/logging/reading_logs/main_test.py → ...tandard/logging/reading_logs/main_test.py
diff --git a/appengine/logging/writing_logs/app.yaml → ...ne/standard/logging/writing_logs/app.yaml b/appengine/logging/writing_logs/app.yaml → ...ne/standard/logging/writing_logs/app.yaml
diff --git a/appengine/logging/writing_logs/main.py → ...ine/standard/logging/writing_logs/main.py b/appengine/logging/writing_logs/main.py → ...ine/standard/logging/writing_logs/main.py
diff --git a/appengine/logging/writing_logs/main_test.py → ...tandard/logging/writing_logs/main_test.py b/appengine/logging/writing_logs/main_test.py → ...tandard/logging/writing_logs/main_test.py
diff --git a/appengine/mail/README.md → appengine/standard/mail/README.md b/appengine/mail/README.md → appengine/standard/mail/README.md
diff --git a/appengine/mail/app.yaml → appengine/standard/mail/app.yaml b/appengine/mail/app.yaml → appengine/standard/mail/app.yaml
diff --git a/appengine/mail/attachment.py → appengine/standard/mail/attachment.py b/appengine/mail/attachment.py → appengine/standard/mail/attachment.py
diff --git a/appengine/mail/attachment_test.py → appengine/standard/mail/attachment_test.py b/appengine/mail/attachment_test.py → appengine/standard/mail/attachment_test.py
diff --git a/appengine/mail/handle_bounced_email.py → ...ine/standard/mail/handle_bounced_email.py b/appengine/mail/handle_bounced_email.py → ...ine/standard/mail/handle_bounced_email.py
diff --git a/appengine/mail/handle_bounced_email_test.py → ...tandard/mail/handle_bounced_email_test.py b/appengine/mail/handle_bounced_email_test.py → ...tandard/mail/handle_bounced_email_test.py
diff --git a/appengine/mail/handle_incoming_email.py → ...ne/standard/mail/handle_incoming_email.py b/appengine/mail/handle_incoming_email.py → ...ne/standard/mail/handle_incoming_email.py
diff --git a/appengine/mail/handle_incoming_email_test.py → ...andard/mail/handle_incoming_email_test.py b/appengine/mail/handle_incoming_email_test.py → ...andard/mail/handle_incoming_email_test.py
diff --git a/appengine/mail/header.py → appengine/standard/mail/header.py b/appengine/mail/header.py → appengine/standard/mail/header.py
diff --git a/appengine/mail/header_test.py → appengine/standard/mail/header_test.py b/appengine/mail/header_test.py → appengine/standard/mail/header_test.py
diff --git a/appengine/mail/index.html → appengine/standard/mail/index.html b/appengine/mail/index.html → appengine/standard/mail/index.html
diff --git a/appengine/mail/send_mail.py → appengine/standard/mail/send_mail.py b/appengine/mail/send_mail.py → appengine/standard/mail/send_mail.py
diff --git a/appengine/mail/send_mail_test.py → appengine/standard/mail/send_mail_test.py b/appengine/mail/send_mail_test.py → appengine/standard/mail/send_mail_test.py
diff --git a/appengine/mail/send_message.py → appengine/standard/mail/send_message.py b/appengine/mail/send_message.py → appengine/standard/mail/send_message.py
diff --git a/appengine/mail/send_message_test.py → appengine/standard/mail/send_message_test.py b/appengine/mail/send_message_test.py → appengine/standard/mail/send_message_test.py
diff --git a/appengine/mail/user_signup.py → appengine/standard/mail/user_signup.py b/appengine/mail/user_signup.py → appengine/standard/mail/user_signup.py
diff --git a/appengine/mail/user_signup_test.py → appengine/standard/mail/user_signup_test.py b/appengine/mail/user_signup_test.py → appengine/standard/mail/user_signup_test.py
diff --git a/appengine/mailgun/.gitignore → appengine/standard/mailgun/.gitignore b/appengine/mailgun/.gitignore → appengine/standard/mailgun/.gitignore
diff --git a/appengine/mailgun/README.md → appengine/standard/mailgun/README.md b/appengine/mailgun/README.md → appengine/standard/mailgun/README.md
diff --git a/appengine/mailgun/app.yaml → appengine/standard/mailgun/app.yaml b/appengine/mailgun/app.yaml → appengine/standard/mailgun/app.yaml
diff --git a/appengine/mailgun/appengine_config.py → ...gine/standard/mailgun/appengine_config.py b/appengine/mailgun/appengine_config.py → ...gine/standard/mailgun/appengine_config.py
diff --git a/appengine/mailgun/main.py → appengine/standard/mailgun/main.py b/appengine/mailgun/main.py → appengine/standard/mailgun/main.py
diff --git a/appengine/mailgun/main_test.py → appengine/standard/mailgun/main_test.py b/appengine/mailgun/main_test.py → appengine/standard/mailgun/main_test.py
diff --git a/appengine/mailgun/requirements.txt → appengine/standard/mailgun/requirements.txt b/appengine/mailgun/requirements.txt → appengine/standard/mailgun/requirements.txt
diff --git a/appengine/mailjet/.gitignore → appengine/standard/mailjet/.gitignore b/appengine/mailjet/.gitignore → appengine/standard/mailjet/.gitignore
diff --git a/appengine/mailjet/README.md → appengine/standard/mailjet/README.md b/appengine/mailjet/README.md → appengine/standard/mailjet/README.md
diff --git a/appengine/mailjet/app.yaml → appengine/standard/mailjet/app.yaml b/appengine/mailjet/app.yaml → appengine/standard/mailjet/app.yaml
diff --git a/appengine/mailjet/appengine_config.py → ...gine/standard/mailjet/appengine_config.py b/appengine/mailjet/appengine_config.py → ...gine/standard/mailjet/appengine_config.py
diff --git a/appengine/mailjet/main.py → appengine/standard/mailjet/main.py b/appengine/mailjet/main.py → appengine/standard/mailjet/main.py
diff --git a/managed_vms/mailjet/main_test.py → appengine/standard/mailjet/main_test.py b/managed_vms/mailjet/main_test.py → appengine/standard/mailjet/main_test.py
diff --git a/appengine/mailjet/requirements.txt → appengine/standard/mailjet/requirements.txt b/appengine/mailjet/requirements.txt → appengine/standard/mailjet/requirements.txt
diff --git a/appengine/mailjet/templates/index.html → ...ine/standard/mailjet/templates/index.html b/appengine/mailjet/templates/index.html → ...ine/standard/mailjet/templates/index.html
diff --git a/appengine/memcache/best_practices/README.md → ...tandard/memcache/best_practices/README.md b/appengine/memcache/best_practices/README.md → ...tandard/memcache/best_practices/README.md
diff --git a/...ne/memcache/best_practices/batch/app.yaml → ...rd/memcache/best_practices/batch/app.yaml b/...ne/memcache/best_practices/batch/app.yaml → ...rd/memcache/best_practices/batch/app.yaml
diff --git a/...ne/memcache/best_practices/batch/batch.py → ...rd/memcache/best_practices/batch/batch.py b/...ne/memcache/best_practices/batch/batch.py → ...rd/memcache/best_practices/batch/batch.py
diff --git a/...mcache/best_practices/batch/batch_test.py → ...mcache/best_practices/batch/batch_test.py b/...mcache/best_practices/batch/batch_test.py → ...mcache/best_practices/batch/batch_test.py
diff --git a/.../memcache/best_practices/failure/app.yaml → .../memcache/best_practices/failure/app.yaml b/.../memcache/best_practices/failure/app.yaml → .../memcache/best_practices/failure/app.yaml
diff --git a/...emcache/best_practices/failure/failure.py → ...emcache/best_practices/failure/failure.py b/...emcache/best_practices/failure/failure.py → ...emcache/best_practices/failure/failure.py
diff --git a/...he/best_practices/failure/failure_test.py → ...he/best_practices/failure/failure_test.py b/...he/best_practices/failure/failure_test.py → ...he/best_practices/failure/failure_test.py
diff --git a/...e/best_practices/migration_step1/app.yaml → ...e/best_practices/migration_step1/app.yaml b/...e/best_practices/migration_step1/app.yaml → ...e/best_practices/migration_step1/app.yaml
diff --git a/...t_practices/migration_step1/migration1.py → ...t_practices/migration_step1/migration1.py b/...t_practices/migration_step1/migration1.py → ...t_practices/migration_step1/migration1.py
diff --git a/...ctices/migration_step1/migration1_test.py → ...ctices/migration_step1/migration1_test.py b/...ctices/migration_step1/migration1_test.py → ...ctices/migration_step1/migration1_test.py
diff --git a/...e/best_practices/migration_step2/app.yaml → ...e/best_practices/migration_step2/app.yaml b/...e/best_practices/migration_step2/app.yaml → ...e/best_practices/migration_step2/app.yaml
diff --git a/...t_practices/migration_step2/migration2.py → ...t_practices/migration_step2/migration2.py b/...t_practices/migration_step2/migration2.py → ...t_practices/migration_step2/migration2.py
diff --git a/...ctices/migration_step2/migration2_test.py → ...ctices/migration_step2/migration2_test.py b/...ctices/migration_step2/migration2_test.py → ...ctices/migration_step2/migration2_test.py
diff --git a/.../memcache/best_practices/sharing/app.yaml → .../memcache/best_practices/sharing/app.yaml b/.../memcache/best_practices/sharing/app.yaml → .../memcache/best_practices/sharing/app.yaml
diff --git a/...emcache/best_practices/sharing/sharing.py → ...emcache/best_practices/sharing/sharing.py b/...emcache/best_practices/sharing/sharing.py → ...emcache/best_practices/sharing/sharing.py
diff --git a/...he/best_practices/sharing/sharing_test.py → ...he/best_practices/sharing/sharing_test.py b/...he/best_practices/sharing/sharing_test.py → ...he/best_practices/sharing/sharing_test.py
diff --git a/appengine/memcache/guestbook/README.md → ...ine/standard/memcache/guestbook/README.md b/appengine/memcache/guestbook/README.md → ...ine/standard/memcache/guestbook/README.md
diff --git a/appengine/memcache/guestbook/app.yaml → ...gine/standard/memcache/guestbook/app.yaml b/appengine/memcache/guestbook/app.yaml → ...gine/standard/memcache/guestbook/app.yaml
diff --git a/appengine/memcache/guestbook/favicon.ico → ...e/standard/memcache/guestbook/favicon.ico b/appengine/memcache/guestbook/favicon.ico → ...e/standard/memcache/guestbook/favicon.ico
diff --git a/appengine/memcache/guestbook/index.yaml → ...ne/standard/memcache/guestbook/index.yaml b/appengine/memcache/guestbook/index.yaml → ...ne/standard/memcache/guestbook/index.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
     <!doctype html>
     <html>
     <head>
-      <title>Pub/Sub Python on Google App Engine Managed VMs</title>
+      <title>Pub/Sub Python on Google App Engine Flexible Environment</title>
     </head>
     <body>
     <div>
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ These samples are used on the following documentation page:

		<!-- end-auto-doc-link -->

		Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
		Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.