summaryrefslogtreecommitdiffstats
path: root/docs/html/resources
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-01-05 13:52:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-05 13:52:53 -0800
commit3a2c6bf0fcae9421cccf113ff972df7aaeb6d3e9 (patch)
tree9cb0833fdaf4da5a536f4f1cb8ad57cf31c9a07f /docs/html/resources
parent978e41fccf278bb64c5204d80d8de95c9bf2e3d5 (diff)
parent69ea4e15e52c456537575d21443ac1efdb03a902 (diff)
downloadframeworks_base-3a2c6bf0fcae9421cccf113ff972df7aaeb6d3e9.zip
frameworks_base-3a2c6bf0fcae9421cccf113ff972df7aaeb6d3e9.tar.gz
frameworks_base-3a2c6bf0fcae9421cccf113ff972df7aaeb6d3e9.tar.bz2
am 69ea4e15: Documentation fixes found over vacation hacking.
* commit '69ea4e15e52c456537575d21443ac1efdb03a902': Documentation fixes found over vacation hacking.
Diffstat (limited to 'docs/html/resources')
-rw-r--r--docs/html/resources/articles/contacts.jd2
-rw-r--r--docs/html/resources/faq/commontasks.jd2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/resources/articles/contacts.jd b/docs/html/resources/articles/contacts.jd
index bdf84e6..c837dc3 100644
--- a/docs/html/resources/articles/contacts.jd
+++ b/docs/html/resources/articles/contacts.jd
@@ -107,7 +107,7 @@ disable aggregation altogether, as described in the sections below.</p>
<p>When a raw contact is added or modified, the system looks for matching
(overlapping) raw contacts with which to aggregate it. It may not find any
matching raw contacts, in which case it will create an aggregate contact that
-contains just the original raw contact. If it finds a single match,it creates a
+contains just the original raw contact. If it finds a single match, it creates a
new contact that contains the two raw contacts. And it may even find multiple
similar raw contacts, in which case it chooses the closest match. </p>
diff --git a/docs/html/resources/faq/commontasks.jd b/docs/html/resources/faq/commontasks.jd
index 9c32e9c..1173725 100644
--- a/docs/html/resources/faq/commontasks.jd
+++ b/docs/html/resources/faq/commontasks.jd
@@ -655,7 +655,7 @@ and the {@link android.os.Handler} documentation.</p>
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&gt;id=&quot;@+id/styled_welcome_message&quot;&gt;We
+ &nbsp;&nbsp;&nbsp;&nbsp;&lt;string&nbsp;id=&quot;@+id/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,