am ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread

* commit 'ed6b76c670658390a43e199f9dc199d85483300a':
  Minor doc fixes (mainly the infamous "repo init-u").

2 files changed, 3 insertions, 9 deletions

diff --git a/pdk/docs/porting/debugging_native.jd b/pdk/docs/porting/debugging_native.jd
index 7bb655fcb..44e8219b9 100755
--- a/pdk/docs/porting/debugging_native.jd
+++ b/pdk/docs/porting/debugging_native.jd
@@ -137,13 +137,7 @@ spinlock because no other thread can release it.
 (gdb) set scheduler-locking on
 </pre>
 
-<p>
-Ignore SIGUSR1 if you're using JamVM.  Shouldn't hurt if you're not.
-</p>
-
 <pre class="prettify">
-(gdb) handle SIGUSR1 noprint
-
 (gdb) where
 #0  __futex_wait () at system/klibc/android/atomics_arm.S:88
 #1  0x53010eb8 in pthread_cond_timedwait (cond=0x12081c, mutex=0x120818, abstime=0xffffffff)
@@ -239,7 +233,7 @@ Previous frame identical to this frame (corrupt stack?)
 </pre>
 
 <a name="Crash_in_C_C_code"></a><h4>Crash in C / C++ code</h4>
-<p>If it crashes, connect with <code>aproto</code> and run <code>logcat</code> on the device. You should see output like this:</p>
+<p>If it crashes, connect with <code>adb</code> and run <code>logcat</code> on the device. You should see output like this:</p>
 
 <pre class="prettify">
 I/ActivityManager(  188): Starting activity: Intent { component=com.android.calendar.MonthScreen }
diff --git a/pdk/docs/source/git-repo.jd b/pdk/docs/source/git-repo.jd
index 8905780ee..3de99becc 100644
--- a/pdk/docs/source/git-repo.jd
+++ b/pdk/docs/source/git-repo.jd
@@ -34,7 +34,7 @@ Installing Repo <br></h3>
 $ curl http://android.git.kernel.org/repo &gt; ~/bin/repo <div>$ chmod a+x ~/bin/repo</div>
 $ mkdir <i>working-directory-name</i>
 <br>$ cd <i>working-directory-name <br></i>
-$ repo init-u git://android.git.kernel.org/platform/manifest.git <br><br><h3>
+$ repo init -u git://android.git.kernel.org/platform/manifest.git <br><br><h3>
 Synchronizing your client
 </h3>
 To synchronize the files for all available projects:<br>$ repo sync <br><br>To
@@ -115,7 +115,7 @@ init
 </h3>
 repo init -u <i>url</i>
 [<i>options</i>
-]<br><br><div>Installs Repo in the current directory. This creates a .repo/ directory that contains Git repositories for the Repo source code and the standard Android manifest files. The .repo/ directory also containsmanifest.xml, which is a symlink to the selected manifest in the .repo/manifests/ directory.<br><br>The -u argument specifies a URL from which to retrieve a manifest repository. For example:<br>$ repo init -u git://android.git.kernel.org/platform/manifest.git <br><br>To select a manifest file within the repository, use the -m option. (If no manifest name is selected, the default is default.xml.)For example:<br>$ repo init -ugit://android.git.kernel.org/platform/manifest.git-m dalkvik-plus.xml <br><br>To specify a revision, that is, a particular manifest-branch, use the -b option. For example:<br>$ repo init -ugit://android.git.kernel.org/platform/manifest.git-b release-1.0<br><br>To see other repo init options, run <br>$ repo help init <br><br><b>Note:</b>
+]<br><br><div>Installs Repo in the current directory. This creates a .repo/ directory that contains Git repositories for the Repo source code and the standard Android manifest files. The .repo/ directory also containsmanifest.xml, which is a symlink to the selected manifest in the .repo/manifests/ directory.<br><br>The -u argument specifies a URL from which to retrieve a manifest repository. For example:<br>$ repo init -u git://android.git.kernel.org/platform/manifest.git <br><br>To select a manifest file within the repository, use the -m option. (If no manifest name is selected, the default is default.xml.)For example:<br>$ repo init -u git://android.git.kernel.org/platform/manifest.git-m dalkvik-plus.xml <br><br>To specify a revision, that is, a particular manifest-branch, use the -b option. For example:<br>$ repo init -u git://android.git.kernel.org/platform/manifest.git-b release-1.0<br><br>To see other repo init options, run <br>$ repo help init <br><br><b>Note:</b>
 For all remaining Repo commands, the current working directory must either be the parent directory of .repo/ or a subdirectory of the parent directory.<br><br></div>
 <h3>
 sync