Update slack.md

content/pages/slack.md

@@ -1,12 +1,16 @@
 Title: Slack for ASF projects
 
-The Apache Software Network has a workspace on <a href="https://the-asf.slack.com/" target="_blank">Slack</a> to provide channels on which people working on the same ASF project, or in the same area of the Foundation, can discuss issues, solve problems, and build community in real-time.
+The Apache Software Foundation has a workspace on <a href="https://the-asf.slack.com/" target="_blank">Slack</a> to provide channels on which people working on the same ASF project, or in the same area of the Foundation, can discuss issues, solve problems, and build community in real-time.
 
 A thread in a Slack channel can be a great place to work through a knotty question and move toward consensus. **However**, coming to agreement about something on Slack does not mean the PMC has agreed to or approved something. All formal PMC decisions should take place in one of the project's email lists, so we all have an audit trail of who decided what, and when.
 
 ## Joining the ASF Slack workspace ##
 
-Anyone with an `@apache.org` email address can become a full member of the ASF Slack workspace. If you are a commiter in an ASF project, ask someone on the PMC to invite you to Slack if you want to take part in the discussions there. That person will:
+Anyone with an `@apache.org` email address can become a full member of the ASF Slack workspace. Use the link above to log in to `the-asf.slack.com`. You can then browse for the open channels you want to join.
+
+You can also download an app to use on your computer or mobile device.
+
+If you want to invite ASF members who are not on Slack yet to join your project's Slack discussions:
 
   1. In the Slack app, click the "ASF" header at the top left.
   2. Select `Invite people to ASF`
@@ -20,19 +24,27 @@ Other contributors and interested parties (observers, former members, software e
       - Use the`Single channel guests` option and, in the form that appears, provide the email addresses of the people you would like to invite to a specific channel.
   2. Share this URL with a person who wants to take part in the Slack discussions: `https://s.apache.org/slack-invite`. The person who joins in this way becomes a guest member with access to all public channels in the workspace. **Note**: When Slack does an update, this URL occasionally stops functioning as it should. If the potential participant uses it and the submission form asks for an Apache email address, let Infra know so we can update the URL.  
 
+### ASF and Slack 'members' ###
+Both the ASF and Slack use the term 'member', but in different ways.
+
+  - For the Apache Software Foundation:
+      - An <a href="https://www.apache.org/foundation/how-it-works.html#asf-members" target="_blank">ASF Member</a> is a "person who was nominated by current members and elected due to merit for the evolution and progress of the foundation."
+      - A <a href="https://www.apache.org/foundation/how-it-works.html#pmc-members" target="_blank">PMC member</a> is a "developer or a committer that was elected" to the PMC.
+  - For Slack, a "member" is anyone who can participate in discussions on a channel, or a thread within a channel. This includes guest members who might be part of the conversation for a short time, or for a limited purpose, like a journalist writing a review of a particular project and its app.
+
 ## Joining project channels ##
 
 Once you are part of the ASF workspace as a member or a full guest member, you can join any open channels you wish to. 
 
- - At the top of your list of channels in the Slack app, click the **+** icon
+ - At the top of your list of channels in the Slack app, click the **+** icon.
  - Use the _Browse channels_ option to display a list of open channels in the workspace; or enter text in the search field.
  - Select any channel to add it to your channel list.
 
  Some ASF channels are **private** or **locked**, and do not appear on the list of channels you can join. Someone with the appropriate rights has to join you to such a channel.
 
 If you are a single-channel guest, you cannot join other channels.
 
- It is good manners to send a hello message to the channel, possibly with a short statement of why you are there.
+It is good manners to send a hello message to a channel you join, possibly with a short statement of why you are there.
 
 
 ## Setting up a project channel ##
@@ -46,4 +58,4 @@ If you _do_ add a channel for your project, make sure you tell the PMC, committe
 
 ## Expectations ##
 
-We expect channel participants to be respectful and supportive of other participants, and make contributions that add to the conversation, rather than blurring it. If a participant makes contributions that are disrespectful, offensive, or contrary in other ways to The Apache Way, please report them to Infra.
+As with all ASF activities, we expect ASF Members and project participants to conduct themselves according to the ASF <a href="https://www.apache.org/foundation/policies/conduct.html" target="_blank">Code of Conduct</a>. We expect channel participants to be respectful and supportive of other participants, and to make contributions that add to the conversation, rather than blurring it. If a participant makes contributions that are disrespectful, offensive, or contrary in other ways to The Apache Way, please report them to Infra.