diff options
| author | 2010-05-24 10:01:49 -0700 | |
|---|---|---|
| committer | 2010-05-24 10:01:49 -0700 | |
| commit | b59fbafe5d184017fe951afd6002e8408bf5c279 (patch) | |
| tree | c5de1f11b518a6b57331fd5f65eada1b81380b76 | |
| parent | cbcf8f6311e28a1bc74b780dc72adecbcfe61d44 (diff) | |
| parent | 3cffe1ababdb09f4a90274e25c2f66feee299835 (diff) | |
am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken
* commit '3cffe1ababdb09f4a90274e25c2f66feee299835':
Doc change: Fix incorrect adt version reference etc.
| -rw-r--r-- | docs/html/index.jd | 5 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/hello-world.jd | 4 | ||||
| -rw-r--r-- | docs/html/sdk/eclipse-adt.jd | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 0ba5e08184b1..01940e82b31b 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -14,9 +14,8 @@ home=true <img src="{@docRoot}images/home/io-logo.png" alt="Google IO 2010" width="200" height="41" style="padding:22px 12px;"/> <div id="announcement" style="width:295px"> -<p>Google I/O is happening now! To those of you with us, welcome! If you couldn't make it to the -event, stay tuned for videos and slides from the Android sessions, which will be posted at the -Google I/O web site.</p><p><a +<p>Thanks to everyone who visited us at Google I/O in San Francisco! Stay tuned for +videos and slides from the Android sessions, which will be posted at the Google I/O web site.</p><p><a href="http://code.google.com/events/io/2010/sessions.html#Android">Learn more »</a></p> </div> <!-- end annoucement --> </div> <!-- end annoucement-block --> diff --git a/docs/html/resources/tutorials/hello-world.jd b/docs/html/resources/tutorials/hello-world.jd index 7bad0541114a..77ffc6f46b9f 100644 --- a/docs/html/resources/tutorials/hello-world.jd +++ b/docs/html/resources/tutorials/hello-world.jd @@ -299,7 +299,7 @@ programmatically-constructed example:</p> <pre><?xml version="1.0" encoding="utf-8"?> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@id+/textview" + android:id="@+id/textview" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/hello"/></pre> @@ -410,7 +410,7 @@ the following XML: <pre><?xml version="1.0" encoding="utf-8"?> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@id+/textview" + android:id="@+id/textview" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/hello"/></pre> diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index 57eac1f0320c..f5558ab831a6 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -95,7 +95,7 @@ padding: .25em 1em; <div class="toggleable opened"> <a href="#" onclick="return toggleDiv(this)"> <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" /> -ADT 0.9.6</a> <em>(March 2010)</em> +ADT 0.9.7</a> <em>(May 2010)</em> <div class="toggleme"> <dl> |