summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/fundamentals
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-06-01 09:46:04 -0700
committerScott Main <smain@google.com>2011-06-01 09:46:04 -0700
commitf5992953e410a7ce4028e17f50474679b30d2a2a (patch)
tree0cb57ad70c8806c432c9fd167cc182fec8794425 /docs/html/guide/topics/fundamentals
parentfd20656067c611d3fed3bce31c757691ca0abaf4 (diff)
downloadframeworks_base-f5992953e410a7ce4028e17f50474679b30d2a2a.zip
frameworks_base-f5992953e410a7ce4028e17f50474679b30d2a2a.tar.gz
frameworks_base-f5992953e410a7ce4028e17f50474679b30d2a2a.tar.bz2
docs: fix typos
Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
Diffstat (limited to 'docs/html/guide/topics/fundamentals')
-rw-r--r--docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
index bd542bd..cfed742 100644
--- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
+++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
@@ -10,8 +10,8 @@ parent.link=activities.html
<li>All activities belong to a task</li>
<li>A task contains a collection of activities in the order in which the user interacts with
them</li>
- <li>Tasks can move to the background and retain the state of each activity in order for the user
-to perform other tasks without loosing their work</li>
+ <li>Tasks can move to the background and retain the state of each activity in order for users
+to perform other tasks without losing their work</li>
</ul>
<h2>In this document</h2>
@@ -301,7 +301,7 @@ activity at the top of the back stack is <em>not</em> an existing instance of th
and D on top (the stack is A-B-C-D; D is on top). An intent arrives for an activity of type D.
If D has the default {@code "standard"} launch mode, a new instance of the class is launched and the
stack becomes A-B-C-D-D. However, if D's launch mode is {@code "singleTop"}, the existing instance
-of D is deliverd the intent through {@link
+of D receives the intent through {@link
android.app.Activity#onNewIntent onNewIntent()}, because it's at the top of the stack&mdash;the
stack remains A-B-C-D. However, if an intent arrives for an activity of type B, then a new
instance of B is added to the stack, even if its launch mode is {@code "singleTop"}.</p>
@@ -358,7 +358,7 @@ discussed more.</p>
<p class="note"><strong>Note:</strong> The behaviors that you specify for your activity with the <a
href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> attribute
-can be overriden by flags included with the intent that start your activity, as discussed in the
+can be overridden by flags included with the intent that start your activity, as discussed in the
next section.</p>