Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
diff --git a/docs/html/training/wearables/ui/cards.jd b/docs/html/training/wearables/ui/cards.jd
index 0633720..21f7e5c 100644
--- a/docs/html/training/wearables/ui/cards.jd
+++ b/docs/html/training/wearables/ui/cards.jd
@@ -167,3 +167,9 @@
     cardScrollView.setCardGravity(Gravity.BOTTOM);
 }
 </pre>
+
+<p><code>CardScrollView</code> detects the shape of the screen and displays the card differently
+on round and square devices, using wider side margins on round screens. However,
+placing the <code>CardScrollView</code> element inside a <code>BoxInsetLayout</code> and using the
+<code>layout_box="bottom"</code> attribute is useful to align the card to the bottom of round
+screens without cropping its content.</p>
diff --git a/docs/html/training/wearables/ui/exit.jd b/docs/html/training/wearables/ui/exit.jd
index b89711a..84e1e45 100644
--- a/docs/html/training/wearables/ui/exit.jd
+++ b/docs/html/training/wearables/ui/exit.jd
@@ -28,7 +28,7 @@
 You must also inform your users the first time they run your app that they can exit using
 a long press.</p>
 
-<p>For design guidelines on exiting Android Wear activities, see
+<p>For design guidelines about exiting Android Wear activities, see
 <a href="{@docRoot}design/wear/structure.html#Custom">Breaking out of the card</a>.</p>
 
 
diff --git a/docs/html/training/wearables/ui/lists.jd b/docs/html/training/wearables/ui/lists.jd
index 5458541..e8aaed4 100644
--- a/docs/html/training/wearables/ui/lists.jd
+++ b/docs/html/training/wearables/ui/lists.jd
@@ -172,8 +172,9 @@
 definition uses the custom layout implementation from the previous section and defines an icon
 and a text view whose IDs match those in the layout implementation class:</p>
 
+<p class="code-caption">res/layout/list_item.xml</p>
+
 <pre>
-&lt;-- res/layout/list_item.xml -->
 &lt;com.example.android.support.wearable.notifications.WearableListItemLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:gravity="center_vertical"