Răsfoiți Sursa

Merge pull request #37 from docker/Initial-Commit-working-branch

Updates to wording and resolving some minor conflicts
Justin Graham 5 ani în urmă
părinte
comite
5e17130437
2 a modificat fișierele cu 12 adăugiri și 8 ștergeri
  1. 6 5
      CONTRIBUTING.MD
  2. 6 3
      README.md

+ 6 - 5
CONTRIBUTING.MD

@@ -1,18 +1,18 @@
 # Contributing Guidelines
 # Contributing Guidelines
 
 
-We hope you are enjoying Docker and look forward to hearing your feedback. Whether you want to raise a bug report, a feature request or just request a correction to something we really value our community input.
+We hope you are enjoying Docker and look forward to hearing your feedback. Whether you want to raise a bug report, a feature request or just request a correction to something, we really value our community input.
 
 
-We do ask though that you read all of this document you send us any issues or raise pull requests to make sure we understand clearly what you are asking for, this helps us make sure we are making the right decisions and taking the right actions.  
+We do ask that you read this document and send us any issues or raise pull requests to make sure we understand clearly what you are asking for. This will help ensure we are making the right decisions and taking the right actions.
 
 
 ## Feature Requests
 ## Feature Requests
 
 
 You are very welcome to create new issues on this project to request new features in any of Docker products.
 You are very welcome to create new issues on this project to request new features in any of Docker products.
 
 
-If you would like to suggest a new feature we ask that you please use our issue template. This contains a few essential questions that help us understand the problem you are looking to solve and how you think your reocommendation will address it. We alsotag incoming issues from this template with "community_new".  This lets our teams quickly see what has been raised and better find our community recommendations
+If you would like to suggest a new feature, we ask that you please use our issue template. This contains a few essential questions that help us understand the problem you are looking to solve and how you think your recommendation will address it. We also tag incoming issues from this template with "community_new". This lets our teams quickly see what has been raised and better address the community recommendations.
 
 
 To see what has already been proposed by the community you can look [here](https://github.com/docker/docker-roadmap/labels/community_new).
 To see what has already been proposed by the community you can look [here](https://github.com/docker/docker-roadmap/labels/community_new).
 
 
-Watch our for duplicates! If you are creating a new issue, please check [existing open](https://github.com/docker/docker-roadmap/issues), or [recently closed](https://github.com/docker/docker-roadmap/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20) . Having a single voted for issue is far easier for us to prioritize 
+"Watch out for duplicates!" If you are creating a new issue, please check [existing open](https://github.com/docker/docker-roadmap/issues), or [recently closed](https://github.com/docker/docker-roadmap/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20) . Having a single voted for issue is far easier for us to prioritize 
 
 
 ## Reporting Bugs
 ## Reporting Bugs
 
 
@@ -23,12 +23,13 @@ To raise a bug please use:
 * [Docker Desktop Windows](https://github.com/docker/for-win/issues/new)
 * [Docker Desktop Windows](https://github.com/docker/for-win/issues/new)
 * [Docker Desktop Mac](https://github.com/docker/for-mac/issues/new)
 * [Docker Desktop Mac](https://github.com/docker/for-mac/issues/new)
 * [Docker Engine](https://github.com/moby/moby/issues/new)
 * [Docker Engine](https://github.com/moby/moby/issues/new)
+* [docker-compose](https://github.com/docker/compose/issues)
 
 
 
 
 
 
 ## Security issue notifications
 ## Security issue notifications
 Please do **not** create a public github issue.
 Please do **not** create a public github issue.
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](). Please do **not** create a public github issue.
+If you discover a potential security issue in this project we ask that you notify Docker Security send your report privately to security@docker.com. Please do **not** create a public github issue.
 
 
 
 
 ## Licensing
 ## Licensing

+ 6 - 3
README.md

@@ -16,9 +16,10 @@ For users of Docker Desktop we provide early access to new features through our
 
 
 Issues tagged In Preview for Docker Desktop on the public roadmap are available in the Edge Channel. 
 Issues tagged In Preview for Docker Desktop on the public roadmap are available in the Edge Channel. 
 
 
-For Docker Engine we have a release candidate program that allows users to get early access to versions of Docker engine with new features and changes. Issues tagged In Preview for Docker Engine on the public roadmap are available in the RC version of Engine. 
+For Docker Engine and docker-compose we have a release candidate program that allows users to get early access to versions of Docker engine & docker-compose with new features and changes. Issues tagged In Preview for Docker Engine & docker-compose on the public roadmap are available in the RC versions of each product.
+
+Note: depending on release timings Docker Desktop may have the RC engine and/or docker-compose, please check the release notes for Docker Desktop to verify the current version in Edge 
 
 
-Note: depending on release timings Docker Desktop may have the RC engine, please check the release notes for Docker Desktop to verify the current version in Edge 
 
 
 **Current Programs**
 **Current Programs**
 
 
@@ -26,7 +27,9 @@ Note: depending on release timings Docker Desktop may have the RC engine, please
 
 
 [Mac Edge Channel >>](https://docs.docker.com/docker-for-mac/edge-release-notes/)
 [Mac Edge Channel >>](https://docs.docker.com/docker-for-mac/edge-release-notes/)
 
 
-Docker Engine RCs
+[Engine Release Channel >>](https://github.com/moby/moby/releases)
+
+[docker-compose Release Channel >>](https://github.com/docker/compose/releases)
 
 
 **Past Programs**
 **Past Programs**
 Docker Desktop WSL 2 Tech preview - outside of bounds early technical POC of using WSL 2 as the backend for Docker Desktop
 Docker Desktop WSL 2 Tech preview - outside of bounds early technical POC of using WSL 2 as the backend for Docker Desktop