Update more docs to follow new Managed VM branding.

Change-Id: I1efa86d65a60795877e22f78db27a5f5e4347055

appengine_vm.go

@@ -17,12 +17,12 @@ import (
 // the Main function to use in the synthetic main.
 //   The gophers party all night; the rabbits provide the beats.
 
-// Main is the principal entry point for a Managed VMs app.
+// Main is the principal entry point for an app running in App Engine "flexible environment".
 // It installs a trivial health checker if one isn't already registered,
 // and starts listening on port 8080 (overridden by the $PORT environment
 // variable).
 //
-// See https://cloud.google.com/appengine/docs/managed-vms/custom-runtimes#health_check_requests
+// See https://cloud.google.com/appengine/docs/flexible/custom-runtimes#health_check_requests
 // for details on how to do your own health checking.
 //
 // Main never returns.
@@ -50,7 +50,7 @@ func Main() {
 
 // BackgroundContext returns a context not associated with a request.
 // This should only be used when not servicing a request.
-// This only works on Managed VMs.
+// This only works in App Engine "flexible environment".
 func BackgroundContext() context.Context {
 	return internal.BackgroundContext()
 }

capability/capability.go

@@ -6,7 +6,7 @@
 Package capability exposes information about outages and scheduled downtime
 for specific API capabilities.
 
-This package does not work on Managed VMs.
+This package does not work in App Engine "flexible environment".
 
 Example:
 	if !capability.Enabled(c, "datastore_v3", "write") {

cloudsql/cloudsql.go

@@ -5,7 +5,7 @@
 /*
 Package cloudsql exposes access to Google Cloud SQL databases.
 
-This package does not work on Managed VMs.
+This package does not work in App Engine "flexible environment".
 
 This package is intended for MySQL drivers to make App Engine-specific
 connections. Applications should use this package through database/sql:

cloudsql/cloudsql_vm.go

@@ -12,5 +12,5 @@ import (
 )
 
 func connect(instance string) (net.Conn, error) {
-	return nil, errors.New("cloudsql: not supported in Managed VMs")
+	return nil, errors.New(`cloudsql: not supported in App Engine "flexible environment"`)
 }

cmd/aebundler/aebundler.go

@@ -31,7 +31,7 @@ import (
 var (
 	output  = flag.String("o", "", "name of output tar file or '-' for stdout")
 	rootDir = flag.String("root", ".", "directory name of application root")
-	vm      = flag.Bool("vm", true, "bundle a Managed VM app")
+	vm      = flag.Bool("vm", true, `bundle an app for App Engine "flexible environment"`)
 
 	skipFiles = map[string]bool{
 		".git":        true,

cmd/aedeploy/aedeploy.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-// Program aedeploy assists with deploying Go Managed VM apps to production.
+// Program aedeploy assists with deploying App Engine "flexible environment" Go apps to production.
 // A temporary directory is created; the app, its subdirectories, and all its
 // dependencies from $GOPATH are copied into the directory; then the app
 // is deployed to production with the provided command.
@@ -253,7 +253,7 @@ func appFiles(ctxt *build.Context) ([]string, error) {
 		return nil, err
 	}
 	if !pkg.IsCommand() {
-		return nil, fmt.Errorf(`the root of your app needs to be package "main" (currently %q). Please see https://cloud.google.com/appengine/docs/go/managed-vms for more details on structuring your app.`, pkg.Name)
+		return nil, fmt.Errorf(`the root of your app needs to be package "main" (currently %q). Please see https://cloud.google.com/appengine/docs/flexible/go/ for more details on structuring your app.`, pkg.Name)
 	}
 	var appFiles []string
 	for _, f := range pkg.GoFiles {

demos/guestbook/app.yaml

@@ -1,4 +1,4 @@
-# Demo application for Managed VMs.
+# Demo application for App Engine "flexible environment".
 runtime: go
 vm: true
 api_version: go1

demos/guestbook/guestbook.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-// This example only works on Managed VMs.
+// This example only works on App Engine "flexible environment".
 // +build !appengine
 
 package main

demos/helloworld/helloworld.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-// This example only works on Managed VMs.
+// This example only works on App Engine "flexible environment".
 // +build !appengine
 
 package main

runtime/runtime.go

@@ -6,7 +6,7 @@
 Package runtime exposes information about the resource usage of the application.
 It also provides a way to run code in a new background context of a module.
 
-This package does not work on Managed VMs.
+This package does not work on App Engine "flexible environment".
 */
 package runtime // import "google.golang.org/appengine/runtime"
 

socket/doc.go

@@ -5,6 +5,6 @@
 // Package socket provides outbound network sockets.
 //
 // This package is only required in the classic App Engine environment.
-// Applications running only in the Managed VM hosting environment should
+// Applications running only in App Engine "flexible environment" should
 // use the standard library's net package.
 package socket

socket/socket_vm.go

@@ -53,12 +53,12 @@ type Conn struct {
 // such as when a connection is created during a warmup request but used while
 // servicing a user request.
 func (cn *Conn) SetContext(ctx context.Context) {
-	// This function is not required on managed VMs.
+	// This function is not required in App Engine "flexible environment".
 }
 
 // KeepAlive signals that the connection is still in use.
 // It may be called to prevent the socket being closed due to inactivity.
 func (cn *Conn) KeepAlive() error {
-	// This function is not required on managed VMs.
+	// This function is not required in App Engine "flexible environment".
 	return nil
 }