commit 9f061e2809ce89e0646519791cb69825abbb03a5
author Scott Main <smain@google.com> Mon Jul 23 18:32:03 2012 -0700
committer Scott Main <smain@google.com> Mon Jul 23 18:32:03 2012 -0700
tree 1b2e9aee81ee6d361dd994f92d2fe73819cf5d5b
parent fc815c328bea63c2dee7e67b81c95d7c4d5696bb

fix information about layout overrides
bug: 6852515

Change-Id: I80681a06e87aad3de8243bb731d7513e5aa29d08

docs/html/guide/topics/resources/layout-resource.jd

diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd
index 5643075..c653b0c 100644
--- a/docs/html/guide/topics/resources/layout-resource.jd
+++ b/docs/html/guide/topics/resources/layout-resource.jd
@@ -161,11 +161,10 @@
 supported by the root element in the included layout and they will override those defined in the
 root element.</p>
 
-      <p class="caution"><strong>Caution:</strong> If you want to override the layout dimensions,
-you must override both <code>android:layout_height</code> and
-<code>android:layout_width</code>&mdash;you cannot override only the height or only the width.
-If you override only one, it will not take effect. (Other layout properties, such as weight,
-are still inherited from the source layout.)</p>
+    <p class="caution"><strong>Caution:</strong> If you want to override layout attributes using
+      the <code>&lt;include&gt;</code> tag, you must override both
+      <code>android:layout_height</code> and <code>android:layout_width</code> in order for
+      other layout attributes to take effect.</p>
 
     <p>Another way to include a layout is to use {@link android.view.ViewStub}. It is a lightweight
 View that consumes no layout space until you explicitly inflate it, at which point, it includes a