diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index e7c6a8092f..466d69567a 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -854,7 +854,7 @@ - Private streams with shared history + Private channels with shared history @@ -867,7 +867,7 @@ - Private streams with private history + Private channels with private history @@ -880,7 +880,7 @@ - Stream posting permissions + Channel posting permissions diff --git a/templates/corporate/development-community.html b/templates/corporate/development-community.html index d353c56fa3..2d6275a98d 100644 --- a/templates/corporate/development-community.html +++ b/templates/corporate/development-community.html @@ -23,7 +23,7 @@

{% trans %}The Zulip development community{% endtrans %}

- Join today! The buttons below provide customized stream subscriptions. + Join today! The buttons below provide customized channel subscriptions.
diff --git a/templates/corporate/development-community.md b/templates/corporate/development-community.md index 4cfe216c4d..05784ace4d 100644 --- a/templates/corporate/development-community.md +++ b/templates/corporate/development-community.md @@ -9,14 +9,14 @@ server hosted at [chat.zulip.org](https://chat.zulip.org/): ideas, and generally help each other out. Everyone is welcome to [sign up](https://chat.zulip.org/) and -participate — we love hearing from our users! Public streams in the +participate — we love hearing from our users! Public channels in the community receive thousands of messages a week. We recommend signing up using the special invite links for [users](https://chat.zulip.org/join/t5crtoe62bpcxyisiyglmtvb/), [self-hosters](https://chat.zulip.org/join/wnhv3jzm6afa4raenedanfno/) and [contributors](https://chat.zulip.org/join/npzwak7vpmaknrhxthna3c7p/) -to get a curated list of initial stream subscriptions. +to get a curated list of initial channel subscriptions. To get help in real time, you will have the best luck finding core developers during daylight hours in North America (roughly between @@ -65,11 +65,11 @@ feedback. you. For example, include the **full traceback** in a [code block](/help/code-blocks) (not a screenshot), a link to the code or a draft PR you’re having trouble debugging, etc. -- Ask questions on streams rather than DMing core contributors. You’ll +- Ask questions on channels rather than DMing core contributors. You’ll get answers faster since other people can help, and it makes it possible for others to benefit from the discussion. - Don’t ask the same question in multiple places. Moderators read - every public stream, and make sure every question gets a reply. + every public channel, and make sure every question gets a reply. - Use @-mentions sparingly. Unlike IRC or Slack, Zulip’s topics make it easy to see what you’re replying to, so you don’t need to mention your conversation partner to make sure they will see or understand @@ -81,14 +81,14 @@ feedback.
# Where do I send my message? -This section describes popular public streams on chat.zulip.org. Kick +This section describes popular public channels on chat.zulip.org. Kick off the discussion by [starting a new topic](/help/starting-a-new-topic) -in the appropriate stream! Don’t stress too much about picking the +in the appropriate channel! Don’t stress too much about picking the right place if you’re not sure; anyone in the community can edit a topic name, and [moderators](/help/roles-and-permissions) can [move a -topic to a different stream](/help/move-content-to-another-channel). +topic to a different channel](/help/move-content-to-another-channel). -## Streams for everyone +## Channels for everyone - [#feedback](https://chat.zulip.org/#narrow/stream/137-feedback) is for posting feedback on Zulip, including feature requests, suggestions for @@ -111,7 +111,7 @@ topic to a different stream](/help/move-content-to-another-channel). uncertain where to start a conversation. - [#test here](https://chat.zulip.org/#narrow/stream/7-test-here) is for sending test messages without inconveniencing other users :). We - recommend muting this stream when not using it. + recommend muting this channel when not using it. ## Channels for Zulip users and administrators @@ -127,12 +127,12 @@ topic to a different stream](/help/move-content-to-another-channel). all conversations about the [Zulip Cloud](https://zulip.com/plans/) service. -## Streams for code contributors +## Channels for code contributors - [#development help](https://chat.zulip.org/#narrow/stream/49-development-help) is for asking for help with any Zulip server/web app development work - (use the app streams #mobile, #desktop, or #zulip-terminal for help + (use the app channels #mobile, #desktop, or #zulip-terminal for help working on one of the apps). - [#provision help](https://chat.zulip.org/#narrow/stream/21-provision-help) is @@ -151,7 +151,7 @@ topic to a different stream](/help/move-content-to-another-channel). - [#backend](https://chat.zulip.org/#narrow/stream/3-backend), [#frontend](https://chat.zulip.org/#narrow/stream/6-frontend), [#documentation](https://chat.zulip.org/#narrow/stream/19-documentation), - and app-specific streams + and app-specific channels ([#mobile](https://chat.zulip.org/#narrow/stream/48-mobile), etc.) are the right place for general conversations about work in those areas (including design discussions, questions, updates on a @@ -163,23 +163,23 @@ topic to a different stream](/help/move-content-to-another-channel). but is also a good place to discuss projects to improve Zulip’s automated testing infrastructure. - [#api design](https://chat.zulip.org/#narrow/stream/378-api-design) - is a low-traffic stream for discussing and coordinating changes to + is a low-traffic channel for discussing and coordinating changes to the [Zulip API](https://zulip.com/api/rest), with all stakeholders present. -## Streams for translators +## Channels for translators - [#translation](https://chat.zulip.org/#narrow/stream/58-translation) is for discussing [Zulip’s translations](https://zulip.readthedocs.io/en/latest/translating/translating.html). -- Some languages have streams named like +- Some languages have channels named like [#translation/fr](https://chat.zulip.org/#narrow/stream/371-translation.2Ffr) and [#translation/zh_tw](https://chat.zulip.org/#narrow/stream/377-translation.2Fzh_tw) to coordinate translation work for that language. -## Streams for anyone spending time in the community +## Channels for anyone spending time in the community - [#announce](https://chat.zulip.org/#narrow/stream/1-announce) is our - low-traffic stream for project announcements (releases, etc.). + low-traffic channel for project announcements (releases, etc.). - [#checkins](https://chat.zulip.org/#narrow/stream/65-checkins) is for progress updates on what you’re working on and its status; usually folks post with their name as the topic. Everyone is welcome @@ -208,7 +208,7 @@ topic to a different stream](/help/move-content-to-another-channel). is for occasional conversations not related to Zulip, usually things of general interest to open-source communities. -You can always find the description for the stream you’re reading at +You can always find the description for the channel you’re reading at the top of the Zulip app.
@@ -218,8 +218,8 @@ the top of the Zulip app. Keeping up with **everything** happening in the Zulip project is both difficult and rarely a useful goal. To make the best use of your time, -we highly recommend that you unsubscribe from streams that you aren’t -interested in, mute streams that are only of occasional interest, and +we highly recommend that you unsubscribe from channels that you aren’t +interested in, mute channels that are only of occasional interest, and make use of [Zulip’s skimming features](/help/reading-strategies), like Recent conversations, to spend your time on topics that interest you. @@ -230,9 +230,9 @@ To look for previous threads about something, we recommend using the following [search filters](/help/search-for-messages#search-filters): `streams:public `. -This will search the full history of all public streams for ``, including messages sent before you joined and messages -on public streams you’re not subscribed to. +on public channels you’re not subscribed to. ## Linking to GitHub issues and pull requests diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 0b4a471c6f..99fa7020da 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -334,7 +334,7 @@ can edit your message, or move it to a different topic - or stream. + or channel.
@@ -424,8 +424,8 @@ and more. -
  • Automatically subscribe users to streams when they join, subscribe a group of users, or copy membership from another stream. Add users to the right streams for their team and role with custom invitation links.
    • -
  • Manage your organization with fine-grained permission settings for administrators and moderators, and custom viewing and posting permissions for streams.
    • +
  • Automatically subscribe users to channels when they join, subscribe a group of users, or copy membership from another channel. Add users to the right channels for their team and role with custom invitation links.
    • +
  • Manage your organization with fine-grained permission settings for administrators and moderators, and custom viewing and posting permissions for channels.
  • Add partners, vendors and temporary contractors as guest users in your organization. diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index c6d06bbca5..8477a45232 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -168,8 +168,8 @@
    diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index 4dccc2d575..26a399458b 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -203,7 +203,7 @@
  • Type LaTeX directly into your Zulip message, and see it beautifully rendered.
  • Zulip code blocks come with syntax highlighting for over 250 languages, and integrated code playgrounds.
  • Structure your ideas with bulleted and numbered lists.
    • -
  • If you made a mistake, no worries! You can edit your message, or move it to a different topic or stream.
    • +
  • If you made a mistake, no worries! You can edit your message, or move it to a different topic or channel.
    • @@ -227,8 +227,8 @@
  • Signing up for Zulip is quick and easy. Participants can make an account, or log in with Google, Apple, etc.
    • -
  • Automatically subscribe members to streams when they join, subscribe a group of users, or copy membership from another stream.
    • -
  • Make an announcement stream where only organizers can post messages. Use private streams to plan the event.
    • +
  • Automatically subscribe members to channels when they join, subscribe a group of users, or copy membership from another channel.
    • +
  • Make an announcement channel where only organizers can post messages. Use private channels to plan the event.
    • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index ad00f518bc..a32d6c726a 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -367,7 +367,7 @@ can edit your message, or move it to a different topic - or stream. + or channel. @@ -560,7 +560,7 @@
  • Automatically subscribe members to - streams when + channels when they join.
    • diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 9991b1f148..dc1487cb56 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -207,7 +207,7 @@ can edit your message, or move it to a different topic - or stream. + or channel. @@ -304,7 +304,7 @@
  • Automatically subscribe members to - streams when + channels when they join.
    • diff --git a/templates/corporate/security.md b/templates/corporate/security.md index 126f94e793..66551a8a1a 100644 --- a/templates/corporate/security.md +++ b/templates/corporate/security.md @@ -35,10 +35,10 @@ priority. ## Configurable access control policies - Zulip supports direct messages (to one or more individuals), private - streams with any number of subscribers, as well as public streams + channels with any number of subscribers, as well as public channels available to all organization members. We also support guest accounts, - which only have access to a fixed set of streams, and announcement - streams, where only organization owners and administrators can post. + which only have access to a fixed set of channels, and announcement + channels, where only organization owners and administrators can post. - By default, users can maintain their own names and email addresses, but Zulip also supports [restricting changes](/help/restrict-name-and-email-changes) and @@ -53,8 +53,8 @@ priority. - Zulip can limit the features that new users have access to until their accounts are older than a [configurable waiting period][waiting_period]. - Zulip also supports customizing whether non-admins can - [create streams](/help/configure-who-can-create-channels), - [invite to streams](/help/configure-who-can-invite-to-channels), + [create channels](/help/configure-who-can-create-channels), + [invite to channels](/help/configure-who-can-invite-to-channels), [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji), [add integrations and bots](/help/restrict-bot-creation), [edit or delete messages](/help/restrict-message-editing-and-deletion), @@ -103,7 +103,7 @@ priority. used for an end-to-end history of system usage. - Zulip stores in its database a permanent long-term audit log containing the history of important actions (e.g. changes to passwords, email - addresses, and stream subscriptions). + addresses, and channel subscriptions). - Zulip’s powerful data exports ([on-premise](https://zulip.readthedocs.io/en/latest/production/export-and-import.html), [cloud](/help/export-your-organization)) can be imported into third-party @@ -135,7 +135,7 @@ the industry: - Zulip’s Python codebase is written entirely in [statically typed Python 3](https://blog.zulip.org/2016/10/13/static-types-in-python-oh-mypy/), which automatically prevents a wide range of possible bugs. -- All access to user data (messages, streams, uploaded files, etc.) in the +- All access to user data (messages, channels, uploaded files, etc.) in the Zulip backend is through carefully-audited core libraries that validate that the user who is making the request has access to that data. - Only a small handful of people have access to production servers or diff --git a/templates/corporate/try-zulip-part2.md b/templates/corporate/try-zulip-part2.md index 8755ed7b69..250c2e60c6 100644 --- a/templates/corporate/try-zulip-part2.md +++ b/templates/corporate/try-zulip-part2.md @@ -4,7 +4,7 @@ development community. You’ll be able to send messages, experience the convenience of going through your unread messages, and much more. Please be sure to follow [community guidelines](/development-community/), and send any test messages to the [#test -here](https://chat.zulip.org/#narrow/stream/7-test-here) stream. +here](https://chat.zulip.org/#narrow/stream/7-test-here) channel. You can also view plans and pricing, or create a new organization. diff --git a/templates/corporate/why-zulip.md b/templates/corporate/why-zulip.md index 8523acacd8..bee15126bf 100644 --- a/templates/corporate/why-zulip.md +++ b/templates/corporate/why-zulip.md @@ -31,16 +31,16 @@ productivity of your team**. ## Zulip’s unique topic-based threading model makes efficient communication possible. Here’s how. -In Zulip, **streams** determine who gets a message. Each conversation within a -stream is labeled with a **topic**, which keeps everything organized. +In Zulip, **channels** determine who gets a message. Each conversation within a +channel is labeled with a **topic**, which keeps everything organized. You can read Zulip one conversation at a time, seeing each message in context, no matter how many other conversations are going on. If anything is out of place, it’s easy to move messages, rename and split -topics, or even move a topic to a different stream. +topics, or even move a topic to a different channel. -![Streams and topics](/static/images/help/streams-and-topics.png) +![Channels and topics](/static/images/help/streams-and-topics.png)
    @@ -74,7 +74,7 @@ channels for places where their input is needed. - **Never miss an important message.** New messages will pop a long-running thread to the top, rather than languishing in a forgotten sidebar. You’ll never create a new channel (and later forget to -check it) because your team’s main channel is busy — a busy stream +check it) because your team’s main channel is busy — a busy channel works just fine in Zulip! For timely messages, Zulip alerts you with [fully customizable](/help/channel-notifications) mobile, email and desktop notifications. @@ -162,7 +162,7 @@ With conversations organized by topic, you can review prior discussions to understand past work, explanations, and decisions — your chat history becomes a knowledge base. If a conversation shifts to a new topic, it’s easy to reorganize by moving messages to a different [topic](/help/move-content-to-another-topic) -or [stream](/help/move-content-to-another-channel). There is no more rifling +or [channel](/help/move-content-to-another-channel). There is no more rifling through unrelated chatter to find the context you need. You can even [link to a Zulip conversation](/help/link-to-a-message-or-conversation#link-to-zulip-from-anywhere) diff --git a/templates/corporate/zephyr.html b/templates/corporate/zephyr.html index c16a976468..cd72c303e1 100644 --- a/templates/corporate/zephyr.html +++ b/templates/corporate/zephyr.html @@ -53,10 +53,10 @@ right now, but Zulip does not yet have a direct equivalent to BarnOwl filters. If you have more subscriptions than you generally read, we recommend that you use Zulip's "Mute" option to hide those subscriptions from your - home view that you less commonly read. You can still easily access those streams + home view that you less commonly read. You can still easily access those channels from Zulip when you want to read them. You can control your subscriptions and what's in your home view by clicking the gear in the upper right-hand corner - and then selecting "Streams". + and then selecting "Channels".