Merge branch 'master' into production
diff --git a/.asf.yaml b/.asf.yaml
index c7673d6..10503e4 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,9 +1,8 @@
pelican:
- whoami: master
- target: asf-staging
-
-staging:
- whoami: asf-staging
+ whoami: production
+ target: asf-site
+publish:
+ whoami: asf-site
github:
labels:
diff --git a/content/pages/core/discussion.md b/content/pages/core/discussion.md
index 532e6c7..ef8fe53 100644
--- a/content/pages/core/discussion.md
+++ b/content/pages/core/discussion.md
@@ -86,7 +86,11 @@
## Slack
-The project's Slack channel is the **#lucene-dev** channel in the **the-asf** organization. Link: <https://the-asf.slack.com/messages/CE70MDPMF>
+* The project's Slack channel are the `#lucene-dev` and `#solr-dev` channels in the `the-asf` organization. These are primarily for developer discussions and not meant as support channels. Link: <https://the-asf.slack.com/messages/CE70MDPMF>
+
+* There are unofficial slack organizations for Solr support
+ * A community maintained/unofficial Slack organization that relays messages bi-directionally to/from the official IRC channels. Link: https://s.apache.org/solr-slack
+ * For relevance related discussions (Solr or other search engines), there's Relevance Slack: https://opensourceconnections.com/slack
## Mail Archives
