am fd51698: docs: misc bugs from external tracker

* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
  docs: misc bugs from external tracker

core/java/android/app/DialogFragment.java

@@ -60,7 +60,7 @@
  *
  * <p>DialogFragment needs to ensure that what is happening with the Fragment
  * and Dialog states remains consistent. To do this, it watches for dismiss
- * events from the dialog and takes are of removing its own state when they
+ * events from the dialog and takes care of removing its own state when they
  * happen. This means you should use {@link #show(FragmentManager, String)}
  * or {@link #show(FragmentTransaction, String)} to add an instance of
  * DialogFragment to your UI, as these keep track of how DialogFragment should

docs/html/guide/components/intents-filters.jd

@@ -654,8 +654,8 @@ category:
 </p>
 
 <pre>&lt;intent-filter . . . &gt;
- &lt;action android:name="code android.intent.action.MAIN" /&gt;
- &lt;category android:name="code android.intent.category.LAUNCHER" /&gt;
+ &lt;action android:name="android.intent.action.MAIN" /&gt;
+ &lt;category android:name="android.intent.category.LAUNCHER" /&gt;
 &lt;/intent-filter&gt;</pre>
 
 

docs/html/guide/topics/ui/dialogs.jd

@@ -47,7 +47,7 @@ TimePicker</a></li>
 
 <p>A dialog is usually a small window that appears in front of the current Activity.
 The underlying Activity loses focus and the dialog accepts all user interaction. Dialogs are
-normally used for notifications that should interupt the user and to perform short tasks that
+normally used for notifications that should interrupt the user and to perform short tasks that
 directly relate to the application in progress (such as a progress bar or a login prompt).</p>
 
 <p>The {@link android.app.Dialog} class is the base class for creating dialogs. However, you

docs/html/training/basics/intents/sending.jd

@@ -112,7 +112,7 @@ emailIntent.setType(HTTP.PLAIN_TEXT_TYPE);
 emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] {"[email protected]"}); // recipients
 emailIntent.putExtra(Intent.EXTRA_SUBJECT, "Email subject");
 emailIntent.putExtra(Intent.EXTRA_TEXT, "Email message text");
-emailIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content:https://path/to/email/attachment");
+emailIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content:https://path/to/email/attachment"));
 // You can also attach multiple items by passing an ArrayList of Uris
 </pre>
  </li>

docs/html/training/basics/supporting-devices/languages.jd

@@ -92,8 +92,8 @@ locale currently set for the user's device.</p>
 <pre>
 &lt;?xml version="1.0" encoding="utf-8"?>
 &lt;resources>
- &lt;string name="title">Ma Application&lt;/string>
- &lt;string name="hello_world">Bonjour tout le Monde!&lt;/string>
+ &lt;string name="title">Mon Application&lt;/string>
+ &lt;string name="hello_world">Bonjour le monde !&lt;/string>
 &lt;/resources>
 </pre>
 

docs/html/training/cloudsync/aesync.jd

@@ -224,8 +224,8 @@ public Task find(Long id) {
  PersistenceManager pm = PMF.get().getPersistenceManager();
  try {
  Query query = pm.newQuery("select from " + Task.class.getName()
- + " where id==" + id.toString() + " && emailAddress=='" + getUserEmail() + "'");
- List<Task> list = (List<Task>) query.execute();
+ + " where id==" + id.toString() + " &amp;&amp; emailAddress=='" + getUserEmail() + "'");
+ List&lt;Task> list = (List&lt;Task>) query.execute();
  return list.size() == 0 ? null : list.get(0);
  } catch (RuntimeException e) {
  System.out.println(e);
@@ -273,24 +273,24 @@ like this:</p>
 public void fetchTasks (Long id) {
  // Request is wrapped in an AsyncTask to avoid making a network request
  // on the UI thread.
- new AsyncTask<Long, Void, List<TaskProxy>>() {
+ new AsyncTask&lt;Long, Void, List&lt;TaskProxy>>() {
  &#64;Override
- protected List<TaskProxy> doInBackground(Long... arguments) {
- final List<TaskProxy> list = new ArrayList<TaskProxy>();
+ protected List&lt;TaskProxy> doInBackground(Long... arguments) {
+ final List&lt;TaskProxy> list = new ArrayList&lt;TaskProxy>();
  MyRequestFactory factory = Util.getRequestFactory(mContext,
  MyRequestFactory.class);
  TaskRequest taskRequest = factory.taskNinjaRequest();
 
  if (arguments.length == 0 || arguments[0] == -1) {
- factory.taskRequest().queryTasks().fire(new Receiver<List<TaskProxy>>() {
+ factory.taskRequest().queryTasks().fire(new Receiver&lt;List&lt;TaskProxy>>() {
  &#64;Override
- public void onSuccess(List<TaskProxy> arg0) {
+ public void onSuccess(List&lt;TaskProxy> arg0) {
  list.addAll(arg0);
  }
  });
  } else {
  newTask = true;
- factory.taskRequest().readTask(arguments[0]).fire(new Receiver<TaskProxy>() {
+ factory.taskRequest().readTask(arguments[0]).fire(new Receiver&lt;TaskProxy>() {
  &#64;Override
  public void onSuccess(TaskProxy arg0) {
  list.add(arg0);
@@ -301,15 +301,15 @@ public void fetchTasks (Long id) {
  }
 
  &#64;Override
- protected void onPostExecute(List<TaskProxy> result) {
+ protected void onPostExecute(List&lt;TaskProxy> result) {
  TaskNinjaActivity.this.dump(result);
  }
 
  }.execute(id);
 }
 ...
 
-public void dump (List<TaskProxy> tasks) {
+public void dump (List&lt;TaskProxy> tasks) {
  for (TaskProxy task : tasks) {
  Log.i("Task output", task.getName() + "\n" + task.getNote());
  }
@@ -331,7 +331,7 @@ call its update method. Once again, this should be done in an
 result looks something like this.</p>
 
 <pre>
-new AsyncTask<Void, Void, Void>() {
+new AsyncTask&lt;Void, Void, Void>() {
  &#64;Override
  protected Void doInBackground(Void... arg0) {
  MyRequestFactory factory = (MyRequestFactory)