diff --git a/docs/html/training/implementing-navigation/ancestral.jd b/docs/html/training/implementing-navigation/ancestral.jd
index 4e0b742afdb68..c3c7ef8a882bf 100644
--- a/docs/html/training/implementing-navigation/ancestral.jd
+++ b/docs/html/training/implementing-navigation/ancestral.jd
@@ -1,4 +1,5 @@
 page.title=Providing Up Navigation
+page.tags="up navigation","NavUtils","TaskStackBuilder"
 
 trainingnavtop=true
 
diff --git a/docs/html/training/implementing-navigation/index.jd b/docs/html/training/implementing-navigation/index.jd
index 35771704b3c2f..519f6bb43a058 100644
--- a/docs/html/training/implementing-navigation/index.jd
+++ b/docs/html/training/implementing-navigation/index.jd
@@ -1,5 +1,4 @@
 page.title=Implementing Effective Navigation
-page.tags="viewpager","tasks","back","up","swipe view","DrawerLayout"
 
 trainingnavtop=true
 startpage=true
diff --git a/docs/html/training/implementing-navigation/lateral.jd b/docs/html/training/implementing-navigation/lateral.jd
index 4ab8fbd84fb94..3784372cfb820 100644
--- a/docs/html/training/implementing-navigation/lateral.jd
+++ b/docs/html/training/implementing-navigation/lateral.jd
@@ -1,4 +1,5 @@
 page.title=Creating Swipe Views with Tabs
+page.tags="viewpager","horizontal","paging"
 
 trainingnavtop=true
 
@@ -297,4 +298,4 @@ adapter) occupy the remaining space inside the {@link android.support.v4.view.Vi
         android:paddingBottom="4dp" />
 
 </android.support.v4.view.ViewPager>
-</pre>
\ No newline at end of file
+</pre>
diff --git a/docs/html/training/implementing-navigation/nav-drawer.jd b/docs/html/training/implementing-navigation/nav-drawer.jd
index 756e6c4a2b91c..81c792d92ea09 100644
--- a/docs/html/training/implementing-navigation/nav-drawer.jd
+++ b/docs/html/training/implementing-navigation/nav-drawer.jd
@@ -1,4 +1,5 @@
 page.title=Creating a Navigation Drawer
+page.tags="DrawerLayout", "navigation"
 
 trainingnavtop=true
 
@@ -365,4 +366,4 @@ public class MainActivity extends Activity {
 </pre>
 
 <p>For a complete example of a navigation drawer, download the sample available at the
-<a href="#top">top of the page</a>.</p>
\ No newline at end of file
+<a href="#top">top of the page</a>.</p>
diff --git a/docs/html/training/implementing-navigation/temporal.jd b/docs/html/training/implementing-navigation/temporal.jd
index c34a5cfe678ac..0719ba6833c22 100644
--- a/docs/html/training/implementing-navigation/temporal.jd
+++ b/docs/html/training/implementing-navigation/temporal.jd
@@ -1,4 +1,5 @@
 page.title=Providing Proper Back Navigation
+page.tags="back navigation","NavUtils","TaskStackBuilder"
 
 trainingnavtop=true