diff --git a/templates/zerver/help/stream-permissions.md b/templates/zerver/help/stream-permissions.md
index c862f5d786..d019bc6bf6 100644
--- a/templates/zerver/help/stream-permissions.md
+++ b/templates/zerver/help/stream-permissions.md
@@ -43,45 +43,51 @@ private stream messages:
 
 ### Public streams
 
-|                       | Org admins | Stream members | Org members | Guests
-|---                    |---         |---             |---          |---
-| Join                  | ✔   | —        | ✔    |
-| Add others            | ✔   | [1]            | ✔    |
-| See subscriber list   | ✔   | ✔       | ✔    |
-| See full history      | ✔   | ✔       | ✔    |
-| See estimated traffic | ✔   | ✔       | ✔    |
-| Post                  | ✔   | [2]            |             |
-| Change the privacy    | ✔   |                |             |
-| Rename                | ✔   |                |             |
-| Edit the description  | ✔   |                |             |
-| Remove others         | ✔   |                |             |
-| Delete                | ✔   |                |             |
+|                       | Org admins | Members   | Guests
+|---                    |---         |---        |---
+| Join                  | ✔   | ✔  |
+| Unsubscribe           | ◾    | ◾   | ◾
+| Add others            | ✔   | ✔  |
+| See subscriber list   | ✔   | ✔  | ◾
+| See full history      | ✔   | ✔  | ◾
+| See estimated traffic | ✔   | ✔  | ◾
+| Post                  | ✔   | ✶  | ✶
+| Change the privacy    | ✔   |           |
+| Rename                | ✔   |           |
+| Edit the description  | ✔   |           |
+| Remove others         | ✔   |           |
+| Delete                | ✔   |           |
 
-[1] Yes, except for guests.
+✔ Always
+
+◾   If subscribed to the stream
+
+✶ Configurable.  Org admins and Members can, by default, post to
+any public stream, and Guests can only post to public streams if they
+are subscribed.  Additionally, streams can be configured to only allow
+administrators to post.
 
-[2] Configurable.
 
 ### Private streams
 
-|                       | Org admins | Stream members | Org members | Guests
-|---                    |---         |---             |---          |---
-| Join                  |            | —        |             |
-| Add others            |            | [1]            |             |
-| See subscriber list   | ✔   | ✔       |             |
-| See full history      |            | [3]            |             |
-| See estimated traffic | ✔   | ✔       |             |
-| Post                  | ✔   | [2]            |             |
-| Change the privacy    | [4]        |                |             |
-| Rename                | ✔   |                |             |
-| Edit the description  | ✔   |                |             |
-| Remove others         | ✔   |                |             |
-| Delete                | ✔   |                |             |
 
-[1] Yes, except for guests.
+|                       | Org admins | Members   | Guests
+|---                    |---         |---        |---
+| Join                  |            |           |
+| Unsubscribe           | ◾    | ◾   | ◾
+| Add others            | ◾    | ◾   |
+| See subscriber list   | ✔   | ◾   | ◾
+| See full history      | ✶   | ✶  | ✶
+| See estimated traffic | ✔   | ◾   | ◾
+| Post                  | ◾    | ✶  | ✶
+| Change the privacy    | ◾    |           |
+| Rename                | ✔   |           |
+| Edit the description  | ✔   |           |
+| Remove others         | ✔   |           |
+| Delete                | ✔   |           |
 
-[2] Configurable.
+✔ Always
 
-[3] Depends on the stream type.
+◾   If subscribed to the stream
 
-[4] Yes, but only if subscribed. If you have a private stream without an
-admin, you'll have to add an admin in order to change the stream's privacy.
+✶ Configurable, but at minimum must be subscribed to the stream