summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/fundamentals
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-03-09 10:55:50 -0800
committerScott Main <smain@google.com>2012-03-09 12:30:40 -0800
commit8edad6f16fc1d60a163e0f63153ff4f8a95e6c0e (patch)
treecae809f282e74cc63a1de7be89c9bc81567b95b7 /docs/html/guide/topics/fundamentals
parent33372b217ea5e9950560449aa5c86e0f0ddacc74 (diff)
downloadframeworks_base-8edad6f16fc1d60a163e0f63153ff4f8a95e6c0e.zip
frameworks_base-8edad6f16fc1d60a163e0f63153ff4f8a95e6c0e.tar.gz
frameworks_base-8edad6f16fc1d60a163e0f63153ff4f8a95e6c0e.tar.bz2
docs: Fix a bunch of misc doc issues from external tracker
Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73
Diffstat (limited to 'docs/html/guide/topics/fundamentals')
-rw-r--r--docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd4
1 files changed, 2 insertions, 2 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 465cf54..0880614 100644
--- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
+++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
@@ -154,7 +154,7 @@ See the following section about <a href="#ActivityState">Activity state</a>.</p>
<p>Because the activities in the back stack are never rearranged, if your application allows
users to start a particular activity from more than one activity, a new instance of
-that activity is created and popped onto the stack (rather than bringing any previous instance of
+that activity is created and pushed onto the stack (rather than bringing any previous instance of
the activity to the top). As such, one activity in your application might be instantiated multiple
times (even from different tasks), as shown in figure 3. As such, if the user navigates backward
using the <em>Back</em> button, each instance of the activity is revealed in the order they were
@@ -291,7 +291,7 @@ B should associate with current task. If both activities define how Activity B
should associate with a task, then Activity A's request (as defined in the intent) is honored
over Activity B's request (as defined in its manifest).</p>
-<p class="note"><strong>Note:</strong> Some the launch modes available in the manifest
+<p class="note"><strong>Note:</strong> Some launch modes available for the manifest file
are not available as flags for an intent and, likewise, some launch modes available as flags
for an intent cannot be defined in the manifest.</p>