From edf4afcbeb3511452fe4835f2bcffe8110055b82 Mon Sep 17 00:00:00 2001 From: Chris Patterson Date: Mon, 1 Feb 2021 10:51:53 -0500 Subject: [PATCH] Revert "Merge branch 'main' of https://github.com/distribution/distribution into main" This reverts commit 1100e30e1c99e11de64ab93737f6f97be48d525c, reversing changes made to b659eb060f7734e2b78a2cec91f5b3e62ace2006. Signed-off-by: Chris Patterson --- CONTRIBUTING.md | 5 ++--- README.md | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9afa9fb59..c4f40ecf7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,9 +17,8 @@ - can't figure out something - are not sure what's going on or what your problem is -Please ask first in the `#distribution` channel on Cloud Native Computing -Foundation's (CNCF) slack - `cloud-native.slack.com`. -[Get Invite to CNCF slack.](https://slack.cncf.io) +Please ask first in the #distribution channel on Docker community slack. +[Click here for an invite to Docker community slack](https://dockr.ly/slack) ### Reporting security issues diff --git a/README.md b/README.md index 9978d3dfa..ce0e08cd9 100644 --- a/README.md +++ b/README.md @@ -75,13 +75,13 @@ the instructions for [building a development environment](BUILDING.md). ## Communication -For async communication and long running discussions please use issues and pull -requests on the GitHub repo. This will be the best place to discuss design and -implementation. +For async communication and long running discussions please use issues and pull requests on the github repo. +This will be the best place to discuss design and implementation. -For sync communication catch us in the `#distribution` slack channels on Cloud -Native Computing Foundation's (CNCF) slack - `cloud-native.slack.com`. Everyone -is welcome to join and chat about development. [Get Invite to CNCF slack.](https://slack.cncf.io) +For sync communication we have a community slack with a #distribution channel that everyone is welcome to join and chat about development. + +**Slack:** Catch us in the #distribution channels on dockercommunity.slack.com. +[Click here for an invite to Docker community slack.](https://dockr.ly/slack) ## Licenses