From dedea237456b88c6f5b5218d354d66bfb496a5f7 Mon Sep 17 00:00:00 2001 From: Lauryn Menard <63245456+laurynmm@users.noreply.github.com> Date: Wed, 25 Jan 2023 23:08:29 +0100 Subject: [PATCH] help-docs: Move help center documentation to top level directory. These files are not Jinja2 templates, so there's no reason that they needed to be inside `templates/zerver`. Moving them to the top level reflects their importance and also makes it feel nicer to work on editing the help center content, without it being unnecessary buried deep in the codebase. --- .prettierignore | 1 + docs/documentation/helpcenter.md | 28 ++++++++----------- docs/tutorials/new-feature-tutorial.md | 16 +++++------ .../help => help}/add-a-bot-or-integration.md | 0 .../help => help}/add-a-custom-linkifier.md | 0 .../add-or-remove-users-from-a-stream.md | 0 .../zerver/help => help}/all-messages.md | 0 .../allow-image-link-previews.md | 0 {templates/zerver/help => help}/analytics.md | 0 .../help => help}/animated-gifs-from-giphy.md | 0 .../zerver/help => help}/archive-a-stream.md | 0 .../help => help}/bots-and-integrations.md | 0 .../browse-and-subscribe-to-streams.md | 0 .../help => help}/change-a-users-name.md | 0 .../help => help}/change-a-users-role.md | 0 .../help => help}/change-organization-url.md | 0 .../change-the-color-of-a-stream.md | 0 .../change-the-privacy-of-a-stream.md | 0 .../change-the-stream-description.md | 0 .../help => help}/change-the-time-format.md | 0 .../change-your-email-address.md | 0 .../help => help}/change-your-language.md | 0 .../zerver/help => help}/change-your-name.md | 0 .../help => help}/change-your-password.md | 0 .../change-your-profile-picture.md | 0 .../help => help}/change-your-timezone.md | 0 .../zerver/help => help}/code-blocks.md | 0 .../help => help}/collapse-a-message.md | 0 .../help => help}/communities-directory.md | 0 .../configure-authentication-methods.md | 0 .../configure-default-new-user-settings.md | 0 .../help => help}/configure-default-view.md | 0 .../configure-message-editing-and-deletion.md | 0 .../configure-multi-language-search.md | 0 .../configure-notification-bot.md | 0 .../configure-organization-language.md | 0 .../configure-who-can-create-streams.md | 0 .../configure-who-can-edit-topics.md | 0 .../configure-who-can-invite-to-streams.md | 0 .../help => help}/connect-through-a-proxy.md | 0 .../zerver/help => help}/contact-support.md | 0 .../zerver/help => help}/create-a-poll.md | 0 .../zerver/help => help}/create-a-stream.md | 0 .../zerver/help => help}/create-streams.md | 0 .../help => help}/create-user-groups.md | 0 .../create-your-organization-profile.md | 0 .../help => help}/custom-certificates.md | 0 .../zerver/help => help}/custom-emoji.md | 0 .../help => help}/custom-profile-fields.md | 0 .../customize-organization-settings.md | 0 .../customize-settings-for-new-users.md | 0 {templates/zerver/help => help}/dark-theme.md | 0 .../deactivate-or-reactivate-a-bot.md | 0 .../deactivate-or-reactivate-a-user.md | 0 .../help => help}/deactivate-your-account.md | 0 .../deactivate-your-organization.md | 0 .../zerver/help => help}/delete-a-topic.md | 0 .../help => help}/demo-organizations.md | 0 .../desktop-app-install-guide.md | 0 .../help => help}/desktop-notifications.md | 0 .../zerver/help => help}/digest-emails.md | 0 .../disable-message-edit-history.md | 0 .../help => help}/disable-welcome-emails.md | 0 {templates/zerver/help => help}/edit-a-bot.md | 0 .../help => help}/edit-or-delete-a-message.md | 0 .../zerver/help => help}/edit-your-profile.md | 0 .../help => help}/email-notifications.md | 0 .../help => help}/emoji-and-emoticons.md | 0 .../zerver/help => help}/emoji-reactions.md | 0 .../enable-emoticon-translations.md | 0 .../enable-full-width-display.md | 0 .../help => help}/export-your-organization.md | 0 .../help => help}/finding-a-topic-to-read.md | 0 .../format-your-message-using-markdown.md | 0 .../zerver/help => help}/gdpr-compliance.md | 0 .../getting-started-with-zulip.md | 0 ...ng-your-organization-started-with-zulip.md | 0 .../hide-message-content-in-emails.md | 0 .../help => help}/high-contrast-mode.md | 0 .../help => help}/import-from-gitter.md | 0 .../help => help}/import-from-mattermost.md | 0 .../help => help}/import-from-rocketchat.md | 0 .../zerver/help => help}/import-from-slack.md | 0 .../help => help}/import-your-settings.md | 0 .../help => help}/include/add-a-wide-logo.md | 0 .../help => help}/include/admin-only.md | 0 .../advantages-of-self-hosting-zulip.md | 0 .../include/advantages-of-zulip-cloud.md | 0 .../help => help}/include/all-messages.md | 0 .../include/automated-notice-stream-event.md | 0 .../automated-pm-stream-subscription.md | 0 .../change-password-via-email-confirmation.md | 0 .../help => help}/include/cloud-plus-only.md | 0 .../include/cloud-standard-only.md | 0 .../communities-directory-instructions.md | 0 .../include/communities-directory-intro.md | 0 .../include/compose-and-send-message.md | 0 .../include/create-streams-intro.md | 0 .../customize-organization-settings.md | 0 .../customize-settings-for-new-users.md | 0 .../include/desktop-sidebar-settings-menu.md | 0 .../include/desktop-toggle-sidebar-tip.md | 0 .../include/edit-organization-profile.md | 0 .../include/how-to-create-a-user-group.md | 0 .../include/how-to-invite-users-to-join.md | 0 .../include/how-to-start-a-new-topic.md | 0 .../import-get-your-organization-started.md | 0 .../include/import-how-users-will-log-in.md | 0 .../import-into-a-self-hosted-zulip-server.md | 0 .../import-into-a-zulip-cloud-organization.md | 0 .../help => help}/include/import-login.md | 0 .../include/import-self-hosted-server-tips.md | 0 .../include/import-workspace-to-zulip.md | 0 .../include/import-your-data-into-zulip.md | 0 ...import-zulip-cloud-organization-warning.md | 0 .../include/left-sidebar-topics.md | 0 .../help => help}/include/manage-this-user.md | 0 .../include/message-actions-menu.md | 0 .../help => help}/include/message-actions.md | 0 .../include/message-long-press-menu.md | 0 .../help => help}/include/messaging-tips.md | 0 .../migrating-from-other-chat-tools.md | 0 .../include/mobile-profile-menu.md | 0 .../mobile-stream-settings-menu-tip.md | 0 .../include/organization-profile-intro.md | 0 .../help => help}/include/owner-only.md | 0 .../help => help}/include/reading-pms.md | 0 .../help => help}/include/reading-topics.md | 0 .../include/recent-conversations.md | 0 .../include/replying-to-messages.md | 0 ...view-organization-settings-instructions.md | 0 .../include/right-sidebar-user-card.md | 0 .../include/right-sidebar-view-profile.md | 0 .../include/saml-login-button.md | 0 .../help => help}/include/save-changes.md | 0 .../include/select-stream-view-general.md | 0 .../include/select-stream-view-personal.md | 0 .../include/select-stream-view-subscribers.md | 0 .../help => help}/include/self-user-card.md | 0 .../help => help}/include/send-group-pm.md | 0 .../help => help}/include/send-us-info.md | 0 .../include/set-up-integrations.md | 0 .../include/set-up-your-account.md | 0 .../help => help}/include/sidebar_index.md | 0 .../help => help}/include/start-composing.md | 0 .../include/starting-a-new-private-thread.md | 0 .../help => help}/include/stream-actions.md | 0 .../include/stream-long-press-menu-tip.md | 0 .../include/stream-long-press-menu.md | 0 .../include/streams-and-topics.md | 0 .../switching-between-organizations.md | 0 .../include/tips-for-creating-streams.md | 0 .../help => help}/include/topic-actions.md | 0 .../include/topic-long-press-menu-tip.md | 0 .../include/topic-long-press-menu.md | 0 .../include/translation-project-info.md | 0 .../help => help}/include/trying-out-zulip.md | 0 .../include/upgrade-to-plus-if-needed.md | 0 .../include/user-card-three-dot-menu.md | 0 .../include/web-public-streams-intro.md | 0 .../include/when-to-start-a-new-topic.md | 0 {templates/zerver/help => help}/index.md | 0 .../zerver/help => help}/invite-new-users.md | 0 .../help => help}/invite-users-to-join.md | 0 .../join-a-zulip-organization.md | 0 .../help => help}/keyboard-shortcuts.md | 0 .../link-to-a-message-or-conversation.md | 0 .../zerver/help => help}/linking-to-zulip.md | 0 {templates/zerver/help => help}/logging-in.md | 0 .../zerver/help => help}/logging-out.md | 0 .../help => help}/manage-inactive-streams.md | 0 .../manage-user-stream-subscriptions.md | 0 .../manage-your-uploaded-files.md | 0 .../help => help}/marking-messages-as-read.md | 0 .../marking-messages-as-unread.md | 0 .../mastering-the-compose-box.md | 0 .../help => help}/mention-a-user-or-group.md | 0 .../message-a-stream-by-email.md | 0 .../zerver/help => help}/message-actions.md | 0 .../help => help}/message-retention-policy.md | 0 .../zerver/help => help}/messaging-tips.md | 0 .../migrating-from-other-chat-tools.md | 0 {templates/zerver/help => help}/missing.md | 0 .../help => help}/mobile-notifications.md | 0 .../moderating-open-organizations.md | 0 .../move-content-to-another-stream.md | 0 .../move-content-to-another-topic.md | 0 .../zerver/help => help}/mute-a-stream.md | 0 .../zerver/help => help}/mute-a-topic.md | 0 .../zerver/help => help}/mute-a-user.md | 0 .../help => help}/open-the-compose-box.md | 0 .../zerver/help => help}/organization-type.md | 0 .../organize-the-streams-sidebar.md | 0 .../zerver/help => help}/pin-a-stream.md | 0 .../pm-mention-alert-notifications.md | 0 .../preview-your-message-before-sending.md | 0 .../zerver/help => help}/private-messages.md | 0 .../help => help}/public-access-option.md | 0 .../zerver/help => help}/quote-and-reply.md | 0 .../zerver/help => help}/read-receipts.md | 0 .../zerver/help => help}/reading-pms.md | 0 .../help => help}/reading-strategies.md | 0 .../zerver/help => help}/reading-topics.md | 0 .../help => help}/recent-conversations.md | 0 .../zerver/help => help}/rename-a-stream.md | 0 .../zerver/help => help}/rename-a-topic.md | 0 .../help => help}/replying-to-messages.md | 0 .../help => help}/request-an-integration.md | 0 .../zerver/help => help}/require-topics.md | 0 .../help => help}/resize-the-compose-box.md | 0 .../zerver/help => help}/resolve-a-topic.md | 0 .../restrict-account-creation.md | 0 .../help => help}/restrict-bot-creation.md | 0 .../restrict-name-and-email-changes.md | 0 .../restrict-permissions-of-new-members.md | 0 .../restrict-private-messages.md | 0 .../restrict-profile-picture-changes.md | 0 .../restrict-visibility-of-email-addresses.md | 0 .../restrict-wildcard-mentions.md | 0 .../review-your-organization-settings.md | 0 .../help => help}/review-your-settings.md | 0 .../help => help}/roles-and-permissions.md | 0 .../help => help}/saml-authentication.md | 0 {templates/zerver/help => help}/scim.md | 0 .../help => help}/search-for-messages.md | 0 .../set-default-streams-for-new-users.md | 0 .../help => help}/set-up-integrations.md | 0 .../help => help}/set-up-your-account.md | 0 .../setting-up-zulip-for-a-class.md | 0 .../help => help}/share-and-upload-files.md | 0 .../zerver/help => help}/star-a-message.md | 0 .../zerver/help => help}/start-a-call.md | 0 .../zerver/help => help}/start-a-new-topic.md | 0 .../starting-a-new-private-thread.md | 0 .../help => help}/starting-a-new-topic.md | 0 .../help => help}/status-and-availability.md | 0 .../help => help}/stream-notifications.md | 0 .../help => help}/stream-permissions.md | 0 .../help => help}/stream-sending-policy.md | 0 .../help => help}/streams-and-topics.md | 0 .../switching-between-organizations.md | 0 .../zerver/help => help}/trying-out-zulip.md | 0 .../help => help}/typing-notifications.md | 0 .../unsubscribe-from-a-stream.md | 0 {templates/zerver/help => help}/user-cards.md | 0 .../zerver/help => help}/user-groups.md | 0 .../help => help}/using-zulip-for-a-class.md | 0 .../help => help}/using-zulip-via-email.md | 0 ...rify-your-message-was-successfully-sent.md | 0 .../view-a-messages-edit-history.md | 0 .../view-all-bots-in-your-organization.md | 0 .../help => help}/view-and-browse-images.md | 0 .../view-and-edit-your-message-drafts.md | 0 .../view-messages-sent-by-a-user.md | 0 .../help => help}/view-someones-profile.md | 0 .../view-the-exact-time-a-message-was-sent.md | 0 .../view-the-markdown-source-of-a-message.md | 0 .../help => help}/view-your-mentions.md | 0 .../help => help}/view-zulip-version.md | 0 .../help => help}/zulip-cloud-billing.md | 0 .../zulip-cloud-or-self-hosting.md | 0 .../help => help}/zulip-in-a-terminal.md | 0 templates/zerver/documentation_main.html | 4 +-- tools/linter_lib/custom_check.py | 8 +++--- tools/setup/emoji/emoji_setup_utils.py | 2 +- zerver/lib/templates.py | 4 +-- zerver/tests/test_urls.py | 8 +++--- zerver/views/documentation.py | 9 +++--- zproject/urls.py | 4 ++- 269 files changed, 40 insertions(+), 44 deletions(-) rename {templates/zerver/help => help}/add-a-bot-or-integration.md (100%) rename {templates/zerver/help => help}/add-a-custom-linkifier.md (100%) rename {templates/zerver/help => help}/add-or-remove-users-from-a-stream.md (100%) rename {templates/zerver/help => help}/all-messages.md (100%) rename {templates/zerver/help => help}/allow-image-link-previews.md (100%) rename {templates/zerver/help => help}/analytics.md (100%) rename {templates/zerver/help => help}/animated-gifs-from-giphy.md (100%) rename {templates/zerver/help => help}/archive-a-stream.md (100%) rename {templates/zerver/help => help}/bots-and-integrations.md (100%) rename {templates/zerver/help => help}/browse-and-subscribe-to-streams.md (100%) rename {templates/zerver/help => help}/change-a-users-name.md (100%) rename {templates/zerver/help => help}/change-a-users-role.md (100%) rename {templates/zerver/help => help}/change-organization-url.md (100%) rename {templates/zerver/help => help}/change-the-color-of-a-stream.md (100%) rename {templates/zerver/help => help}/change-the-privacy-of-a-stream.md (100%) rename {templates/zerver/help => help}/change-the-stream-description.md (100%) rename {templates/zerver/help => help}/change-the-time-format.md (100%) rename {templates/zerver/help => help}/change-your-email-address.md (100%) rename {templates/zerver/help => help}/change-your-language.md (100%) rename {templates/zerver/help => help}/change-your-name.md (100%) rename {templates/zerver/help => help}/change-your-password.md (100%) rename {templates/zerver/help => help}/change-your-profile-picture.md (100%) rename {templates/zerver/help => help}/change-your-timezone.md (100%) rename {templates/zerver/help => help}/code-blocks.md (100%) rename {templates/zerver/help => help}/collapse-a-message.md (100%) rename {templates/zerver/help => help}/communities-directory.md (100%) rename {templates/zerver/help => help}/configure-authentication-methods.md (100%) rename {templates/zerver/help => help}/configure-default-new-user-settings.md (100%) rename {templates/zerver/help => help}/configure-default-view.md (100%) rename {templates/zerver/help => help}/configure-message-editing-and-deletion.md (100%) rename {templates/zerver/help => help}/configure-multi-language-search.md (100%) rename {templates/zerver/help => help}/configure-notification-bot.md (100%) rename {templates/zerver/help => help}/configure-organization-language.md (100%) rename {templates/zerver/help => help}/configure-who-can-create-streams.md (100%) rename {templates/zerver/help => help}/configure-who-can-edit-topics.md (100%) rename {templates/zerver/help => help}/configure-who-can-invite-to-streams.md (100%) rename {templates/zerver/help => help}/connect-through-a-proxy.md (100%) rename {templates/zerver/help => help}/contact-support.md (100%) rename {templates/zerver/help => help}/create-a-poll.md (100%) rename {templates/zerver/help => help}/create-a-stream.md (100%) rename {templates/zerver/help => help}/create-streams.md (100%) rename {templates/zerver/help => help}/create-user-groups.md (100%) rename {templates/zerver/help => help}/create-your-organization-profile.md (100%) rename {templates/zerver/help => help}/custom-certificates.md (100%) rename {templates/zerver/help => help}/custom-emoji.md (100%) rename {templates/zerver/help => help}/custom-profile-fields.md (100%) rename {templates/zerver/help => help}/customize-organization-settings.md (100%) rename {templates/zerver/help => help}/customize-settings-for-new-users.md (100%) rename {templates/zerver/help => help}/dark-theme.md (100%) rename {templates/zerver/help => help}/deactivate-or-reactivate-a-bot.md (100%) rename {templates/zerver/help => help}/deactivate-or-reactivate-a-user.md (100%) rename {templates/zerver/help => help}/deactivate-your-account.md (100%) rename {templates/zerver/help => help}/deactivate-your-organization.md (100%) rename {templates/zerver/help => help}/delete-a-topic.md (100%) rename {templates/zerver/help => help}/demo-organizations.md (100%) rename {templates/zerver/help => help}/desktop-app-install-guide.md (100%) rename {templates/zerver/help => help}/desktop-notifications.md (100%) rename {templates/zerver/help => help}/digest-emails.md (100%) rename {templates/zerver/help => help}/disable-message-edit-history.md (100%) rename {templates/zerver/help => help}/disable-welcome-emails.md (100%) rename {templates/zerver/help => help}/edit-a-bot.md (100%) rename {templates/zerver/help => help}/edit-or-delete-a-message.md (100%) rename {templates/zerver/help => help}/edit-your-profile.md (100%) rename {templates/zerver/help => help}/email-notifications.md (100%) rename {templates/zerver/help => help}/emoji-and-emoticons.md (100%) rename {templates/zerver/help => help}/emoji-reactions.md (100%) rename {templates/zerver/help => help}/enable-emoticon-translations.md (100%) rename {templates/zerver/help => help}/enable-full-width-display.md (100%) rename {templates/zerver/help => help}/export-your-organization.md (100%) rename {templates/zerver/help => help}/finding-a-topic-to-read.md (100%) rename {templates/zerver/help => help}/format-your-message-using-markdown.md (100%) rename {templates/zerver/help => help}/gdpr-compliance.md (100%) rename {templates/zerver/help => help}/getting-started-with-zulip.md (100%) rename {templates/zerver/help => help}/getting-your-organization-started-with-zulip.md (100%) rename {templates/zerver/help => help}/hide-message-content-in-emails.md (100%) rename {templates/zerver/help => help}/high-contrast-mode.md (100%) rename {templates/zerver/help => help}/import-from-gitter.md (100%) rename {templates/zerver/help => help}/import-from-mattermost.md (100%) rename {templates/zerver/help => help}/import-from-rocketchat.md (100%) rename {templates/zerver/help => help}/import-from-slack.md (100%) rename {templates/zerver/help => help}/import-your-settings.md (100%) rename {templates/zerver/help => help}/include/add-a-wide-logo.md (100%) rename {templates/zerver/help => help}/include/admin-only.md (100%) rename {templates/zerver/help => help}/include/advantages-of-self-hosting-zulip.md (100%) rename {templates/zerver/help => help}/include/advantages-of-zulip-cloud.md (100%) rename {templates/zerver/help => help}/include/all-messages.md (100%) rename {templates/zerver/help => help}/include/automated-notice-stream-event.md (100%) rename {templates/zerver/help => help}/include/automated-pm-stream-subscription.md (100%) rename {templates/zerver/help => help}/include/change-password-via-email-confirmation.md (100%) rename {templates/zerver/help => help}/include/cloud-plus-only.md (100%) rename {templates/zerver/help => help}/include/cloud-standard-only.md (100%) rename {templates/zerver/help => help}/include/communities-directory-instructions.md (100%) rename {templates/zerver/help => help}/include/communities-directory-intro.md (100%) rename {templates/zerver/help => help}/include/compose-and-send-message.md (100%) rename {templates/zerver/help => help}/include/create-streams-intro.md (100%) rename {templates/zerver/help => help}/include/customize-organization-settings.md (100%) rename {templates/zerver/help => help}/include/customize-settings-for-new-users.md (100%) rename {templates/zerver/help => help}/include/desktop-sidebar-settings-menu.md (100%) rename {templates/zerver/help => help}/include/desktop-toggle-sidebar-tip.md (100%) rename {templates/zerver/help => help}/include/edit-organization-profile.md (100%) rename {templates/zerver/help => help}/include/how-to-create-a-user-group.md (100%) rename {templates/zerver/help => help}/include/how-to-invite-users-to-join.md (100%) rename {templates/zerver/help => help}/include/how-to-start-a-new-topic.md (100%) rename {templates/zerver/help => help}/include/import-get-your-organization-started.md (100%) rename {templates/zerver/help => help}/include/import-how-users-will-log-in.md (100%) rename {templates/zerver/help => help}/include/import-into-a-self-hosted-zulip-server.md (100%) rename {templates/zerver/help => help}/include/import-into-a-zulip-cloud-organization.md (100%) rename {templates/zerver/help => help}/include/import-login.md (100%) rename {templates/zerver/help => help}/include/import-self-hosted-server-tips.md (100%) rename {templates/zerver/help => help}/include/import-workspace-to-zulip.md (100%) rename {templates/zerver/help => help}/include/import-your-data-into-zulip.md (100%) rename {templates/zerver/help => help}/include/import-zulip-cloud-organization-warning.md (100%) rename {templates/zerver/help => help}/include/left-sidebar-topics.md (100%) rename {templates/zerver/help => help}/include/manage-this-user.md (100%) rename {templates/zerver/help => help}/include/message-actions-menu.md (100%) rename {templates/zerver/help => help}/include/message-actions.md (100%) rename {templates/zerver/help => help}/include/message-long-press-menu.md (100%) rename {templates/zerver/help => help}/include/messaging-tips.md (100%) rename {templates/zerver/help => help}/include/migrating-from-other-chat-tools.md (100%) rename {templates/zerver/help => help}/include/mobile-profile-menu.md (100%) rename {templates/zerver/help => help}/include/mobile-stream-settings-menu-tip.md (100%) rename {templates/zerver/help => help}/include/organization-profile-intro.md (100%) rename {templates/zerver/help => help}/include/owner-only.md (100%) rename {templates/zerver/help => help}/include/reading-pms.md (100%) rename {templates/zerver/help => help}/include/reading-topics.md (100%) rename {templates/zerver/help => help}/include/recent-conversations.md (100%) rename {templates/zerver/help => help}/include/replying-to-messages.md (100%) rename {templates/zerver/help => help}/include/review-organization-settings-instructions.md (100%) rename {templates/zerver/help => help}/include/right-sidebar-user-card.md (100%) rename {templates/zerver/help => help}/include/right-sidebar-view-profile.md (100%) rename {templates/zerver/help => help}/include/saml-login-button.md (100%) rename {templates/zerver/help => help}/include/save-changes.md (100%) rename {templates/zerver/help => help}/include/select-stream-view-general.md (100%) rename {templates/zerver/help => help}/include/select-stream-view-personal.md (100%) rename {templates/zerver/help => help}/include/select-stream-view-subscribers.md (100%) rename {templates/zerver/help => help}/include/self-user-card.md (100%) rename {templates/zerver/help => help}/include/send-group-pm.md (100%) rename {templates/zerver/help => help}/include/send-us-info.md (100%) rename {templates/zerver/help => help}/include/set-up-integrations.md (100%) rename {templates/zerver/help => help}/include/set-up-your-account.md (100%) rename {templates/zerver/help => help}/include/sidebar_index.md (100%) rename {templates/zerver/help => help}/include/start-composing.md (100%) rename {templates/zerver/help => help}/include/starting-a-new-private-thread.md (100%) rename {templates/zerver/help => help}/include/stream-actions.md (100%) rename {templates/zerver/help => help}/include/stream-long-press-menu-tip.md (100%) rename {templates/zerver/help => help}/include/stream-long-press-menu.md (100%) rename {templates/zerver/help => help}/include/streams-and-topics.md (100%) rename {templates/zerver/help => help}/include/switching-between-organizations.md (100%) rename {templates/zerver/help => help}/include/tips-for-creating-streams.md (100%) rename {templates/zerver/help => help}/include/topic-actions.md (100%) rename {templates/zerver/help => help}/include/topic-long-press-menu-tip.md (100%) rename {templates/zerver/help => help}/include/topic-long-press-menu.md (100%) rename {templates/zerver/help => help}/include/translation-project-info.md (100%) rename {templates/zerver/help => help}/include/trying-out-zulip.md (100%) rename {templates/zerver/help => help}/include/upgrade-to-plus-if-needed.md (100%) rename {templates/zerver/help => help}/include/user-card-three-dot-menu.md (100%) rename {templates/zerver/help => help}/include/web-public-streams-intro.md (100%) rename {templates/zerver/help => help}/include/when-to-start-a-new-topic.md (100%) rename {templates/zerver/help => help}/index.md (100%) rename {templates/zerver/help => help}/invite-new-users.md (100%) rename {templates/zerver/help => help}/invite-users-to-join.md (100%) rename {templates/zerver/help => help}/join-a-zulip-organization.md (100%) rename {templates/zerver/help => help}/keyboard-shortcuts.md (100%) rename {templates/zerver/help => help}/link-to-a-message-or-conversation.md (100%) rename {templates/zerver/help => help}/linking-to-zulip.md (100%) rename {templates/zerver/help => help}/logging-in.md (100%) rename {templates/zerver/help => help}/logging-out.md (100%) rename {templates/zerver/help => help}/manage-inactive-streams.md (100%) rename {templates/zerver/help => help}/manage-user-stream-subscriptions.md (100%) rename {templates/zerver/help => help}/manage-your-uploaded-files.md (100%) rename {templates/zerver/help => help}/marking-messages-as-read.md (100%) rename {templates/zerver/help => help}/marking-messages-as-unread.md (100%) rename {templates/zerver/help => help}/mastering-the-compose-box.md (100%) rename {templates/zerver/help => help}/mention-a-user-or-group.md (100%) rename {templates/zerver/help => help}/message-a-stream-by-email.md (100%) rename {templates/zerver/help => help}/message-actions.md (100%) rename {templates/zerver/help => help}/message-retention-policy.md (100%) rename {templates/zerver/help => help}/messaging-tips.md (100%) rename {templates/zerver/help => help}/migrating-from-other-chat-tools.md (100%) rename {templates/zerver/help => help}/missing.md (100%) rename {templates/zerver/help => help}/mobile-notifications.md (100%) rename {templates/zerver/help => help}/moderating-open-organizations.md (100%) rename {templates/zerver/help => help}/move-content-to-another-stream.md (100%) rename {templates/zerver/help => help}/move-content-to-another-topic.md (100%) rename {templates/zerver/help => help}/mute-a-stream.md (100%) rename {templates/zerver/help => help}/mute-a-topic.md (100%) rename {templates/zerver/help => help}/mute-a-user.md (100%) rename {templates/zerver/help => help}/open-the-compose-box.md (100%) rename {templates/zerver/help => help}/organization-type.md (100%) rename {templates/zerver/help => help}/organize-the-streams-sidebar.md (100%) rename {templates/zerver/help => help}/pin-a-stream.md (100%) rename {templates/zerver/help => help}/pm-mention-alert-notifications.md (100%) rename {templates/zerver/help => help}/preview-your-message-before-sending.md (100%) rename {templates/zerver/help => help}/private-messages.md (100%) rename {templates/zerver/help => help}/public-access-option.md (100%) rename {templates/zerver/help => help}/quote-and-reply.md (100%) rename {templates/zerver/help => help}/read-receipts.md (100%) rename {templates/zerver/help => help}/reading-pms.md (100%) rename {templates/zerver/help => help}/reading-strategies.md (100%) rename {templates/zerver/help => help}/reading-topics.md (100%) rename {templates/zerver/help => help}/recent-conversations.md (100%) rename {templates/zerver/help => help}/rename-a-stream.md (100%) rename {templates/zerver/help => help}/rename-a-topic.md (100%) rename {templates/zerver/help => help}/replying-to-messages.md (100%) rename {templates/zerver/help => help}/request-an-integration.md (100%) rename {templates/zerver/help => help}/require-topics.md (100%) rename {templates/zerver/help => help}/resize-the-compose-box.md (100%) rename {templates/zerver/help => help}/resolve-a-topic.md (100%) rename {templates/zerver/help => help}/restrict-account-creation.md (100%) rename {templates/zerver/help => help}/restrict-bot-creation.md (100%) rename {templates/zerver/help => help}/restrict-name-and-email-changes.md (100%) rename {templates/zerver/help => help}/restrict-permissions-of-new-members.md (100%) rename {templates/zerver/help => help}/restrict-private-messages.md (100%) rename {templates/zerver/help => help}/restrict-profile-picture-changes.md (100%) rename {templates/zerver/help => help}/restrict-visibility-of-email-addresses.md (100%) rename {templates/zerver/help => help}/restrict-wildcard-mentions.md (100%) rename {templates/zerver/help => help}/review-your-organization-settings.md (100%) rename {templates/zerver/help => help}/review-your-settings.md (100%) rename {templates/zerver/help => help}/roles-and-permissions.md (100%) rename {templates/zerver/help => help}/saml-authentication.md (100%) rename {templates/zerver/help => help}/scim.md (100%) rename {templates/zerver/help => help}/search-for-messages.md (100%) rename {templates/zerver/help => help}/set-default-streams-for-new-users.md (100%) rename {templates/zerver/help => help}/set-up-integrations.md (100%) rename {templates/zerver/help => help}/set-up-your-account.md (100%) rename {templates/zerver/help => help}/setting-up-zulip-for-a-class.md (100%) rename {templates/zerver/help => help}/share-and-upload-files.md (100%) rename {templates/zerver/help => help}/star-a-message.md (100%) rename {templates/zerver/help => help}/start-a-call.md (100%) rename {templates/zerver/help => help}/start-a-new-topic.md (100%) rename {templates/zerver/help => help}/starting-a-new-private-thread.md (100%) rename {templates/zerver/help => help}/starting-a-new-topic.md (100%) rename {templates/zerver/help => help}/status-and-availability.md (100%) rename {templates/zerver/help => help}/stream-notifications.md (100%) rename {templates/zerver/help => help}/stream-permissions.md (100%) rename {templates/zerver/help => help}/stream-sending-policy.md (100%) rename {templates/zerver/help => help}/streams-and-topics.md (100%) rename {templates/zerver/help => help}/switching-between-organizations.md (100%) rename {templates/zerver/help => help}/trying-out-zulip.md (100%) rename {templates/zerver/help => help}/typing-notifications.md (100%) rename {templates/zerver/help => help}/unsubscribe-from-a-stream.md (100%) rename {templates/zerver/help => help}/user-cards.md (100%) rename {templates/zerver/help => help}/user-groups.md (100%) rename {templates/zerver/help => help}/using-zulip-for-a-class.md (100%) rename {templates/zerver/help => help}/using-zulip-via-email.md (100%) rename {templates/zerver/help => help}/verify-your-message-was-successfully-sent.md (100%) rename {templates/zerver/help => help}/view-a-messages-edit-history.md (100%) rename {templates/zerver/help => help}/view-all-bots-in-your-organization.md (100%) rename {templates/zerver/help => help}/view-and-browse-images.md (100%) rename {templates/zerver/help => help}/view-and-edit-your-message-drafts.md (100%) rename {templates/zerver/help => help}/view-messages-sent-by-a-user.md (100%) rename {templates/zerver/help => help}/view-someones-profile.md (100%) rename {templates/zerver/help => help}/view-the-exact-time-a-message-was-sent.md (100%) rename {templates/zerver/help => help}/view-the-markdown-source-of-a-message.md (100%) rename {templates/zerver/help => help}/view-your-mentions.md (100%) rename {templates/zerver/help => help}/view-zulip-version.md (100%) rename {templates/zerver/help => help}/zulip-cloud-billing.md (100%) rename {templates/zerver/help => help}/zulip-cloud-or-self-hosting.md (100%) rename {templates/zerver/help => help}/zulip-in-a-terminal.md (100%) diff --git a/.prettierignore b/.prettierignore index 5891d3d288..0457e60a3e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,5 @@ /corporate/tests/stripe_fixtures +/help/**/*.md /locale /static/third /templates/**/*.md diff --git a/docs/documentation/helpcenter.md b/docs/documentation/helpcenter.md index 616053e056..74999318bb 100644 --- a/docs/documentation/helpcenter.md +++ b/docs/documentation/helpcenter.md @@ -26,20 +26,18 @@ from the Internet, and we'd like the documentation to be available in that environment. The source for help center documentation is the Markdown files under -`templates/zerver/help/` in the -[main Zulip server repository](https://github.com/zulip/zulip). The file -`foo.md` is automatically rendered by the `render_markdown_path` function in -`zerver/templatetags/app_filters.py` when the user accesses a URL of the -form `/help/foo`; with special cases for `/help/` going to `index.md` and -`/help/unknown_article` going to `missing.md` (with a 404 response). Images -are usually linked from `static/images/help/`. +`help/` in the [main Zulip server repository](https://github.com/zulip/zulip). +The file `foo.md` is automatically rendered by the `render_markdown_path` +function in `zerver/templatetags/app_filters.py` when the user accesses a URL +of the form `/help/foo`; with special cases for `/help/` going to `index.md` +and `/help/unknown_article` going to `missing.md` (with a 404 response). +Images are usually linked from `static/images/help/`. This means that you can contribute to the Zulip help center documentation by just adding to or editing the collection of Markdown files under -`templates/zerver/help`. If you have the Zulip development environment -set up, you simply need to reload your browser on -`http://localhost:9991/help/foo` to see the latest version of `foo.md` -rendered. +`help/...`. If you have the Zulip development environment set up, you simply +need to reload your browser on `http://localhost:9991/help/foo` to see the +latest version of `foo.md` rendered. This system is designed to make writing and maintaining such documentation highly efficient. We link to the docs extensively from the landing pages and @@ -69,9 +67,8 @@ the current documentation as a resource and guide as you begin. - Should the feature you're documenting be added or merged into an existing article? - - If so, you can locate that article in - `templates/zerver/help` and start working on updating it with - content about the new feature. + - If so, you can locate that article in `help/` and start working + on updating it with content about the new feature. - If not, choose an existing article to use as a template for your new article and make a list of which articles (or guides) would be @@ -352,8 +349,7 @@ make use of `fa` as a base class. phrases and steps at the location of the macros. Macros help eliminate repeated content in our documentation. -The source for macros is the Markdown files under -`templates/zerver/help/include` in the +The source for macros is the Markdown files under `help/include` in the [main Zulip server repository](https://github.com/zulip/zulip). - **Administrator only feature** `{!admin-only.md!}`: Notes that the feature diff --git a/docs/tutorials/new-feature-tutorial.md b/docs/tutorials/new-feature-tutorial.md index 0cebbc6c7b..56ef7aa2c4 100644 --- a/docs/tutorials/new-feature-tutorial.md +++ b/docs/tutorials/new-feature-tutorial.md @@ -68,7 +68,7 @@ organization in Zulip). The following files are involved in the process: - `zerver/openapi/zulip.yaml`: OpenAPI definitions for the Zulip REST API. - `templates/zerver/api/changelog.md`: documentation listing all changes to the Zulip Server API. -- `templates/zerver/help/...`: end user facing documentation (Help Center) for the application. +- `help/...`: end user facing documentation (Help Center) for the application. ### Adding a field to the database @@ -157,10 +157,10 @@ For detailed information on the kinds of documentation Zulip has, see [Documentation](../documentation/overview.md). **Help center documentation:** You will likely need to at least update, -extend and link to `/help/` articles that are related to your new -feature. [Writing help center articles](../documentation/helpcenter.md) +extend and link to articles in the `help/` directory that are related +to your new feature. [Writing help center articles](../documentation/helpcenter.md) provides more detailed information about writing and editing feature -`/help/` articles. +`help/` directory articles. **API documentation:** A new feature will probably impact the REST API documentation as well, which will mean updating `zerver/openapi/zulip.yaml` @@ -696,10 +696,10 @@ this feature would be to update and/or augment Zulip's existing changes and additions. At the very least, this will involve modifying (or adding) a Markdown -file documenting the feature to `templates/zerver/help/` in the main -Zulip server repository, where the source for Zulip's end user -documentation is stored. Details about writing, editing and testing -these Markdown files can be found in: +file documenting the feature in the `help/` directory of the main Zulip +server repository, where the source for Zulip's end user documentation +is stored. Details about writing, editing and testing these Markdown +files can be found in: [Writing help center articles](../documentation/helpcenter.md). Also, new features will often impact Zulip's REST API documentation, diff --git a/templates/zerver/help/add-a-bot-or-integration.md b/help/add-a-bot-or-integration.md similarity index 100% rename from templates/zerver/help/add-a-bot-or-integration.md rename to help/add-a-bot-or-integration.md diff --git a/templates/zerver/help/add-a-custom-linkifier.md b/help/add-a-custom-linkifier.md similarity index 100% rename from templates/zerver/help/add-a-custom-linkifier.md rename to help/add-a-custom-linkifier.md diff --git a/templates/zerver/help/add-or-remove-users-from-a-stream.md b/help/add-or-remove-users-from-a-stream.md similarity index 100% rename from templates/zerver/help/add-or-remove-users-from-a-stream.md rename to help/add-or-remove-users-from-a-stream.md diff --git a/templates/zerver/help/all-messages.md b/help/all-messages.md similarity index 100% rename from templates/zerver/help/all-messages.md rename to help/all-messages.md diff --git a/templates/zerver/help/allow-image-link-previews.md b/help/allow-image-link-previews.md similarity index 100% rename from templates/zerver/help/allow-image-link-previews.md rename to help/allow-image-link-previews.md diff --git a/templates/zerver/help/analytics.md b/help/analytics.md similarity index 100% rename from templates/zerver/help/analytics.md rename to help/analytics.md diff --git a/templates/zerver/help/animated-gifs-from-giphy.md b/help/animated-gifs-from-giphy.md similarity index 100% rename from templates/zerver/help/animated-gifs-from-giphy.md rename to help/animated-gifs-from-giphy.md diff --git a/templates/zerver/help/archive-a-stream.md b/help/archive-a-stream.md similarity index 100% rename from templates/zerver/help/archive-a-stream.md rename to help/archive-a-stream.md diff --git a/templates/zerver/help/bots-and-integrations.md b/help/bots-and-integrations.md similarity index 100% rename from templates/zerver/help/bots-and-integrations.md rename to help/bots-and-integrations.md diff --git a/templates/zerver/help/browse-and-subscribe-to-streams.md b/help/browse-and-subscribe-to-streams.md similarity index 100% rename from templates/zerver/help/browse-and-subscribe-to-streams.md rename to help/browse-and-subscribe-to-streams.md diff --git a/templates/zerver/help/change-a-users-name.md b/help/change-a-users-name.md similarity index 100% rename from templates/zerver/help/change-a-users-name.md rename to help/change-a-users-name.md diff --git a/templates/zerver/help/change-a-users-role.md b/help/change-a-users-role.md similarity index 100% rename from templates/zerver/help/change-a-users-role.md rename to help/change-a-users-role.md diff --git a/templates/zerver/help/change-organization-url.md b/help/change-organization-url.md similarity index 100% rename from templates/zerver/help/change-organization-url.md rename to help/change-organization-url.md diff --git a/templates/zerver/help/change-the-color-of-a-stream.md b/help/change-the-color-of-a-stream.md similarity index 100% rename from templates/zerver/help/change-the-color-of-a-stream.md rename to help/change-the-color-of-a-stream.md diff --git a/templates/zerver/help/change-the-privacy-of-a-stream.md b/help/change-the-privacy-of-a-stream.md similarity index 100% rename from templates/zerver/help/change-the-privacy-of-a-stream.md rename to help/change-the-privacy-of-a-stream.md diff --git a/templates/zerver/help/change-the-stream-description.md b/help/change-the-stream-description.md similarity index 100% rename from templates/zerver/help/change-the-stream-description.md rename to help/change-the-stream-description.md diff --git a/templates/zerver/help/change-the-time-format.md b/help/change-the-time-format.md similarity index 100% rename from templates/zerver/help/change-the-time-format.md rename to help/change-the-time-format.md diff --git a/templates/zerver/help/change-your-email-address.md b/help/change-your-email-address.md similarity index 100% rename from templates/zerver/help/change-your-email-address.md rename to help/change-your-email-address.md diff --git a/templates/zerver/help/change-your-language.md b/help/change-your-language.md similarity index 100% rename from templates/zerver/help/change-your-language.md rename to help/change-your-language.md diff --git a/templates/zerver/help/change-your-name.md b/help/change-your-name.md similarity index 100% rename from templates/zerver/help/change-your-name.md rename to help/change-your-name.md diff --git a/templates/zerver/help/change-your-password.md b/help/change-your-password.md similarity index 100% rename from templates/zerver/help/change-your-password.md rename to help/change-your-password.md diff --git a/templates/zerver/help/change-your-profile-picture.md b/help/change-your-profile-picture.md similarity index 100% rename from templates/zerver/help/change-your-profile-picture.md rename to help/change-your-profile-picture.md diff --git a/templates/zerver/help/change-your-timezone.md b/help/change-your-timezone.md similarity index 100% rename from templates/zerver/help/change-your-timezone.md rename to help/change-your-timezone.md diff --git a/templates/zerver/help/code-blocks.md b/help/code-blocks.md similarity index 100% rename from templates/zerver/help/code-blocks.md rename to help/code-blocks.md diff --git a/templates/zerver/help/collapse-a-message.md b/help/collapse-a-message.md similarity index 100% rename from templates/zerver/help/collapse-a-message.md rename to help/collapse-a-message.md diff --git a/templates/zerver/help/communities-directory.md b/help/communities-directory.md similarity index 100% rename from templates/zerver/help/communities-directory.md rename to help/communities-directory.md diff --git a/templates/zerver/help/configure-authentication-methods.md b/help/configure-authentication-methods.md similarity index 100% rename from templates/zerver/help/configure-authentication-methods.md rename to help/configure-authentication-methods.md diff --git a/templates/zerver/help/configure-default-new-user-settings.md b/help/configure-default-new-user-settings.md similarity index 100% rename from templates/zerver/help/configure-default-new-user-settings.md rename to help/configure-default-new-user-settings.md diff --git a/templates/zerver/help/configure-default-view.md b/help/configure-default-view.md similarity index 100% rename from templates/zerver/help/configure-default-view.md rename to help/configure-default-view.md diff --git a/templates/zerver/help/configure-message-editing-and-deletion.md b/help/configure-message-editing-and-deletion.md similarity index 100% rename from templates/zerver/help/configure-message-editing-and-deletion.md rename to help/configure-message-editing-and-deletion.md diff --git a/templates/zerver/help/configure-multi-language-search.md b/help/configure-multi-language-search.md similarity index 100% rename from templates/zerver/help/configure-multi-language-search.md rename to help/configure-multi-language-search.md diff --git a/templates/zerver/help/configure-notification-bot.md b/help/configure-notification-bot.md similarity index 100% rename from templates/zerver/help/configure-notification-bot.md rename to help/configure-notification-bot.md diff --git a/templates/zerver/help/configure-organization-language.md b/help/configure-organization-language.md similarity index 100% rename from templates/zerver/help/configure-organization-language.md rename to help/configure-organization-language.md diff --git a/templates/zerver/help/configure-who-can-create-streams.md b/help/configure-who-can-create-streams.md similarity index 100% rename from templates/zerver/help/configure-who-can-create-streams.md rename to help/configure-who-can-create-streams.md diff --git a/templates/zerver/help/configure-who-can-edit-topics.md b/help/configure-who-can-edit-topics.md similarity index 100% rename from templates/zerver/help/configure-who-can-edit-topics.md rename to help/configure-who-can-edit-topics.md diff --git a/templates/zerver/help/configure-who-can-invite-to-streams.md b/help/configure-who-can-invite-to-streams.md similarity index 100% rename from templates/zerver/help/configure-who-can-invite-to-streams.md rename to help/configure-who-can-invite-to-streams.md diff --git a/templates/zerver/help/connect-through-a-proxy.md b/help/connect-through-a-proxy.md similarity index 100% rename from templates/zerver/help/connect-through-a-proxy.md rename to help/connect-through-a-proxy.md diff --git a/templates/zerver/help/contact-support.md b/help/contact-support.md similarity index 100% rename from templates/zerver/help/contact-support.md rename to help/contact-support.md diff --git a/templates/zerver/help/create-a-poll.md b/help/create-a-poll.md similarity index 100% rename from templates/zerver/help/create-a-poll.md rename to help/create-a-poll.md diff --git a/templates/zerver/help/create-a-stream.md b/help/create-a-stream.md similarity index 100% rename from templates/zerver/help/create-a-stream.md rename to help/create-a-stream.md diff --git a/templates/zerver/help/create-streams.md b/help/create-streams.md similarity index 100% rename from templates/zerver/help/create-streams.md rename to help/create-streams.md diff --git a/templates/zerver/help/create-user-groups.md b/help/create-user-groups.md similarity index 100% rename from templates/zerver/help/create-user-groups.md rename to help/create-user-groups.md diff --git a/templates/zerver/help/create-your-organization-profile.md b/help/create-your-organization-profile.md similarity index 100% rename from templates/zerver/help/create-your-organization-profile.md rename to help/create-your-organization-profile.md diff --git a/templates/zerver/help/custom-certificates.md b/help/custom-certificates.md similarity index 100% rename from templates/zerver/help/custom-certificates.md rename to help/custom-certificates.md diff --git a/templates/zerver/help/custom-emoji.md b/help/custom-emoji.md similarity index 100% rename from templates/zerver/help/custom-emoji.md rename to help/custom-emoji.md diff --git a/templates/zerver/help/custom-profile-fields.md b/help/custom-profile-fields.md similarity index 100% rename from templates/zerver/help/custom-profile-fields.md rename to help/custom-profile-fields.md diff --git a/templates/zerver/help/customize-organization-settings.md b/help/customize-organization-settings.md similarity index 100% rename from templates/zerver/help/customize-organization-settings.md rename to help/customize-organization-settings.md diff --git a/templates/zerver/help/customize-settings-for-new-users.md b/help/customize-settings-for-new-users.md similarity index 100% rename from templates/zerver/help/customize-settings-for-new-users.md rename to help/customize-settings-for-new-users.md diff --git a/templates/zerver/help/dark-theme.md b/help/dark-theme.md similarity index 100% rename from templates/zerver/help/dark-theme.md rename to help/dark-theme.md diff --git a/templates/zerver/help/deactivate-or-reactivate-a-bot.md b/help/deactivate-or-reactivate-a-bot.md similarity index 100% rename from templates/zerver/help/deactivate-or-reactivate-a-bot.md rename to help/deactivate-or-reactivate-a-bot.md diff --git a/templates/zerver/help/deactivate-or-reactivate-a-user.md b/help/deactivate-or-reactivate-a-user.md similarity index 100% rename from templates/zerver/help/deactivate-or-reactivate-a-user.md rename to help/deactivate-or-reactivate-a-user.md diff --git a/templates/zerver/help/deactivate-your-account.md b/help/deactivate-your-account.md similarity index 100% rename from templates/zerver/help/deactivate-your-account.md rename to help/deactivate-your-account.md diff --git a/templates/zerver/help/deactivate-your-organization.md b/help/deactivate-your-organization.md similarity index 100% rename from templates/zerver/help/deactivate-your-organization.md rename to help/deactivate-your-organization.md diff --git a/templates/zerver/help/delete-a-topic.md b/help/delete-a-topic.md similarity index 100% rename from templates/zerver/help/delete-a-topic.md rename to help/delete-a-topic.md diff --git a/templates/zerver/help/demo-organizations.md b/help/demo-organizations.md similarity index 100% rename from templates/zerver/help/demo-organizations.md rename to help/demo-organizations.md diff --git a/templates/zerver/help/desktop-app-install-guide.md b/help/desktop-app-install-guide.md similarity index 100% rename from templates/zerver/help/desktop-app-install-guide.md rename to help/desktop-app-install-guide.md diff --git a/templates/zerver/help/desktop-notifications.md b/help/desktop-notifications.md similarity index 100% rename from templates/zerver/help/desktop-notifications.md rename to help/desktop-notifications.md diff --git a/templates/zerver/help/digest-emails.md b/help/digest-emails.md similarity index 100% rename from templates/zerver/help/digest-emails.md rename to help/digest-emails.md diff --git a/templates/zerver/help/disable-message-edit-history.md b/help/disable-message-edit-history.md similarity index 100% rename from templates/zerver/help/disable-message-edit-history.md rename to help/disable-message-edit-history.md diff --git a/templates/zerver/help/disable-welcome-emails.md b/help/disable-welcome-emails.md similarity index 100% rename from templates/zerver/help/disable-welcome-emails.md rename to help/disable-welcome-emails.md diff --git a/templates/zerver/help/edit-a-bot.md b/help/edit-a-bot.md similarity index 100% rename from templates/zerver/help/edit-a-bot.md rename to help/edit-a-bot.md diff --git a/templates/zerver/help/edit-or-delete-a-message.md b/help/edit-or-delete-a-message.md similarity index 100% rename from templates/zerver/help/edit-or-delete-a-message.md rename to help/edit-or-delete-a-message.md diff --git a/templates/zerver/help/edit-your-profile.md b/help/edit-your-profile.md similarity index 100% rename from templates/zerver/help/edit-your-profile.md rename to help/edit-your-profile.md diff --git a/templates/zerver/help/email-notifications.md b/help/email-notifications.md similarity index 100% rename from templates/zerver/help/email-notifications.md rename to help/email-notifications.md diff --git a/templates/zerver/help/emoji-and-emoticons.md b/help/emoji-and-emoticons.md similarity index 100% rename from templates/zerver/help/emoji-and-emoticons.md rename to help/emoji-and-emoticons.md diff --git a/templates/zerver/help/emoji-reactions.md b/help/emoji-reactions.md similarity index 100% rename from templates/zerver/help/emoji-reactions.md rename to help/emoji-reactions.md diff --git a/templates/zerver/help/enable-emoticon-translations.md b/help/enable-emoticon-translations.md similarity index 100% rename from templates/zerver/help/enable-emoticon-translations.md rename to help/enable-emoticon-translations.md diff --git a/templates/zerver/help/enable-full-width-display.md b/help/enable-full-width-display.md similarity index 100% rename from templates/zerver/help/enable-full-width-display.md rename to help/enable-full-width-display.md diff --git a/templates/zerver/help/export-your-organization.md b/help/export-your-organization.md similarity index 100% rename from templates/zerver/help/export-your-organization.md rename to help/export-your-organization.md diff --git a/templates/zerver/help/finding-a-topic-to-read.md b/help/finding-a-topic-to-read.md similarity index 100% rename from templates/zerver/help/finding-a-topic-to-read.md rename to help/finding-a-topic-to-read.md diff --git a/templates/zerver/help/format-your-message-using-markdown.md b/help/format-your-message-using-markdown.md similarity index 100% rename from templates/zerver/help/format-your-message-using-markdown.md rename to help/format-your-message-using-markdown.md diff --git a/templates/zerver/help/gdpr-compliance.md b/help/gdpr-compliance.md similarity index 100% rename from templates/zerver/help/gdpr-compliance.md rename to help/gdpr-compliance.md diff --git a/templates/zerver/help/getting-started-with-zulip.md b/help/getting-started-with-zulip.md similarity index 100% rename from templates/zerver/help/getting-started-with-zulip.md rename to help/getting-started-with-zulip.md diff --git a/templates/zerver/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md similarity index 100% rename from templates/zerver/help/getting-your-organization-started-with-zulip.md rename to help/getting-your-organization-started-with-zulip.md diff --git a/templates/zerver/help/hide-message-content-in-emails.md b/help/hide-message-content-in-emails.md similarity index 100% rename from templates/zerver/help/hide-message-content-in-emails.md rename to help/hide-message-content-in-emails.md diff --git a/templates/zerver/help/high-contrast-mode.md b/help/high-contrast-mode.md similarity index 100% rename from templates/zerver/help/high-contrast-mode.md rename to help/high-contrast-mode.md diff --git a/templates/zerver/help/import-from-gitter.md b/help/import-from-gitter.md similarity index 100% rename from templates/zerver/help/import-from-gitter.md rename to help/import-from-gitter.md diff --git a/templates/zerver/help/import-from-mattermost.md b/help/import-from-mattermost.md similarity index 100% rename from templates/zerver/help/import-from-mattermost.md rename to help/import-from-mattermost.md diff --git a/templates/zerver/help/import-from-rocketchat.md b/help/import-from-rocketchat.md similarity index 100% rename from templates/zerver/help/import-from-rocketchat.md rename to help/import-from-rocketchat.md diff --git a/templates/zerver/help/import-from-slack.md b/help/import-from-slack.md similarity index 100% rename from templates/zerver/help/import-from-slack.md rename to help/import-from-slack.md diff --git a/templates/zerver/help/import-your-settings.md b/help/import-your-settings.md similarity index 100% rename from templates/zerver/help/import-your-settings.md rename to help/import-your-settings.md diff --git a/templates/zerver/help/include/add-a-wide-logo.md b/help/include/add-a-wide-logo.md similarity index 100% rename from templates/zerver/help/include/add-a-wide-logo.md rename to help/include/add-a-wide-logo.md diff --git a/templates/zerver/help/include/admin-only.md b/help/include/admin-only.md similarity index 100% rename from templates/zerver/help/include/admin-only.md rename to help/include/admin-only.md diff --git a/templates/zerver/help/include/advantages-of-self-hosting-zulip.md b/help/include/advantages-of-self-hosting-zulip.md similarity index 100% rename from templates/zerver/help/include/advantages-of-self-hosting-zulip.md rename to help/include/advantages-of-self-hosting-zulip.md diff --git a/templates/zerver/help/include/advantages-of-zulip-cloud.md b/help/include/advantages-of-zulip-cloud.md similarity index 100% rename from templates/zerver/help/include/advantages-of-zulip-cloud.md rename to help/include/advantages-of-zulip-cloud.md diff --git a/templates/zerver/help/include/all-messages.md b/help/include/all-messages.md similarity index 100% rename from templates/zerver/help/include/all-messages.md rename to help/include/all-messages.md diff --git a/templates/zerver/help/include/automated-notice-stream-event.md b/help/include/automated-notice-stream-event.md similarity index 100% rename from templates/zerver/help/include/automated-notice-stream-event.md rename to help/include/automated-notice-stream-event.md diff --git a/templates/zerver/help/include/automated-pm-stream-subscription.md b/help/include/automated-pm-stream-subscription.md similarity index 100% rename from templates/zerver/help/include/automated-pm-stream-subscription.md rename to help/include/automated-pm-stream-subscription.md diff --git a/templates/zerver/help/include/change-password-via-email-confirmation.md b/help/include/change-password-via-email-confirmation.md similarity index 100% rename from templates/zerver/help/include/change-password-via-email-confirmation.md rename to help/include/change-password-via-email-confirmation.md diff --git a/templates/zerver/help/include/cloud-plus-only.md b/help/include/cloud-plus-only.md similarity index 100% rename from templates/zerver/help/include/cloud-plus-only.md rename to help/include/cloud-plus-only.md diff --git a/templates/zerver/help/include/cloud-standard-only.md b/help/include/cloud-standard-only.md similarity index 100% rename from templates/zerver/help/include/cloud-standard-only.md rename to help/include/cloud-standard-only.md diff --git a/templates/zerver/help/include/communities-directory-instructions.md b/help/include/communities-directory-instructions.md similarity index 100% rename from templates/zerver/help/include/communities-directory-instructions.md rename to help/include/communities-directory-instructions.md diff --git a/templates/zerver/help/include/communities-directory-intro.md b/help/include/communities-directory-intro.md similarity index 100% rename from templates/zerver/help/include/communities-directory-intro.md rename to help/include/communities-directory-intro.md diff --git a/templates/zerver/help/include/compose-and-send-message.md b/help/include/compose-and-send-message.md similarity index 100% rename from templates/zerver/help/include/compose-and-send-message.md rename to help/include/compose-and-send-message.md diff --git a/templates/zerver/help/include/create-streams-intro.md b/help/include/create-streams-intro.md similarity index 100% rename from templates/zerver/help/include/create-streams-intro.md rename to help/include/create-streams-intro.md diff --git a/templates/zerver/help/include/customize-organization-settings.md b/help/include/customize-organization-settings.md similarity index 100% rename from templates/zerver/help/include/customize-organization-settings.md rename to help/include/customize-organization-settings.md diff --git a/templates/zerver/help/include/customize-settings-for-new-users.md b/help/include/customize-settings-for-new-users.md similarity index 100% rename from templates/zerver/help/include/customize-settings-for-new-users.md rename to help/include/customize-settings-for-new-users.md diff --git a/templates/zerver/help/include/desktop-sidebar-settings-menu.md b/help/include/desktop-sidebar-settings-menu.md similarity index 100% rename from templates/zerver/help/include/desktop-sidebar-settings-menu.md rename to help/include/desktop-sidebar-settings-menu.md diff --git a/templates/zerver/help/include/desktop-toggle-sidebar-tip.md b/help/include/desktop-toggle-sidebar-tip.md similarity index 100% rename from templates/zerver/help/include/desktop-toggle-sidebar-tip.md rename to help/include/desktop-toggle-sidebar-tip.md diff --git a/templates/zerver/help/include/edit-organization-profile.md b/help/include/edit-organization-profile.md similarity index 100% rename from templates/zerver/help/include/edit-organization-profile.md rename to help/include/edit-organization-profile.md diff --git a/templates/zerver/help/include/how-to-create-a-user-group.md b/help/include/how-to-create-a-user-group.md similarity index 100% rename from templates/zerver/help/include/how-to-create-a-user-group.md rename to help/include/how-to-create-a-user-group.md diff --git a/templates/zerver/help/include/how-to-invite-users-to-join.md b/help/include/how-to-invite-users-to-join.md similarity index 100% rename from templates/zerver/help/include/how-to-invite-users-to-join.md rename to help/include/how-to-invite-users-to-join.md diff --git a/templates/zerver/help/include/how-to-start-a-new-topic.md b/help/include/how-to-start-a-new-topic.md similarity index 100% rename from templates/zerver/help/include/how-to-start-a-new-topic.md rename to help/include/how-to-start-a-new-topic.md diff --git a/templates/zerver/help/include/import-get-your-organization-started.md b/help/include/import-get-your-organization-started.md similarity index 100% rename from templates/zerver/help/include/import-get-your-organization-started.md rename to help/include/import-get-your-organization-started.md diff --git a/templates/zerver/help/include/import-how-users-will-log-in.md b/help/include/import-how-users-will-log-in.md similarity index 100% rename from templates/zerver/help/include/import-how-users-will-log-in.md rename to help/include/import-how-users-will-log-in.md diff --git a/templates/zerver/help/include/import-into-a-self-hosted-zulip-server.md b/help/include/import-into-a-self-hosted-zulip-server.md similarity index 100% rename from templates/zerver/help/include/import-into-a-self-hosted-zulip-server.md rename to help/include/import-into-a-self-hosted-zulip-server.md diff --git a/templates/zerver/help/include/import-into-a-zulip-cloud-organization.md b/help/include/import-into-a-zulip-cloud-organization.md similarity index 100% rename from templates/zerver/help/include/import-into-a-zulip-cloud-organization.md rename to help/include/import-into-a-zulip-cloud-organization.md diff --git a/templates/zerver/help/include/import-login.md b/help/include/import-login.md similarity index 100% rename from templates/zerver/help/include/import-login.md rename to help/include/import-login.md diff --git a/templates/zerver/help/include/import-self-hosted-server-tips.md b/help/include/import-self-hosted-server-tips.md similarity index 100% rename from templates/zerver/help/include/import-self-hosted-server-tips.md rename to help/include/import-self-hosted-server-tips.md diff --git a/templates/zerver/help/include/import-workspace-to-zulip.md b/help/include/import-workspace-to-zulip.md similarity index 100% rename from templates/zerver/help/include/import-workspace-to-zulip.md rename to help/include/import-workspace-to-zulip.md diff --git a/templates/zerver/help/include/import-your-data-into-zulip.md b/help/include/import-your-data-into-zulip.md similarity index 100% rename from templates/zerver/help/include/import-your-data-into-zulip.md rename to help/include/import-your-data-into-zulip.md diff --git a/templates/zerver/help/include/import-zulip-cloud-organization-warning.md b/help/include/import-zulip-cloud-organization-warning.md similarity index 100% rename from templates/zerver/help/include/import-zulip-cloud-organization-warning.md rename to help/include/import-zulip-cloud-organization-warning.md diff --git a/templates/zerver/help/include/left-sidebar-topics.md b/help/include/left-sidebar-topics.md similarity index 100% rename from templates/zerver/help/include/left-sidebar-topics.md rename to help/include/left-sidebar-topics.md diff --git a/templates/zerver/help/include/manage-this-user.md b/help/include/manage-this-user.md similarity index 100% rename from templates/zerver/help/include/manage-this-user.md rename to help/include/manage-this-user.md diff --git a/templates/zerver/help/include/message-actions-menu.md b/help/include/message-actions-menu.md similarity index 100% rename from templates/zerver/help/include/message-actions-menu.md rename to help/include/message-actions-menu.md diff --git a/templates/zerver/help/include/message-actions.md b/help/include/message-actions.md similarity index 100% rename from templates/zerver/help/include/message-actions.md rename to help/include/message-actions.md diff --git a/templates/zerver/help/include/message-long-press-menu.md b/help/include/message-long-press-menu.md similarity index 100% rename from templates/zerver/help/include/message-long-press-menu.md rename to help/include/message-long-press-menu.md diff --git a/templates/zerver/help/include/messaging-tips.md b/help/include/messaging-tips.md similarity index 100% rename from templates/zerver/help/include/messaging-tips.md rename to help/include/messaging-tips.md diff --git a/templates/zerver/help/include/migrating-from-other-chat-tools.md b/help/include/migrating-from-other-chat-tools.md similarity index 100% rename from templates/zerver/help/include/migrating-from-other-chat-tools.md rename to help/include/migrating-from-other-chat-tools.md diff --git a/templates/zerver/help/include/mobile-profile-menu.md b/help/include/mobile-profile-menu.md similarity index 100% rename from templates/zerver/help/include/mobile-profile-menu.md rename to help/include/mobile-profile-menu.md diff --git a/templates/zerver/help/include/mobile-stream-settings-menu-tip.md b/help/include/mobile-stream-settings-menu-tip.md similarity index 100% rename from templates/zerver/help/include/mobile-stream-settings-menu-tip.md rename to help/include/mobile-stream-settings-menu-tip.md diff --git a/templates/zerver/help/include/organization-profile-intro.md b/help/include/organization-profile-intro.md similarity index 100% rename from templates/zerver/help/include/organization-profile-intro.md rename to help/include/organization-profile-intro.md diff --git a/templates/zerver/help/include/owner-only.md b/help/include/owner-only.md similarity index 100% rename from templates/zerver/help/include/owner-only.md rename to help/include/owner-only.md diff --git a/templates/zerver/help/include/reading-pms.md b/help/include/reading-pms.md similarity index 100% rename from templates/zerver/help/include/reading-pms.md rename to help/include/reading-pms.md diff --git a/templates/zerver/help/include/reading-topics.md b/help/include/reading-topics.md similarity index 100% rename from templates/zerver/help/include/reading-topics.md rename to help/include/reading-topics.md diff --git a/templates/zerver/help/include/recent-conversations.md b/help/include/recent-conversations.md similarity index 100% rename from templates/zerver/help/include/recent-conversations.md rename to help/include/recent-conversations.md diff --git a/templates/zerver/help/include/replying-to-messages.md b/help/include/replying-to-messages.md similarity index 100% rename from templates/zerver/help/include/replying-to-messages.md rename to help/include/replying-to-messages.md diff --git a/templates/zerver/help/include/review-organization-settings-instructions.md b/help/include/review-organization-settings-instructions.md similarity index 100% rename from templates/zerver/help/include/review-organization-settings-instructions.md rename to help/include/review-organization-settings-instructions.md diff --git a/templates/zerver/help/include/right-sidebar-user-card.md b/help/include/right-sidebar-user-card.md similarity index 100% rename from templates/zerver/help/include/right-sidebar-user-card.md rename to help/include/right-sidebar-user-card.md diff --git a/templates/zerver/help/include/right-sidebar-view-profile.md b/help/include/right-sidebar-view-profile.md similarity index 100% rename from templates/zerver/help/include/right-sidebar-view-profile.md rename to help/include/right-sidebar-view-profile.md diff --git a/templates/zerver/help/include/saml-login-button.md b/help/include/saml-login-button.md similarity index 100% rename from templates/zerver/help/include/saml-login-button.md rename to help/include/saml-login-button.md diff --git a/templates/zerver/help/include/save-changes.md b/help/include/save-changes.md similarity index 100% rename from templates/zerver/help/include/save-changes.md rename to help/include/save-changes.md diff --git a/templates/zerver/help/include/select-stream-view-general.md b/help/include/select-stream-view-general.md similarity index 100% rename from templates/zerver/help/include/select-stream-view-general.md rename to help/include/select-stream-view-general.md diff --git a/templates/zerver/help/include/select-stream-view-personal.md b/help/include/select-stream-view-personal.md similarity index 100% rename from templates/zerver/help/include/select-stream-view-personal.md rename to help/include/select-stream-view-personal.md diff --git a/templates/zerver/help/include/select-stream-view-subscribers.md b/help/include/select-stream-view-subscribers.md similarity index 100% rename from templates/zerver/help/include/select-stream-view-subscribers.md rename to help/include/select-stream-view-subscribers.md diff --git a/templates/zerver/help/include/self-user-card.md b/help/include/self-user-card.md similarity index 100% rename from templates/zerver/help/include/self-user-card.md rename to help/include/self-user-card.md diff --git a/templates/zerver/help/include/send-group-pm.md b/help/include/send-group-pm.md similarity index 100% rename from templates/zerver/help/include/send-group-pm.md rename to help/include/send-group-pm.md diff --git a/templates/zerver/help/include/send-us-info.md b/help/include/send-us-info.md similarity index 100% rename from templates/zerver/help/include/send-us-info.md rename to help/include/send-us-info.md diff --git a/templates/zerver/help/include/set-up-integrations.md b/help/include/set-up-integrations.md similarity index 100% rename from templates/zerver/help/include/set-up-integrations.md rename to help/include/set-up-integrations.md diff --git a/templates/zerver/help/include/set-up-your-account.md b/help/include/set-up-your-account.md similarity index 100% rename from templates/zerver/help/include/set-up-your-account.md rename to help/include/set-up-your-account.md diff --git a/templates/zerver/help/include/sidebar_index.md b/help/include/sidebar_index.md similarity index 100% rename from templates/zerver/help/include/sidebar_index.md rename to help/include/sidebar_index.md diff --git a/templates/zerver/help/include/start-composing.md b/help/include/start-composing.md similarity index 100% rename from templates/zerver/help/include/start-composing.md rename to help/include/start-composing.md diff --git a/templates/zerver/help/include/starting-a-new-private-thread.md b/help/include/starting-a-new-private-thread.md similarity index 100% rename from templates/zerver/help/include/starting-a-new-private-thread.md rename to help/include/starting-a-new-private-thread.md diff --git a/templates/zerver/help/include/stream-actions.md b/help/include/stream-actions.md similarity index 100% rename from templates/zerver/help/include/stream-actions.md rename to help/include/stream-actions.md diff --git a/templates/zerver/help/include/stream-long-press-menu-tip.md b/help/include/stream-long-press-menu-tip.md similarity index 100% rename from templates/zerver/help/include/stream-long-press-menu-tip.md rename to help/include/stream-long-press-menu-tip.md diff --git a/templates/zerver/help/include/stream-long-press-menu.md b/help/include/stream-long-press-menu.md similarity index 100% rename from templates/zerver/help/include/stream-long-press-menu.md rename to help/include/stream-long-press-menu.md diff --git a/templates/zerver/help/include/streams-and-topics.md b/help/include/streams-and-topics.md similarity index 100% rename from templates/zerver/help/include/streams-and-topics.md rename to help/include/streams-and-topics.md diff --git a/templates/zerver/help/include/switching-between-organizations.md b/help/include/switching-between-organizations.md similarity index 100% rename from templates/zerver/help/include/switching-between-organizations.md rename to help/include/switching-between-organizations.md diff --git a/templates/zerver/help/include/tips-for-creating-streams.md b/help/include/tips-for-creating-streams.md similarity index 100% rename from templates/zerver/help/include/tips-for-creating-streams.md rename to help/include/tips-for-creating-streams.md diff --git a/templates/zerver/help/include/topic-actions.md b/help/include/topic-actions.md similarity index 100% rename from templates/zerver/help/include/topic-actions.md rename to help/include/topic-actions.md diff --git a/templates/zerver/help/include/topic-long-press-menu-tip.md b/help/include/topic-long-press-menu-tip.md similarity index 100% rename from templates/zerver/help/include/topic-long-press-menu-tip.md rename to help/include/topic-long-press-menu-tip.md diff --git a/templates/zerver/help/include/topic-long-press-menu.md b/help/include/topic-long-press-menu.md similarity index 100% rename from templates/zerver/help/include/topic-long-press-menu.md rename to help/include/topic-long-press-menu.md diff --git a/templates/zerver/help/include/translation-project-info.md b/help/include/translation-project-info.md similarity index 100% rename from templates/zerver/help/include/translation-project-info.md rename to help/include/translation-project-info.md diff --git a/templates/zerver/help/include/trying-out-zulip.md b/help/include/trying-out-zulip.md similarity index 100% rename from templates/zerver/help/include/trying-out-zulip.md rename to help/include/trying-out-zulip.md diff --git a/templates/zerver/help/include/upgrade-to-plus-if-needed.md b/help/include/upgrade-to-plus-if-needed.md similarity index 100% rename from templates/zerver/help/include/upgrade-to-plus-if-needed.md rename to help/include/upgrade-to-plus-if-needed.md diff --git a/templates/zerver/help/include/user-card-three-dot-menu.md b/help/include/user-card-three-dot-menu.md similarity index 100% rename from templates/zerver/help/include/user-card-three-dot-menu.md rename to help/include/user-card-three-dot-menu.md diff --git a/templates/zerver/help/include/web-public-streams-intro.md b/help/include/web-public-streams-intro.md similarity index 100% rename from templates/zerver/help/include/web-public-streams-intro.md rename to help/include/web-public-streams-intro.md diff --git a/templates/zerver/help/include/when-to-start-a-new-topic.md b/help/include/when-to-start-a-new-topic.md similarity index 100% rename from templates/zerver/help/include/when-to-start-a-new-topic.md rename to help/include/when-to-start-a-new-topic.md diff --git a/templates/zerver/help/index.md b/help/index.md similarity index 100% rename from templates/zerver/help/index.md rename to help/index.md diff --git a/templates/zerver/help/invite-new-users.md b/help/invite-new-users.md similarity index 100% rename from templates/zerver/help/invite-new-users.md rename to help/invite-new-users.md diff --git a/templates/zerver/help/invite-users-to-join.md b/help/invite-users-to-join.md similarity index 100% rename from templates/zerver/help/invite-users-to-join.md rename to help/invite-users-to-join.md diff --git a/templates/zerver/help/join-a-zulip-organization.md b/help/join-a-zulip-organization.md similarity index 100% rename from templates/zerver/help/join-a-zulip-organization.md rename to help/join-a-zulip-organization.md diff --git a/templates/zerver/help/keyboard-shortcuts.md b/help/keyboard-shortcuts.md similarity index 100% rename from templates/zerver/help/keyboard-shortcuts.md rename to help/keyboard-shortcuts.md diff --git a/templates/zerver/help/link-to-a-message-or-conversation.md b/help/link-to-a-message-or-conversation.md similarity index 100% rename from templates/zerver/help/link-to-a-message-or-conversation.md rename to help/link-to-a-message-or-conversation.md diff --git a/templates/zerver/help/linking-to-zulip.md b/help/linking-to-zulip.md similarity index 100% rename from templates/zerver/help/linking-to-zulip.md rename to help/linking-to-zulip.md diff --git a/templates/zerver/help/logging-in.md b/help/logging-in.md similarity index 100% rename from templates/zerver/help/logging-in.md rename to help/logging-in.md diff --git a/templates/zerver/help/logging-out.md b/help/logging-out.md similarity index 100% rename from templates/zerver/help/logging-out.md rename to help/logging-out.md diff --git a/templates/zerver/help/manage-inactive-streams.md b/help/manage-inactive-streams.md similarity index 100% rename from templates/zerver/help/manage-inactive-streams.md rename to help/manage-inactive-streams.md diff --git a/templates/zerver/help/manage-user-stream-subscriptions.md b/help/manage-user-stream-subscriptions.md similarity index 100% rename from templates/zerver/help/manage-user-stream-subscriptions.md rename to help/manage-user-stream-subscriptions.md diff --git a/templates/zerver/help/manage-your-uploaded-files.md b/help/manage-your-uploaded-files.md similarity index 100% rename from templates/zerver/help/manage-your-uploaded-files.md rename to help/manage-your-uploaded-files.md diff --git a/templates/zerver/help/marking-messages-as-read.md b/help/marking-messages-as-read.md similarity index 100% rename from templates/zerver/help/marking-messages-as-read.md rename to help/marking-messages-as-read.md diff --git a/templates/zerver/help/marking-messages-as-unread.md b/help/marking-messages-as-unread.md similarity index 100% rename from templates/zerver/help/marking-messages-as-unread.md rename to help/marking-messages-as-unread.md diff --git a/templates/zerver/help/mastering-the-compose-box.md b/help/mastering-the-compose-box.md similarity index 100% rename from templates/zerver/help/mastering-the-compose-box.md rename to help/mastering-the-compose-box.md diff --git a/templates/zerver/help/mention-a-user-or-group.md b/help/mention-a-user-or-group.md similarity index 100% rename from templates/zerver/help/mention-a-user-or-group.md rename to help/mention-a-user-or-group.md diff --git a/templates/zerver/help/message-a-stream-by-email.md b/help/message-a-stream-by-email.md similarity index 100% rename from templates/zerver/help/message-a-stream-by-email.md rename to help/message-a-stream-by-email.md diff --git a/templates/zerver/help/message-actions.md b/help/message-actions.md similarity index 100% rename from templates/zerver/help/message-actions.md rename to help/message-actions.md diff --git a/templates/zerver/help/message-retention-policy.md b/help/message-retention-policy.md similarity index 100% rename from templates/zerver/help/message-retention-policy.md rename to help/message-retention-policy.md diff --git a/templates/zerver/help/messaging-tips.md b/help/messaging-tips.md similarity index 100% rename from templates/zerver/help/messaging-tips.md rename to help/messaging-tips.md diff --git a/templates/zerver/help/migrating-from-other-chat-tools.md b/help/migrating-from-other-chat-tools.md similarity index 100% rename from templates/zerver/help/migrating-from-other-chat-tools.md rename to help/migrating-from-other-chat-tools.md diff --git a/templates/zerver/help/missing.md b/help/missing.md similarity index 100% rename from templates/zerver/help/missing.md rename to help/missing.md diff --git a/templates/zerver/help/mobile-notifications.md b/help/mobile-notifications.md similarity index 100% rename from templates/zerver/help/mobile-notifications.md rename to help/mobile-notifications.md diff --git a/templates/zerver/help/moderating-open-organizations.md b/help/moderating-open-organizations.md similarity index 100% rename from templates/zerver/help/moderating-open-organizations.md rename to help/moderating-open-organizations.md diff --git a/templates/zerver/help/move-content-to-another-stream.md b/help/move-content-to-another-stream.md similarity index 100% rename from templates/zerver/help/move-content-to-another-stream.md rename to help/move-content-to-another-stream.md diff --git a/templates/zerver/help/move-content-to-another-topic.md b/help/move-content-to-another-topic.md similarity index 100% rename from templates/zerver/help/move-content-to-another-topic.md rename to help/move-content-to-another-topic.md diff --git a/templates/zerver/help/mute-a-stream.md b/help/mute-a-stream.md similarity index 100% rename from templates/zerver/help/mute-a-stream.md rename to help/mute-a-stream.md diff --git a/templates/zerver/help/mute-a-topic.md b/help/mute-a-topic.md similarity index 100% rename from templates/zerver/help/mute-a-topic.md rename to help/mute-a-topic.md diff --git a/templates/zerver/help/mute-a-user.md b/help/mute-a-user.md similarity index 100% rename from templates/zerver/help/mute-a-user.md rename to help/mute-a-user.md diff --git a/templates/zerver/help/open-the-compose-box.md b/help/open-the-compose-box.md similarity index 100% rename from templates/zerver/help/open-the-compose-box.md rename to help/open-the-compose-box.md diff --git a/templates/zerver/help/organization-type.md b/help/organization-type.md similarity index 100% rename from templates/zerver/help/organization-type.md rename to help/organization-type.md diff --git a/templates/zerver/help/organize-the-streams-sidebar.md b/help/organize-the-streams-sidebar.md similarity index 100% rename from templates/zerver/help/organize-the-streams-sidebar.md rename to help/organize-the-streams-sidebar.md diff --git a/templates/zerver/help/pin-a-stream.md b/help/pin-a-stream.md similarity index 100% rename from templates/zerver/help/pin-a-stream.md rename to help/pin-a-stream.md diff --git a/templates/zerver/help/pm-mention-alert-notifications.md b/help/pm-mention-alert-notifications.md similarity index 100% rename from templates/zerver/help/pm-mention-alert-notifications.md rename to help/pm-mention-alert-notifications.md diff --git a/templates/zerver/help/preview-your-message-before-sending.md b/help/preview-your-message-before-sending.md similarity index 100% rename from templates/zerver/help/preview-your-message-before-sending.md rename to help/preview-your-message-before-sending.md diff --git a/templates/zerver/help/private-messages.md b/help/private-messages.md similarity index 100% rename from templates/zerver/help/private-messages.md rename to help/private-messages.md diff --git a/templates/zerver/help/public-access-option.md b/help/public-access-option.md similarity index 100% rename from templates/zerver/help/public-access-option.md rename to help/public-access-option.md diff --git a/templates/zerver/help/quote-and-reply.md b/help/quote-and-reply.md similarity index 100% rename from templates/zerver/help/quote-and-reply.md rename to help/quote-and-reply.md diff --git a/templates/zerver/help/read-receipts.md b/help/read-receipts.md similarity index 100% rename from templates/zerver/help/read-receipts.md rename to help/read-receipts.md diff --git a/templates/zerver/help/reading-pms.md b/help/reading-pms.md similarity index 100% rename from templates/zerver/help/reading-pms.md rename to help/reading-pms.md diff --git a/templates/zerver/help/reading-strategies.md b/help/reading-strategies.md similarity index 100% rename from templates/zerver/help/reading-strategies.md rename to help/reading-strategies.md diff --git a/templates/zerver/help/reading-topics.md b/help/reading-topics.md similarity index 100% rename from templates/zerver/help/reading-topics.md rename to help/reading-topics.md diff --git a/templates/zerver/help/recent-conversations.md b/help/recent-conversations.md similarity index 100% rename from templates/zerver/help/recent-conversations.md rename to help/recent-conversations.md diff --git a/templates/zerver/help/rename-a-stream.md b/help/rename-a-stream.md similarity index 100% rename from templates/zerver/help/rename-a-stream.md rename to help/rename-a-stream.md diff --git a/templates/zerver/help/rename-a-topic.md b/help/rename-a-topic.md similarity index 100% rename from templates/zerver/help/rename-a-topic.md rename to help/rename-a-topic.md diff --git a/templates/zerver/help/replying-to-messages.md b/help/replying-to-messages.md similarity index 100% rename from templates/zerver/help/replying-to-messages.md rename to help/replying-to-messages.md diff --git a/templates/zerver/help/request-an-integration.md b/help/request-an-integration.md similarity index 100% rename from templates/zerver/help/request-an-integration.md rename to help/request-an-integration.md diff --git a/templates/zerver/help/require-topics.md b/help/require-topics.md similarity index 100% rename from templates/zerver/help/require-topics.md rename to help/require-topics.md diff --git a/templates/zerver/help/resize-the-compose-box.md b/help/resize-the-compose-box.md similarity index 100% rename from templates/zerver/help/resize-the-compose-box.md rename to help/resize-the-compose-box.md diff --git a/templates/zerver/help/resolve-a-topic.md b/help/resolve-a-topic.md similarity index 100% rename from templates/zerver/help/resolve-a-topic.md rename to help/resolve-a-topic.md diff --git a/templates/zerver/help/restrict-account-creation.md b/help/restrict-account-creation.md similarity index 100% rename from templates/zerver/help/restrict-account-creation.md rename to help/restrict-account-creation.md diff --git a/templates/zerver/help/restrict-bot-creation.md b/help/restrict-bot-creation.md similarity index 100% rename from templates/zerver/help/restrict-bot-creation.md rename to help/restrict-bot-creation.md diff --git a/templates/zerver/help/restrict-name-and-email-changes.md b/help/restrict-name-and-email-changes.md similarity index 100% rename from templates/zerver/help/restrict-name-and-email-changes.md rename to help/restrict-name-and-email-changes.md diff --git a/templates/zerver/help/restrict-permissions-of-new-members.md b/help/restrict-permissions-of-new-members.md similarity index 100% rename from templates/zerver/help/restrict-permissions-of-new-members.md rename to help/restrict-permissions-of-new-members.md diff --git a/templates/zerver/help/restrict-private-messages.md b/help/restrict-private-messages.md similarity index 100% rename from templates/zerver/help/restrict-private-messages.md rename to help/restrict-private-messages.md diff --git a/templates/zerver/help/restrict-profile-picture-changes.md b/help/restrict-profile-picture-changes.md similarity index 100% rename from templates/zerver/help/restrict-profile-picture-changes.md rename to help/restrict-profile-picture-changes.md diff --git a/templates/zerver/help/restrict-visibility-of-email-addresses.md b/help/restrict-visibility-of-email-addresses.md similarity index 100% rename from templates/zerver/help/restrict-visibility-of-email-addresses.md rename to help/restrict-visibility-of-email-addresses.md diff --git a/templates/zerver/help/restrict-wildcard-mentions.md b/help/restrict-wildcard-mentions.md similarity index 100% rename from templates/zerver/help/restrict-wildcard-mentions.md rename to help/restrict-wildcard-mentions.md diff --git a/templates/zerver/help/review-your-organization-settings.md b/help/review-your-organization-settings.md similarity index 100% rename from templates/zerver/help/review-your-organization-settings.md rename to help/review-your-organization-settings.md diff --git a/templates/zerver/help/review-your-settings.md b/help/review-your-settings.md similarity index 100% rename from templates/zerver/help/review-your-settings.md rename to help/review-your-settings.md diff --git a/templates/zerver/help/roles-and-permissions.md b/help/roles-and-permissions.md similarity index 100% rename from templates/zerver/help/roles-and-permissions.md rename to help/roles-and-permissions.md diff --git a/templates/zerver/help/saml-authentication.md b/help/saml-authentication.md similarity index 100% rename from templates/zerver/help/saml-authentication.md rename to help/saml-authentication.md diff --git a/templates/zerver/help/scim.md b/help/scim.md similarity index 100% rename from templates/zerver/help/scim.md rename to help/scim.md diff --git a/templates/zerver/help/search-for-messages.md b/help/search-for-messages.md similarity index 100% rename from templates/zerver/help/search-for-messages.md rename to help/search-for-messages.md diff --git a/templates/zerver/help/set-default-streams-for-new-users.md b/help/set-default-streams-for-new-users.md similarity index 100% rename from templates/zerver/help/set-default-streams-for-new-users.md rename to help/set-default-streams-for-new-users.md diff --git a/templates/zerver/help/set-up-integrations.md b/help/set-up-integrations.md similarity index 100% rename from templates/zerver/help/set-up-integrations.md rename to help/set-up-integrations.md diff --git a/templates/zerver/help/set-up-your-account.md b/help/set-up-your-account.md similarity index 100% rename from templates/zerver/help/set-up-your-account.md rename to help/set-up-your-account.md diff --git a/templates/zerver/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md similarity index 100% rename from templates/zerver/help/setting-up-zulip-for-a-class.md rename to help/setting-up-zulip-for-a-class.md diff --git a/templates/zerver/help/share-and-upload-files.md b/help/share-and-upload-files.md similarity index 100% rename from templates/zerver/help/share-and-upload-files.md rename to help/share-and-upload-files.md diff --git a/templates/zerver/help/star-a-message.md b/help/star-a-message.md similarity index 100% rename from templates/zerver/help/star-a-message.md rename to help/star-a-message.md diff --git a/templates/zerver/help/start-a-call.md b/help/start-a-call.md similarity index 100% rename from templates/zerver/help/start-a-call.md rename to help/start-a-call.md diff --git a/templates/zerver/help/start-a-new-topic.md b/help/start-a-new-topic.md similarity index 100% rename from templates/zerver/help/start-a-new-topic.md rename to help/start-a-new-topic.md diff --git a/templates/zerver/help/starting-a-new-private-thread.md b/help/starting-a-new-private-thread.md similarity index 100% rename from templates/zerver/help/starting-a-new-private-thread.md rename to help/starting-a-new-private-thread.md diff --git a/templates/zerver/help/starting-a-new-topic.md b/help/starting-a-new-topic.md similarity index 100% rename from templates/zerver/help/starting-a-new-topic.md rename to help/starting-a-new-topic.md diff --git a/templates/zerver/help/status-and-availability.md b/help/status-and-availability.md similarity index 100% rename from templates/zerver/help/status-and-availability.md rename to help/status-and-availability.md diff --git a/templates/zerver/help/stream-notifications.md b/help/stream-notifications.md similarity index 100% rename from templates/zerver/help/stream-notifications.md rename to help/stream-notifications.md diff --git a/templates/zerver/help/stream-permissions.md b/help/stream-permissions.md similarity index 100% rename from templates/zerver/help/stream-permissions.md rename to help/stream-permissions.md diff --git a/templates/zerver/help/stream-sending-policy.md b/help/stream-sending-policy.md similarity index 100% rename from templates/zerver/help/stream-sending-policy.md rename to help/stream-sending-policy.md diff --git a/templates/zerver/help/streams-and-topics.md b/help/streams-and-topics.md similarity index 100% rename from templates/zerver/help/streams-and-topics.md rename to help/streams-and-topics.md diff --git a/templates/zerver/help/switching-between-organizations.md b/help/switching-between-organizations.md similarity index 100% rename from templates/zerver/help/switching-between-organizations.md rename to help/switching-between-organizations.md diff --git a/templates/zerver/help/trying-out-zulip.md b/help/trying-out-zulip.md similarity index 100% rename from templates/zerver/help/trying-out-zulip.md rename to help/trying-out-zulip.md diff --git a/templates/zerver/help/typing-notifications.md b/help/typing-notifications.md similarity index 100% rename from templates/zerver/help/typing-notifications.md rename to help/typing-notifications.md diff --git a/templates/zerver/help/unsubscribe-from-a-stream.md b/help/unsubscribe-from-a-stream.md similarity index 100% rename from templates/zerver/help/unsubscribe-from-a-stream.md rename to help/unsubscribe-from-a-stream.md diff --git a/templates/zerver/help/user-cards.md b/help/user-cards.md similarity index 100% rename from templates/zerver/help/user-cards.md rename to help/user-cards.md diff --git a/templates/zerver/help/user-groups.md b/help/user-groups.md similarity index 100% rename from templates/zerver/help/user-groups.md rename to help/user-groups.md diff --git a/templates/zerver/help/using-zulip-for-a-class.md b/help/using-zulip-for-a-class.md similarity index 100% rename from templates/zerver/help/using-zulip-for-a-class.md rename to help/using-zulip-for-a-class.md diff --git a/templates/zerver/help/using-zulip-via-email.md b/help/using-zulip-via-email.md similarity index 100% rename from templates/zerver/help/using-zulip-via-email.md rename to help/using-zulip-via-email.md diff --git a/templates/zerver/help/verify-your-message-was-successfully-sent.md b/help/verify-your-message-was-successfully-sent.md similarity index 100% rename from templates/zerver/help/verify-your-message-was-successfully-sent.md rename to help/verify-your-message-was-successfully-sent.md diff --git a/templates/zerver/help/view-a-messages-edit-history.md b/help/view-a-messages-edit-history.md similarity index 100% rename from templates/zerver/help/view-a-messages-edit-history.md rename to help/view-a-messages-edit-history.md diff --git a/templates/zerver/help/view-all-bots-in-your-organization.md b/help/view-all-bots-in-your-organization.md similarity index 100% rename from templates/zerver/help/view-all-bots-in-your-organization.md rename to help/view-all-bots-in-your-organization.md diff --git a/templates/zerver/help/view-and-browse-images.md b/help/view-and-browse-images.md similarity index 100% rename from templates/zerver/help/view-and-browse-images.md rename to help/view-and-browse-images.md diff --git a/templates/zerver/help/view-and-edit-your-message-drafts.md b/help/view-and-edit-your-message-drafts.md similarity index 100% rename from templates/zerver/help/view-and-edit-your-message-drafts.md rename to help/view-and-edit-your-message-drafts.md diff --git a/templates/zerver/help/view-messages-sent-by-a-user.md b/help/view-messages-sent-by-a-user.md similarity index 100% rename from templates/zerver/help/view-messages-sent-by-a-user.md rename to help/view-messages-sent-by-a-user.md diff --git a/templates/zerver/help/view-someones-profile.md b/help/view-someones-profile.md similarity index 100% rename from templates/zerver/help/view-someones-profile.md rename to help/view-someones-profile.md diff --git a/templates/zerver/help/view-the-exact-time-a-message-was-sent.md b/help/view-the-exact-time-a-message-was-sent.md similarity index 100% rename from templates/zerver/help/view-the-exact-time-a-message-was-sent.md rename to help/view-the-exact-time-a-message-was-sent.md diff --git a/templates/zerver/help/view-the-markdown-source-of-a-message.md b/help/view-the-markdown-source-of-a-message.md similarity index 100% rename from templates/zerver/help/view-the-markdown-source-of-a-message.md rename to help/view-the-markdown-source-of-a-message.md diff --git a/templates/zerver/help/view-your-mentions.md b/help/view-your-mentions.md similarity index 100% rename from templates/zerver/help/view-your-mentions.md rename to help/view-your-mentions.md diff --git a/templates/zerver/help/view-zulip-version.md b/help/view-zulip-version.md similarity index 100% rename from templates/zerver/help/view-zulip-version.md rename to help/view-zulip-version.md diff --git a/templates/zerver/help/zulip-cloud-billing.md b/help/zulip-cloud-billing.md similarity index 100% rename from templates/zerver/help/zulip-cloud-billing.md rename to help/zulip-cloud-billing.md diff --git a/templates/zerver/help/zulip-cloud-or-self-hosting.md b/help/zulip-cloud-or-self-hosting.md similarity index 100% rename from templates/zerver/help/zulip-cloud-or-self-hosting.md rename to help/zulip-cloud-or-self-hosting.md diff --git a/templates/zerver/help/zulip-in-a-terminal.md b/help/zulip-in-a-terminal.md similarity index 100% rename from templates/zerver/help/zulip-in-a-terminal.md rename to help/zulip-in-a-terminal.md diff --git a/templates/zerver/documentation_main.html b/templates/zerver/documentation_main.html index f6bd8cf2b7..20d5fa1515 100644 --- a/templates/zerver/documentation_main.html +++ b/templates/zerver/documentation_main.html @@ -18,7 +18,7 @@ {% if page_is_policy_center %} {{ render_markdown_path(sidebar_index, pure_markdown=True) }} {% elif page_is_help_center %} - {{ render_markdown_path(sidebar_index, context=api_uri_context, help_center=True) }} + {{ render_markdown_path(sidebar_index, pure_markdown=True) }} {% else %} {{ render_markdown_path(sidebar_index, api_uri_context) }} {% endif %} @@ -38,7 +38,7 @@ {% if page_is_policy_center %} {{ render_markdown_path(article, pure_markdown=True) }} {% elif page_is_help_center %} - {{ render_markdown_path(article, context=api_uri_context, help_center=True) }} + {{ render_markdown_path(article, context=api_uri_context, help_center=True, pure_markdown=True) }} {% else %} {{ render_markdown_path(article, api_uri_context) }} {% endif %} diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py index c905fdca2a..e15de04c6e 100644 --- a/tools/linter_lib/custom_check.py +++ b/tools/linter_lib/custom_check.py @@ -857,7 +857,7 @@ markdown_rules = RuleList( "description": "Don't link directly to line numbers", }, ], - exclude_files_in="templates/zerver/help/", + exclude_files_in="help/", ) help_markdown_rules = RuleList( @@ -867,13 +867,13 @@ help_markdown_rules = RuleList( { "pattern": "[a-z][.][A-Z]", "description": "Likely missing space after end of sentence", - "include_only": {"templates/zerver/help/"}, + "include_only": {"help/"}, "exclude_pattern": "Rocket.Chat", }, { "pattern": r"\b[rR]ealm[s]?\b", - "include_only": {"templates/zerver/help/"}, - "exclude": {"templates/zerver/help/change-organization-url.md"}, + "include_only": {"help/"}, + "exclude": {"help/change-organization-url.md"}, "good_lines": ["Organization", "deactivate_realm", "realm_filter"], "bad_lines": ["Users are in a realm", "Realm is the best model"], "description": "Realms are referred to as Organizations in user-facing docs.", diff --git a/tools/setup/emoji/emoji_setup_utils.py b/tools/setup/emoji/emoji_setup_utils.py index d8b5773bdc..14f87c4e6e 100644 --- a/tools/setup/emoji/emoji_setup_utils.py +++ b/tools/setup/emoji/emoji_setup_utils.py @@ -34,7 +34,7 @@ REMAPPED_EMOJIS = { } # Emoticons and which emoji they should become. Duplicate emoji are allowed. -# Changes here should be mimicked in `templates/zerver/help/enable-emoticon-translations.md`. +# Changes here should be mimicked in `help/enable-emoticon-translations.md`. EMOTICON_CONVERSIONS = { ":)": ":smile:", "(:": ":smile:", diff --git a/zerver/lib/templates.py b/zerver/lib/templates.py index 5b20434704..fdd9182213 100644 --- a/zerver/lib/templates.py +++ b/zerver/lib/templates.py @@ -151,9 +151,7 @@ def render_markdown_path( base_path="templates/zerver/integrations/include/" ) elif help_center: - md_macro_extension = zerver.lib.markdown.include.makeExtension( - base_path="templates/zerver/help/include/" - ) + md_macro_extension = zerver.lib.markdown.include.makeExtension(base_path="help/include/") else: md_macro_extension = zerver.lib.markdown.include.makeExtension( base_path="templates/zerver/api/include/" diff --git a/zerver/tests/test_urls.py b/zerver/tests/test_urls.py index 7e5c1450bb..6cd7c28b83 100644 --- a/zerver/tests/test_urls.py +++ b/zerver/tests/test_urls.py @@ -67,12 +67,12 @@ class PublicURLTest(ZulipTestCase): 404: ["/help/nonexistent", "/help/include/admin", "/help/" + "z" * 1000], } - # Add all files in 'templates/zerver/help' directory (except for 'main.html' and - # 'index.md') to `get_urls['200']` list. - for doc in os.listdir("./templates/zerver/help"): + # Add all files in help documentation directory (except for 'index.md', + # 'missing.md' and `help/include/` files) to `get_urls['200']` list. + for doc in os.listdir("./help"): if doc.startswith(".") or "~" in doc or "#" in doc: continue # nocoverage -- just here for convenience - if doc not in {"main.html", "index.md", "include", "missing.md"}: + if doc not in {"index.md", "include", "missing.md"}: get_urls[200].append("/help/" + os.path.splitext(doc)[0]) # Strip the extension. post_urls = { diff --git a/zerver/views/documentation.py b/zerver/views/documentation.py index ccb1fbd6b0..e2f472a375 100644 --- a/zerver/views/documentation.py +++ b/zerver/views/documentation.py @@ -68,6 +68,7 @@ class ApiURLView(TemplateView): class MarkdownDirectoryView(ApiURLView): path_template = "" policies_view = False + help_view = False def get_path(self, article: str) -> DocumentationArticle: http_status = 200 @@ -86,10 +87,8 @@ class MarkdownDirectoryView(ApiURLView): endpoint_name = None endpoint_method = None - if self.policies_view and self.path_template.startswith("/"): - # This block is required because neither the Django - # template loader nor the article_path logic below support - # settings.POLICIES_DIRECTORY being an absolute path. + # Absolute path cases + if (self.policies_view or self.help_view) and self.path_template.startswith("/"): if not os.path.exists(path): article = "missing" http_status = 404 @@ -165,7 +164,7 @@ class MarkdownDirectoryView(ApiURLView): settings.DEPLOY_ROOT, "templates", documentation_article.article_path ) - if self.path_template == "/zerver/help/%s.md": + if self.help_view: context["page_is_help_center"] = True context["doc_root"] = "/help/" context["doc_root_title"] = "Help center" diff --git a/zproject/urls.py b/zproject/urls.py index 6f69e3b338..a808058708 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -781,7 +781,9 @@ urls += [ # User documentation site help_documentation_view = MarkdownDirectoryView.as_view( - template_name="zerver/documentation_main.html", path_template="/zerver/help/%s.md" + template_name="zerver/documentation_main.html", + path_template=f"{settings.DEPLOY_ROOT}/help/%s.md", + help_view=True, ) api_documentation_view = MarkdownDirectoryView.as_view( template_name="zerver/documentation_main.html", path_template="/zerver/api/%s.md"