summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/faq
diff options
context:
space:
mode:
authorMark Doliner <mark@kingant.net>2014-08-27 16:04:02 -0700
committerMark Doliner <mark@kingant.net>2014-09-05 13:57:51 -0700
commitd0646dca40ff740bd49755ad60751678b0ccca52 (patch)
tree8e1cf2b4efebac703e253a1f14abc34557e8154e /docs/html/guide/faq
parent2d3571cc17a5a6b1072951227d889ce14a3f88cf (diff)
downloadframeworks_base-d0646dca40ff740bd49755ad60751678b0ccca52.zip
frameworks_base-d0646dca40ff740bd49755ad60751678b0ccca52.tar.gz
frameworks_base-d0646dca40ff740bd49755ad60751678b0ccca52.tar.bz2
Small documentation fixes across many files.
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
Diffstat (limited to 'docs/html/guide/faq')
-rw-r--r--docs/html/guide/faq/commontasks.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/faq/commontasks.jd b/docs/html/guide/faq/commontasks.jd
index 086721f..2943aef 100644
--- a/docs/html/guide/faq/commontasks.jd
+++ b/docs/html/guide/faq/commontasks.jd
@@ -653,7 +653,7 @@ and the {@link android.os.Handler} documentation.</p>
<p>You can highlight or style the formatting of strings or substrings of text in
a TextView object. There are two ways to do this:</p>
<ul>
- <li>If you use a <a href="{@docRoot}guide/topics/resources/available-resources.html#stringresources">string resource</a>,
+ <li>If you use a <a href="{@docRoot}guide/topics/resources/string-resource.html">string resource</a>,
you can add some simple styling, such as bold or italic using HTML notation.
The currently supported tags are: <code>B</code> (bold),
<code>I</code> (italic), <code>U</code> (underline),
@@ -661,8 +661,8 @@ and the {@link android.os.Handler} documentation.</p>
<code>SUP</code> (superscript), <code>SUB</code> (subscript),
and <code>STRIKE</code> (strikethrough).
So, for example, in res/values/strings.xml you could declare this:<br />
- <code>&lt;resource&gt;<br />
- &nbsp;&nbsp;&nbsp;&nbsp;&lt;string&nbsp;id=&quot;@+id/styled_welcome_message&quot;&gt;We
+ <code>&lt;resources&gt;<br />
+ &nbsp;&nbsp;&nbsp;&nbsp;&lt;string&nbsp;name=&quot;styled_welcome_message&quot;&gt;We
are &lt;b&gt;&lt;i&gt;so&lt;/i&gt;&lt;/b&gt; glad to see you.&lt;/string&gt;<br />
&lt;/resources&gt;</code></li>
<li>To style text on the fly, or to add highlighting or more complex styling,