Merge branch 'master' into lint-md

2 files changed, 23 insertions, 11 deletions

diff --git a/content/docs/user_guide/compatibility/_index.md b/content/docs/user_guide/compatibility/_index.md
index e11e64339..ff0e6acce 100644
--- a/content/docs/user_guide/compatibility/_index.md
+++ b/content/docs/user_guide/compatibility/_index.md
@@ -79,7 +79,7 @@ Most common utilities work. Note that:
 | sshd     | Partially working. Job control [in progress](https://github.com/google/gvisor/issues/154) |
 | strace   | Working |
 | tar      | Working |
-| tcpdump  | [In progress](https://github.com/google/gvisor/issues/173) |
+| tcpdump  | Working |
 | top      | Working |
 | uptime   | Working |
 | vim      | Working |
diff --git a/content/docs/user_guide/install.md b/content/docs/user_guide/install.md
index c966c7bd5..3b7e33dc2 100644
--- a/content/docs/user_guide/install.md
+++ b/content/docs/user_guide/install.md
@@ -13,22 +13,32 @@ release channels. You should pick the version you'd like to install. For
 experimentation, the nightly release is recommended. For production use, the
 latest release is recommended.
 
+<!--
+
 After selecting an appropriate release channel from the options below, proceed
 to the preferred installation mechanism: manual or from an `apt` repository.
 
+ -->
+
 ### Nightly
 
 Nightly releases are built most nights from the master branch, and are available
 at the following URL:
 
-   `https://storage.googleapis.com/gvisor/releases/nightly/latest`
+   `https://storage.googleapis.com/gvisor/releases/nightly/latest/runsc`
+
+Checksums for the release binary are at:
+
+   `https://storage.googleapis.com/gvisor/releases/nightly/latest/runsc.sha512`
 
 Specific nightly releases can be found at:
 
-   `https://storage.googleapis.com/gvisor/releases/nightly/${yyyy-mm-dd}`
+   `https://storage.googleapis.com/gvisor/releases/nightly/${yyyy-mm-dd}/runsc`
 
 Note that a release may not be available for every day.
 
+<!--
+
 To use a nightly release, use one of the above URLs for `URL` in the manual
 instructions below. For `apt`, use `nightly` for `DIST` below.
 
@@ -49,21 +59,26 @@ A given release release is available at the following URL:
 
 See the [releases][releases] page for information about specific releases.
 
+
 This will include point updates for the release, if required. To use a specific
 release, use the above URL for `URL` in the manual instructions below. For
 `apt`, use `${yyyymmdd}` for `DIST` below.
 
+
 ### Point release
 
 A given point release is available at the following URL:
 
   `https://storage.googleapis.com/gvisor/releases/release/${yyyymmdd}.${rc}`
 
+
 Unlike the specific release above, which may include updates, this release will
 not change. To use a specific point release, use the above URL for `URL` in the
 manual instructions below. For apt, use `${yyyymmdd}.${rc}` for `DIST` below.
 
-## Install from an `apt` repository
+ -->
+
+<!-- Install from an `apt` repository
 
 First, appropriate dependencies must be installed to allow `apt` to install
 packages via https:
@@ -118,18 +133,15 @@ sudo apt-get update && sudo apt-get install -y runsc
 
 If you have Docker installed, it will be automatically configured.
 
-## Install manually
-
-After selecting an appropriate `URL` above, you can download `runsc` directly
-from `${URL}/runsc` ([latest][latest-nightly]) and a checksum hash from
-`${URL}/runsc.sha512` ([latest][latest-hash]).
+-->
 
-For example, this binary can be downloaded, validated, and placed in an
-appropriate location by running:
+For example, the latest nightly binary can be downloaded, validated, 
+and placed in an appropriate location by running:
 
 ```bash
 (
   set -e
+  URL=https://storage.googleapis.com/gvisor/releases/nightly/latest
   wget ${URL}/runsc
   wget ${URL}/runsc.sha512
   sha512sum -c runsc.sha512