From 05bd673250139b992c314d93f8a08db67e2d3799 Mon Sep 17 00:00:00 2001
From: Scott Main <smain@google.com>
Date: Thu, 22 Apr 2010 11:01:17 -0700
Subject: [PATCH] title the searchable dictionary app as "v2" because it
 includes significant changes and it's worth highlighting the revision. some
 revisions to the sample desciption. a companion change to the resources
 navigation link will follow (to name it v2).

Change-Id: Ib11cae9e4cc753f76b45ae446ef9871fee674e7a
---
 build/sdk.atree                          |  2 +-
 samples/SearchableDictionary/_index.html | 26 +++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/build/sdk.atree b/build/sdk.atree
index 3c92d083c..d06ca34b0 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -97,7 +97,7 @@ development/samples/SkeletonApp              samples/${PLATFORM_NAME}/SkeletonAp
 development/samples/Snake                    samples/${PLATFORM_NAME}/Snake
 development/samples/SoftKeyboard             samples/${PLATFORM_NAME}/SoftKeyboard
 development/samples/JetBoy                   samples/${PLATFORM_NAME}/JetBoy
-development/samples/SearchableDictionary     samples/${PLATFORM_NAME}/SearchableDictionary
+development/samples/SearchableDictionary     samples/${PLATFORM_NAME}/SearchableDictionaryV2
 development/samples/ContactManager           samples/${PLATFORM_NAME}/ContactManager
 development/samples/MultiResolution          samples/${PLATFORM_NAME}/MultiResolution
 development/samples/Wiktionary               samples/${PLATFORM_NAME}/Wiktionary
diff --git a/samples/SearchableDictionary/_index.html b/samples/SearchableDictionary/_index.html
index 6f9d99762..4f753e65b 100644
--- a/samples/SearchableDictionary/_index.html
+++ b/samples/SearchableDictionary/_index.html
@@ -4,22 +4,19 @@
 app (via the device search button or Menu > Search), you can perform a search
 across the dictionary. As you type, suggestions will appear, which you can select
 to view the complete definition. You can also execute the search to view all word definitions
-that match the entered text.</p>
-
-<p>The application also grants content provider privileges to 
-Quick Search Box, Android's system-wide search tool. This means that the
-dictionary definitions can be offered as search suggestions outside of the application,
-when text is entered into Quick Search Box.</p>
+that match the entered text. The application also allows Quick Search Box (Android's system-wide
+search) to provide dictionary suggestions.</p>
 
 <p>The code in this application demonstrates how to:</p>
 <ul>
   <li>Implement a search interface using Android's search framework</li>
   <li>Provide custom search suggestions and offer them in Quick Search Box</li>
-  <li>Create an FTS3 table in SQLite and perform full-text search</li>
-  <li>Create a content provider to perform all searches and queries to the dictionary</li>
-  <li>Use <a
-href="../../../reference/android/widget/SimpleCursorAdapter.html">SimpleCursorAdapter</a> to bind
-data from a Cursor to a ListView.</li>
+  <li>Create an SQLite database and an FTS3 table for full-text searches</li>
+  <li>Create a <a href="../../../guide/topics/providers/content-provider.html">content
+provider</a> to perform all search and suggestion queries</li>
+  <li>Use <code><a
+href="../../../reference/android/widget/SimpleCursorAdapter.html">SimpleCursorAdapter</a></code> to
+bind data from a Cursor to a ListView.</li>
 </ul>
 
 <p>See also:</p>
@@ -27,6 +24,11 @@ data from a Cursor to a ListView.</li>
   <li><a href="../../../guide/topics/search/index.html">Search Developer Guide</a></li>
 </ul>
 
+<p class="note"><strong>Note:</strong> For the original version of Searchable Dictionary, which
+reads words from a file instead of a database and uses a custom <code><a
+href="../../../reference/android/widget/BaseAdapter.html">BaseAdapter</a></code>, see the SDK
+samples included with the platforms for API Level 4-6.</p>
+
 
 <img src="../images/SearchableDictionary1.png" />
-<img src="../images/SearchableDictionary2.png" />
\ No newline at end of file
+<img src="../images/SearchableDictionary2.png" />