Merge branch 'master' into xmpp

waprin · waprin · commit 6f28c4e3b972 · 2016-04-28T15:47:05.000-07:00
diff --git a/appengine/mail/header.py b/appengine/mail/header.py
@@ -18,7 +18,7 @@
 
 
 def send_example_mail(sender_address, email_thread_id):
-    # [BEGIN send_mail]
+    # [START send_mail]
     mail.send_mail(sender=sender_address,
                    to="Albert Johnson <Albert.Johnson@example.com>",
                    subject="An example email",
@@ -28,7 +28,7 @@ def send_example_mail(sender_address, email_thread_id):
 The example.com Team
 """,
                    headers={"References": email_thread_id})
-    # [SEND send_mail]
+    # [END send_mail]
 
 
 class SendMailHandler(webapp2.RequestHandler):
diff --git a/appengine/mail/send_mail.py b/appengine/mail/send_mail.py
@@ -18,7 +18,7 @@
 
 
 def send_approved_mail(sender_address):
-    # [BEGIN send_mail]
+    # [START send_mail]
     mail.send_mail(sender=sender_address,
                    to="Albert Johnson <Albert.Johnson@example.com>",
                    subject="Your account has been approved",
@@ -32,7 +32,7 @@ def send_approved_mail(sender_address):
 
 The example.com Team
 """)
-    # [SEND send_mail]
+    # [END send_mail]
 
 
 class SendMailHandler(webapp2.RequestHandler):
diff --git a/appengine/mail/send_message.py b/appengine/mail/send_message.py
@@ -18,7 +18,7 @@
 
 
 def send_approved_mail(sender_address):
-    # [BEGIN send_message]
+    # [START send_message]
     message = mail.EmailMessage(
         sender=sender_address,
         subject="Your account has been approved")
@@ -35,7 +35,7 @@ def send_approved_mail(sender_address):
 The example.com Team
 """
     message.send()
-    # [SEND send_message]
+    # [END send_message]
 
 
 class SendMessageHandler(webapp2.RequestHandler):
