From ffa629bee56674cb2b73189b16c2fd678ccceced Mon Sep 17 00:00:00 2001 From: Lyla Fischer Date: Sat, 17 Feb 2018 13:07:11 -0500 Subject: [PATCH] user docs: Merge view-messages-from-a-stream and view-messages-from-a-topic. --- templates/zerver/help/about-streams-and-topics.md | 2 +- templates/zerver/help/include/sidebar.md | 3 +-- ...am.md => reading-messages-by-stream-or-topic.md} | 13 +++++++++++++ templates/zerver/help/view-messages-from-a-topic.md | 12 ------------ 4 files changed, 15 insertions(+), 15 deletions(-) rename templates/zerver/help/{view-messages-from-a-stream.md => reading-messages-by-stream-or-topic.md} (54%) delete mode 100644 templates/zerver/help/view-messages-from-a-topic.md diff --git a/templates/zerver/help/about-streams-and-topics.md b/templates/zerver/help/about-streams-and-topics.md index 9159519eff..20b1f6d28e 100644 --- a/templates/zerver/help/about-streams-and-topics.md +++ b/templates/zerver/help/about-streams-and-topics.md @@ -19,7 +19,7 @@ they also cannot read or send messages to the stream. Users are subscribed to specific streams in the organization by default, such as the #announce stream. Users can easily -[view messages](/help/view-messages-from-a-stream) from a specific stream; +[view messages](/help/reading-messages-by-stream-or-topic) from a specific stream; in addition, they can [browse](/help/browse-and-subscribe-to-streams#browse-streams) their stream subscriptions using the Zulip stream browser. diff --git a/templates/zerver/help/include/sidebar.md b/templates/zerver/help/include/sidebar.md index 594e9bfdef..4bc726cdb1 100644 --- a/templates/zerver/help/include/sidebar.md +++ b/templates/zerver/help/include/sidebar.md @@ -57,10 +57,9 @@ * [Share a message or conversation](/help/share-a-message-or-conversation) * [Advanced search](/help/search-for-messages) * [View a message's edit history](/help/view-a-messages-edit-history) -* [View messages from a stream](/help/view-messages-from-a-stream) -* [View messages from a topic](/help/view-messages-from-a-topic) * [View messages from a user](/help/view-messages-from-a-user) * [View messages containing files or links](/help/view-messages-containing-files-or-links) +* [Reading by stream or topic](/help/reading-messages-by-stream-or-topic) ## People * [Check whether someone is on-line](/help/check-whether-someone-is-here-or-away) diff --git a/templates/zerver/help/view-messages-from-a-stream.md b/templates/zerver/help/reading-messages-by-stream-or-topic.md similarity index 54% rename from templates/zerver/help/view-messages-from-a-stream.md rename to templates/zerver/help/reading-messages-by-stream-or-topic.md index 55cf925753..4f2c12c05f 100644 --- a/templates/zerver/help/view-messages-from-a-stream.md +++ b/templates/zerver/help/reading-messages-by-stream-or-topic.md @@ -12,3 +12,16 @@ that particular stream. You can also view your all messages from a specific stream by entering the search operator `stream:(stream name)` in the search bar or selecting the stream from the **Streams** section in the left sidebar. + +# View messages from a topic + +You can view all messages from a specific topic by following the following steps. + +1. In your view, find a message sent under the topic. + +2. Click on the message's topic to narrow your view to all messages sent to that +particular topic. + +!!! tip "" + You can also view your all messages from a specific topic by entering the + search operator `topic:(topic name)` in the search bar. diff --git a/templates/zerver/help/view-messages-from-a-topic.md b/templates/zerver/help/view-messages-from-a-topic.md deleted file mode 100644 index 50af434ad3..0000000000 --- a/templates/zerver/help/view-messages-from-a-topic.md +++ /dev/null @@ -1,12 +0,0 @@ -# View messages from a topic - -You can view all messages from a specific topic by following the following steps. - -1. In your view, find a message sent under the topic. - -2. Click on the message's topic to narrow your view to all messages sent to that -particular topic. - -!!! tip "" - You can also view your all messages from a specific topic by entering the - search operator `topic:(topic name)` in the search bar.