commit aaf8a9d885380abe62e635487b8bdc84d0c605f0
author Scott Main <smain@google.com> Wed Dec 16 10:28:11 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 16 10:28:11 2009 -0800
tree e447e4e322a81b6f4f3091239223bbc8845e0b82
parent f0165495951e3a32aa5697ac1299307c2d72f32a
parent 218c0763d5122ed975af7b9bd67e22def6364a23

am 218c0763: Merge change Ib43ec8f6 into eclair

Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp

* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
  docs: fix some typos in the manifest docs samples and

docs/html/guide/topics/manifest/activity-element.jd

diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd
index 83237c6..5362dd8 100644
--- a/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -5,17 +5,17 @@
 <dt>syntax:</dt>
 <dd><pre class="stx">&lt;activity android:<a href="#reparent">allowTaskReparenting</a>=["true" | "false"]
           android:<a href="#always">alwaysRetainTaskState</a>=["true" | "false"]
-          android:<a href="#clear">clearTaskOnLaunch</a>=["true"" | "false"]
-          android:<a href="#config">configChanges</a>=[<i>one or more of</i>: "mcc" "mnc" "locale" 
-                                 "touchscreen" "keyboard" "keyboardHidden" 
-                                 "navigation" "orientation" "fontScale"]
+          android:<a href="#clear">clearTaskOnLaunch</a>=["true" | "false"]
+          android:<a href="#config">configChanges</a>=["mcc", "mnc", "locale",
+                                 "touchscreen", "keyboard", "keyboardHidden",
+                                 "navigation", "orientation", "fontScale"]
           android:<a href="#enabled">enabled</a>=["true" | "false"]
           android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"]
           android:<a href="#exported">exported</a>=["true" | "false"]
           android:<a href="#finish">finishOnTaskLaunch</a>=["true" | "false"]
           android:<a href="#icon">icon</a>="<i>drawable resource</i>"
           android:<a href="#label">label</a>="<i>string resource</i>"
-          android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" | 
+          android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" |
                               "singleTask" | "singleInstance"]
           android:<a href="#multi">multiprocess</a>=["true" | "false"]
           android:<a href="#nm">name</a>="<i>string</i>"
@@ -23,16 +23,16 @@
           android:<a href="#prmsn">permission</a>="<i>string</i>"
           android:<a href="#proc">process</a>="<i>string</i>"
           android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" |
-                                     "landscape" | "portrait" | 
+                                     "landscape" | "portrait" |
                                      "sensor" | "nonsensor"]
           android:<a href="#state">stateNotNeeded</a>=["true" | "false"]
           android:<a href="#aff">taskAffinity</a>="<i>string</i>"
-          android:<a href="#theme">theme</a>="<i>resource or theme</i>" 
-          android:<a href="#wsoft">windowSoftInputMode</a>=[<i>one or more of</i>: "stateUnspecified" 
-                                       "stateUnchanged" "stateHidden" 
-                                       "stateAlwaysHidden" "stateVisible" 
-                                       "stateAlwaysVisible" "adjustUnspecified" 
-                                       "adjustResize" "adjustPan"] &gt;   <!-- ##api level 3## -->
+          android:<a href="#theme">theme</a>="<i>resource or theme</i>"
+          android:<a href="#wsoft">windowSoftInputMode</a>=["stateUnspecified",
+                                       "stateUnchanged", "stateHidden",
+                                       "stateAlwaysHidden", "stateVisible",
+                                       "stateAlwaysVisible", "adjustUnspecified",
+                                       "adjustResize", "adjustPan"] &gt;   <!-- ##api level 3## -->
     . . .
 &lt;/activity&gt;</pre></dd>
 

docs/html/guide/topics/manifest/manifest-intro.jd

diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
index 89171c1..c3e4a99 100644
--- a/docs/html/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html/guide/topics/manifest/manifest-intro.jd
@@ -445,7 +445,7 @@
     <permission android:name="com.example.project.DEBIT_ACCT" . . . />
     . . .
     <application . . .>
-        <activity android:name="com.example.project.FreneticActivity" . . . >
+        <activity android:name="com.example.project.FreneticActivity"
                   android:permission="com.example.project.DEBIT_ACCT"
                   . . . >
             . . .