diff --git a/README.md b/README.md
index fe35593b6..68604d28c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Getting started with Java on Google Cloud Platform
+# Getting started with Java® on Google Cloud Platform
 
 The code for the samples is contained in individual folders on this repository.
 Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
 ## Licensing
 
 * See [LICENSE](LICENSE)
+
+Java is a registered trademark of Oracle Corporation and/or its affiliates.
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java
index 9f494998b..c2424a7bb 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java
@@ -30,6 +30,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
+// [START example]
 public class RootServlet extends HttpServlet {
 
   @Override
@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     req.getRequestDispatcher("/books").forward(req, resp);
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LoginServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LoginServlet.java
index 7fe7b3c60..e0f55925d 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LoginServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LoginServlet.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @WebServlet(name = "login", value = "/login")
 @SuppressWarnings("serial")
 public class LoginServlet extends HttpServlet {
@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
     resp.sendRedirect(url);
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LogoutServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LogoutServlet.java
index b34710fc9..9416f4122 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LogoutServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/LogoutServlet.java
@@ -24,6 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @WebServlet(name = "logout", value = "/logout")
 @SuppressWarnings("serial")
 public class LogoutServlet extends HttpServlet {
@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
     req.getRequestDispatcher("/books").forward(req, resp);
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/Oauth2CallbackServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/Oauth2CallbackServlet.java
index 689ca6537..524896a9d 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/Oauth2CallbackServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/auth/Oauth2CallbackServlet.java
@@ -41,6 +41,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @WebServlet(name = "oauth2callback", value = "/oauth2callback")
 @SuppressWarnings("serial")
 public class Oauth2CallbackServlet extends HttpServlet {
@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
         req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/CreateBookServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/CreateBookServlet.java
index 51a423ae6..bf4dca2eb 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/CreateBookServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/CreateBookServlet.java
@@ -31,6 +31,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @SuppressWarnings("serial")
 @MultipartConfig
 @WebServlet(name = "create", value = "/create")
@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
     }
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/DeleteBookServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/DeleteBookServlet.java
index ca0feb6d4..3a11268be 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/DeleteBookServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/DeleteBookServlet.java
@@ -26,6 +26,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @SuppressWarnings("serial")
 @WebServlet(name = "delete", value = "/delete")
 public class DeleteBookServlet extends HttpServlet {
@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
     }
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListBookServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListBookServlet.java
index c2a91c765..f19c42ecf 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListBookServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListBookServlet.java
@@ -31,6 +31,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @SuppressWarnings("serial")
 @WebServlet(name = "list", value = "/books")
 public class ListBookServlet extends HttpServlet {
@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     req.getRequestDispatcher("/base.jsp").forward(req, resp);
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListByUserServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListByUserServlet.java
index 02bb87a45..aa11582bc 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListByUserServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ListByUserServlet.java
@@ -29,6 +29,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @SuppressWarnings("serial")
 @WebServlet(name = "listbyuser", value = "/books/mine")
 public class ListByUserServlet extends HttpServlet {
@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     req.getRequestDispatcher("/base.jsp").forward(req, resp);
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ReadBookServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ReadBookServlet.java
index 7939d01d0..0617a8f27 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ReadBookServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/ReadBookServlet.java
@@ -29,6 +29,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @SuppressWarnings("serial")
 @WebServlet(name = "read", value = "/read")
 public class ReadBookServlet extends HttpServlet {
@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     }
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/UpdateBookServlet.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/UpdateBookServlet.java
index 917105529..5c623649d 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/UpdateBookServlet.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/basicactions/UpdateBookServlet.java
@@ -29,6 +29,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+// [START example]
 @SuppressWarnings("serial")
 @MultipartConfig
 @WebServlet(name = "update", value = "/update")
@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
     }
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java
index 8c440e66b..984c9d7a6 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java
@@ -19,8 +19,8 @@
 import com.example.appengine.gettingstartedjava.objects.Book;
 import com.example.appengine.gettingstartedjava.objects.Result;
 
+// [START example]
 public interface BookDao {
-
   public Long createBook(Book book) throws Exception;
 
   public Book readBook(Long bookId) throws Exception;
@@ -33,3 +33,4 @@ public interface BookDao {
 
   public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java
index 848e3ea15..18b7baf0d 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java
@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+// [START example]
 public class CloudSqlDao implements BookDao {
 
   private static final BasicDataSource dataSource = new BasicDataSource();
@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
     }
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java
index f0c359ce7..9a8720b5c 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java
@@ -35,6 +35,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+// [START example]
 public class DatastoreDao implements BookDao {
 
   private Datastore datastore;
@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
     }
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java
index 2121708ff..49622c666 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java
@@ -16,6 +16,7 @@
 
 package com.example.appengine.gettingstartedjava.objects;
 
+// [START example]
 public class Book {
 
   private String title;
@@ -173,3 +174,4 @@ public String toString() {
         + ", Added by: " + createdBy;
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java
index 9f48b9a79..eafd23bd5 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+// [START example]
 public class Result<K> {
 
   public String cursor;
@@ -33,3 +34,4 @@ public Result(List<K> result) {
     this.cursor = null;
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/util/CloudStorageHelper.java b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/util/CloudStorageHelper.java
index a09d8a1df..3c115de85 100644
--- a/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/util/CloudStorageHelper.java
+++ b/bookshelf/src/main/java/com/example/appengine/gettingstartedjava/util/CloudStorageHelper.java
@@ -41,6 +41,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
 
+// [START example]
 public class CloudStorageHelper {
 
   private final Logger logger =
@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
     return imageUrl;
   }
 }
+// [END example]
diff --git a/bookshelf/src/main/webapp/WEB-INF/appengine-web.xml b/bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
index 66cdc3760..cbb5ece82 100644
--- a/bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+<!-- [START example] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <sessions-enabled>true</sessions-enabled>
   <threadsafe>true</threadsafe>
@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
     <property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
   </system-properties>
 </appengine-web-app>
+<!-- [END example] -->
diff --git a/bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml b/bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
index e46d2f5d4..9a1cf210f 100644
--- a/bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+<!-- [START example] -->
 <datastore-indexes
   autoGenerate="true">
     <datastore-index kind="Book" ancestor="false">
@@ -21,3 +22,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <property name="title" direction="asc" />
     </datastore-index>
 </datastore-indexes>
+<!-- [END example] -->
diff --git a/bookshelf/src/main/webapp/WEB-INF/web.xml b/bookshelf/src/main/webapp/WEB-INF/web.xml
index de2f4f0ef..babe5d794 100644
--- a/bookshelf/src/main/webapp/WEB-INF/web.xml
+++ b/bookshelf/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,5 @@
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+<!-- [START_EXCLUDE] -->
 <!--
 Copyright 2015 Google Inc. All Rights Reserved.
 
@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+<-- [END_EXCLUDE] -->
   <servlet>
     <servlet-name>root</servlet-name>
     <servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
diff --git a/bookshelf/src/main/webapp/base.jsp b/bookshelf/src/main/webapp/base.jsp
index 6accbbf80..b1bca1f57 100644
--- a/bookshelf/src/main/webapp/base.jsp
+++ b/bookshelf/src/main/webapp/base.jsp
@@ -1,6 +1,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <!DOCTYPE html>
+<!-- [START_EXCLUDE] -->
 <!--
 Copyright 2015 Google Inc. All Rights Reserved.
 
@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+<!-- [END_EXCLUDE] -->
 <html lang="en">
   <head>
     <title>Bookshelf - Java on Google Cloud Platform</title>
diff --git a/bookshelf/src/main/webapp/form.jsp b/bookshelf/src/main/webapp/form.jsp
index e700f0e23..6fa00cfc6 100644
--- a/bookshelf/src/main/webapp/form.jsp
+++ b/bookshelf/src/main/webapp/form.jsp
@@ -1,5 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<!-- [START_EXCLUDE] -->
 <!--
 Copyright 2015 Google Inc. All Rights Reserved.
 
@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+<!-- [END_EXCLUDE] -->
 <div class="container">
   <h3>
     <c:out value="${action}" />
diff --git a/bookshelf/src/main/webapp/list.jsp b/bookshelf/src/main/webapp/list.jsp
index 5db068fff..7579619f1 100644
--- a/bookshelf/src/main/webapp/list.jsp
+++ b/bookshelf/src/main/webapp/list.jsp
@@ -1,5 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!-- [START_EXCLUDE] -->
 <!--
 Copyright 2015 Google Inc. All Rights Reserved.
 
@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+<!-- [END_EXCLUDE] -->
 <div class="container">
   <h3>Books</h3>
   <a href="/create" class="btn btn-success btn-sm">
diff --git a/bookshelf/src/main/webapp/view.jsp b/bookshelf/src/main/webapp/view.jsp
index c5c49c295..43dbb77c2 100644
--- a/bookshelf/src/main/webapp/view.jsp
+++ b/bookshelf/src/main/webapp/view.jsp
@@ -1,5 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!-- [START_EXCLUDE] -->
 <!--
 Copyright 2015 Google Inc. All Rights Reserved.
 
@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+<!-- [END_EXCLUDE] -->
 <div class="container">
   <h3>Book</h3>
   <div class="btn-group">
diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 784b19d5f..7ede65eb7 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
           <target>1.7</target>
         </configuration>
       </plugin>
+<!-- START plugin -->
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
         <version>2.0.9.89.v20151202</version>
       </plugin>
+<!-- END plugin -->
     </plugins>
   </build>
 </project>