mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
discourse/discourse change from 'master' to 'main'
This commit is contained in:
Michael Brown
committed by
Michael Brown
Michael Brown
parent
1472e47aae
commit
5f7e60d9dc
@@ -42,7 +42,7 @@ Email is required for new account signups and notifications. **Test your email t
|
||||
|
||||
- You got the test email? Great! **Read that email closely**, it has important email deliverability tips.
|
||||
- You didn't get the test email? This means your users probably aren't getting any signup or notification emails either.
|
||||
- Email deliverability can be hard. Read [**Email Service Configuration**](https://github.com/discourse/discourse/blob/master/docs/INSTALL-email.md).
|
||||
- Email deliverability can be hard. Read [**Email Service Configuration**](https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md).
|
||||
|
||||
If you'd like to enable *replying* to topics via email, [see this howto](https://meta.discourse.org/t/set-up-reply-via-email-support/14003).
|
||||
|
||||
@@ -117,7 +117,7 @@ The invite area on your profile page also includes advanced Staff methods of [se
|
||||
|
||||
- One CPU and 1GB of memory, with swap, is the minimum for a basic Discourse community. As your community grows you may need more memory or CPU resources.
|
||||
|
||||
- [Our Docker container install](https://github.com/discourse/discourse/blob/master/docs/INSTALL.md) is the only one we officially support. It guarantees easy updates, and all recommended optimizations from the Discourse team.
|
||||
- [Our Docker container install](https://github.com/discourse/discourse/blob/main/docs/INSTALL.md) is the only one we officially support. It guarantees easy updates, and all recommended optimizations from the Discourse team.
|
||||
|
||||
- You should get an email notification when new versions of Discourse are released. To update your instance via our easy one click upgrade process, visit [/admin/upgrade](/admin/upgrade).
|
||||
|
||||
@@ -129,7 +129,7 @@ The invite area on your profile page also includes advanced Staff methods of [se
|
||||
- [Import and Export your data](https://meta.discourse.org/t/move-your-discourse-instance-to-a-different-server/15721)
|
||||
- [Change the domain name](https://meta.discourse.org/t/how-do-i-change-the-domain-name/16098)
|
||||
- [Multiple Discourse instances on the same server](https://meta.discourse.org/t/multisite-configuration-with-docker/14084)
|
||||
- [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/master/script/import_scripts)
|
||||
- [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/main/script/import_scripts)
|
||||
- A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584).
|
||||
- A user friendly [offline page when rebuilding or upgrading?](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
|
||||
- Embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)
|
||||
@@ -140,4 +140,4 @@ For more assistance on configuring and running your Discourse forum, see [meta.d
|
||||
|
||||
----
|
||||
|
||||
Have suggestions to improve or update this guide? Submit a [pull request](https://github.com/discourse/discourse/blob/master/docs/ADMIN-QUICK-START-GUIDE.md).
|
||||
Have suggestions to improve or update this guide? Submit a [pull request](https://github.com/discourse/discourse/blob/main/docs/ADMIN-QUICK-START-GUIDE.md).
|
||||
|
||||
@@ -152,7 +152,7 @@ Do you want...
|
||||
|
||||
- A Content Delivery Network to speed up worldwide access? [Configure a CDN](https://meta.discourse.org/t/enable-a-cdn-for-your-discourse/14857). We recommend [Fastly](http://www.fastly.com/).
|
||||
|
||||
- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/master/script/import_scripts).
|
||||
- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/main/script/import_scripts).
|
||||
|
||||
- A user friendly [offline page when rebuilding or upgrading?](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
|
||||
|
||||
@@ -165,4 +165,4 @@ Help us improve this guide! Feel free to ask about it on [meta.discourse.org][me
|
||||
[meta]: https://meta.discourse.org
|
||||
[do]: https://www.digitalocean.com/?refcode=5fa48ac82415
|
||||
[put]: http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
|
||||
[mailconfig]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-email.md
|
||||
[mailconfig]: https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md
|
||||
|
||||
@@ -8,7 +8,7 @@ _The pricing information is included as a courtesy, and may be out of date. Disc
|
||||
|
||||
**Please note that in any email provider, you _must_ verify and use the subdomain, e.g. `discourse.example.com`. If you verify the domain only, e.g. `example.com`, mail will not be configured correctly.**
|
||||
|
||||
Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md#edit-discourse-configuration). To change the current email service, run `./discourse-setup` as well (this will bring the forum offline for a few minutes while it gets rebuilt).
|
||||
Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md#edit-discourse-configuration). To change the current email service, run `./discourse-setup` as well (this will bring the forum offline for a few minutes while it gets rebuilt).
|
||||
|
||||
#### [Mailgun][gun] — 5k emails/month on a 3 month trial
|
||||
|
||||
|
||||
@@ -27,8 +27,8 @@ Hosting Rails applications is complicated. Even if you already have Postgres, Re
|
||||
|
||||
## Security
|
||||
|
||||
We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/master/docs/SECURITY.md) for an overview of security measures in Discourse.
|
||||
We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/main/docs/SECURITY.md) for an overview of security measures in Discourse.
|
||||
|
||||
[basic]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md
|
||||
[basic]: https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md
|
||||
[advanced]: https://github.com/discourse/discourse_docker
|
||||
[swap]: https://meta.discourse.org/t/create-a-swapfile-for-your-linux-server/13880
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
If you just want to get some plugins for your Discourse instance, check out [the plugin category](https://meta.discourse.org/c/plugin) at meta. This is the most up to date place for plugin discussion and listing.
|
||||
|
||||
If you want to be safe, use only plugins on this list of [Official Plugins](https://github.com/discourse/discourse/blob/master/lib/plugin/metadata.rb):
|
||||
If you want to be safe, use only plugins on this list of [Official Plugins](https://github.com/discourse/discourse/blob/main/lib/plugin/metadata.rb):
|
||||
|
||||
### Discourse Plugin Tutorials
|
||||
|
||||
@@ -24,4 +24,3 @@ If you want to be safe, use only plugins on this list of [Official Plugins](http
|
||||
- [Manipulating text in the composer](https://meta.discourse.org/t/plugin-tutorial-1-how-to-manipulate-the-text-in-the-composer/10925)
|
||||
|
||||
- [Display plugin outlet locations](https://meta.discourse.org/t/plugin-outlet-locations/29589)
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ There are 3 main scenarios we protect against:
|
||||
|
||||
3. **CSP is on by default** for [all Discourse installations](https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243) as of Discourse 2.2. It can be switched off in the site settings, but it is default on.
|
||||
|
||||
On the server side we run a allowlist based sanitizer, implemented using the [Sanitize gem](https://github.com/rgrove/sanitize). See the [relevant Discourse code](https://github.com/discourse/discourse/blob/master/lib/pretty_text.rb).
|
||||
On the server side we run a allowlist based sanitizer, implemented using the [Sanitize gem](https://github.com/rgrove/sanitize). See the [relevant Discourse code](https://github.com/discourse/discourse/blob/main/lib/pretty_text.rb).
|
||||
|
||||
In addition, titles and all other places where non-admins can enter code are protected either using the Handlebars library or standard Rails XSS protection.
|
||||
|
||||
@@ -53,4 +53,4 @@ If you install via our recommended Docker image in our [install guide][ig], ngin
|
||||
|
||||
We strongly recommend that the various Discourse processes (web server, sidekiq) run under a non-elevated account. This is handled automatically if you install via our recommended Docker image -- see [our install guide][ig] for details.
|
||||
|
||||
[ig]: https://github.com/discourse/discourse/blob/master/docs/INSTALL.md
|
||||
[ig]: https://github.com/discourse/discourse/blob/main/docs/INSTALL.md
|
||||
|
||||
Reference in New Issue
Block a user