diff --git a/appengine/remote/remote-client/pom.xml b/appengine/remote/remote-client/pom.xml
index 7cc0db66a85..7fa8cf36180 100644
--- a/appengine/remote/remote-client/pom.xml
+++ b/appengine/remote/remote-client/pom.xml
@@ -33,10 +33,12 @@
       <artifactId>appengine-remote-api</artifactId>
       <version>${appengine.sdk.version}</version>
     </dependency>
+    <!-- [START dependencies] -->
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
     </dependency>
+    <!-- [END dependencies] -->
   </dependencies>
   <build>
     <!-- for hot reload of the web application -->
diff --git a/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml b/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
index 6da6fe9bffa..4fe6a96380f 100644
--- a/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- [START_EXCLUDE] -->
+<!-- [START EXCLUDE] -->
 <!--
   Copyright 2016 Google Inc. All Rights Reserved.
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +12,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- [END_EXCLUDE] -->
+<!-- [END EXCLUDE] -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
   xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
   version="2.5">
+  <!-- [START web] -->
   <servlet>
     <display-name>Remote API Servlet</display-name>
     <servlet-name>RemoteApiServlet</servlet-name>
@@ -27,6 +28,7 @@
     <servlet-name>RemoteApiServlet</servlet-name>
     <url-pattern>/remote_api</url-pattern>
   </servlet-mapping>
+  <!-- [END web] -->
   <servlet>
     <servlet-name>remote</servlet-name>
     <servlet-class>com.example.appengine.remote.RemoteServlet</servlet-class>