diff options
| author | kmccormick <kmccormick@google.com> | 2013-04-03 20:07:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-03 20:07:53 +0000 |
| commit | 8b5e342b0e24b9bb546456209d9d27480fa233e8 (patch) | |
| tree | e8871a28a02cd2b004dde7b7f9a5e592a3c6d22b /docs/html/guide/components | |
| parent | 555c82cd43ef8d11bcf54f023864619869c06411 (diff) | |
| parent | 76dfc02135abae5337b48fe99a1b8c0a7d95e33a (diff) | |
| download | frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.zip frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.tar.gz frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.tar.bz2 | |
Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
Diffstat (limited to 'docs/html/guide/components')
| -rw-r--r-- | docs/html/guide/components/fundamentals.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/components/tasks-and-back-stack.jd | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/components/fundamentals.jd b/docs/html/guide/components/fundamentals.jd index 2c33a26..ce50022 100644 --- a/docs/html/guide/components/fundamentals.jd +++ b/docs/html/guide/components/fundamentals.jd @@ -345,7 +345,7 @@ receivers can be either declared in the manifest or created dynamically in code {@link android.content.BroadcastReceiver} objects) and registered with the system by calling {@link android.content.Context#registerReceiver registerReceiver()}.</p> -<p>For more about how to structure the manifest file for your application, see the <a +<p>For more about how to structure the manifest file for your application, see <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a> documentation. </p> diff --git a/docs/html/guide/components/tasks-and-back-stack.jd b/docs/html/guide/components/tasks-and-back-stack.jd index ecaba8d..a21bf34 100644 --- a/docs/html/guide/components/tasks-and-back-stack.jd +++ b/docs/html/guide/components/tasks-and-back-stack.jd @@ -231,7 +231,7 @@ activities except for the root activity when the user leaves the task.</p> <activity>}</a> manifest element and with flags in the intent that you pass to {@link android.app.Activity#startActivity startActivity()}.</p> -<p>In this regard, the the principal <a +<p>In this regard, the principal <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> attributes you can use are:</p> @@ -319,7 +319,7 @@ each instance can belong to different tasks, and one task can have multiple inst routes the intent to that instance through a call to its {@link android.app.Activity#onNewIntent onNewIntent()} method, rather than creating a new instance of the activity. The activity can be instantiated multiple times, each instance can -belong to different tasks, and one task can have multiple instances (but only if the the +belong to different tasks, and one task can have multiple instances (but only if the activity at the top of the back stack is <em>not</em> an existing instance of the activity). <p>For example, suppose a task's back stack consists of root activity A with activities B, C, and D on top (the stack is A-B-C-D; D is on top). An intent arrives for an activity of type D. |