summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSankar சங்கர் <sankar.curiosity@gmail.com>2015-05-14 09:15:33 +0530
committerSankar சங்கர் <sankar.curiosity@gmail.com>2015-05-14 11:12:20 +0530
commitcb4d47ddb308b799e622f871e6e866557643c522 (patch)
tree308e8bad7e104b15d4343782f85fb125fd540556
parent1d57642906ced778e826f655aed5a0eaab30fe71 (diff)
downloaddocker-cb4d47ddb308b799e622f871e6e866557643c522.tar.gz
Copied info about google groups, IRC, etc. to README.md from CONTRIBUTORS.md
Signed-off-by: Sankar சங்கர் <sankar.curiosity@gmail.com>
-rw-r--r--CONTRIBUTING.md16
-rw-r--r--README.md53
2 files changed, 55 insertions, 14 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 395f259234..d9068d1d95 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,12 +129,12 @@ However, there might be a way to implement that feature *on top of* Docker.
<col width="45%">
<col width="65%">
<tr>
- <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</th>
+ <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</td>
<td>
<p>
IRC a direct line to our most knowledgeable Docker users; we have
- both the <code>#docker</code> and <code>#docker-dev</code> group on
- <strong>irc.freenode.net</strong>.
+ both the <code>#docker</code> and <code>#docker-dev</code> group on
+ <strong>irc.freenode.net</strong>.
IRC is a rich chat protocol but it can overwhelm new users. You can search
<a href="https://botbot.me/freenode/docker/#" target="_blank">our chat archives</a>.
</p>
@@ -146,9 +146,9 @@ However, there might be a way to implement that feature *on top of* Docker.
<td>
There are two groups.
<a href="https://groups.google.com/forum/#!forum/docker-user" target="_blank">Docker-user</a>
- is for people using Docker containers.
- The <a href="https://groups.google.com/forum/#!forum/docker-dev" target="_blank">docker-dev</a>
- group is for contributors and other people contributing to the Docker
+ is for people using Docker containers.
+ The <a href="https://groups.google.com/forum/#!forum/docker-dev" target="_blank">docker-dev</a>
+ group is for contributors and other people contributing to the Docker
project.
</td>
</tr>
@@ -156,14 +156,14 @@ However, there might be a way to implement that feature *on top of* Docker.
<td>Twitter</td>
<td>
You can follow <a href="https://twitter.com/docker/" target="_blank">Docker's Twitter feed</a>
- to get updates on our products. You can also tweet us questions or just
+ to get updates on our products. You can also tweet us questions or just
share blogs or stories.
</td>
</tr>
<tr>
<td>Stack Overflow</td>
<td>
- Stack Overflow has over 7000K Docker questions listed. We regularly
+ Stack Overflow has over 7000K Docker questions listed. We regularly
monitor <a href="https://stackoverflow.com/search?tab=newest&q=docker" target="_blank">Docker questions</a>
and so do many other knowledgeable Docker users.
</td>
diff --git a/README.md b/README.md
index 4bb249eea0..ad15e56bc5 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,53 @@ or want to get more involved, the best place to start is [the project directory]
We are always open to suggestions on process improvements, and are always looking for more maintainers.
+### Talking to other Docker users and contributors
+
+<table class="tg">
+ <col width="45%">
+ <col width="65%">
+ <tr>
+ <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</td>
+ <td>
+ <p>
+ IRC a direct line to our most knowledgeable Docker users; we have
+ both the <code>#docker</code> and <code>#docker-dev</code> group on
+ <strong>irc.freenode.net</strong>.
+ IRC is a rich chat protocol but it can overwhelm new users. You can search
+ <a href="https://botbot.me/freenode/docker/#" target="_blank">our chat archives</a>.
+ </p>
+ Read our <a href="https://docs.docker.com/project/get-help/#irc-quickstart" target="_blank">IRC quickstart guide</a> for an easy way to get started.
+ </td>
+ </tr>
+ <tr>
+ <td>Google Groups</td>
+ <td>
+ There are two groups.
+ <a href="https://groups.google.com/forum/#!forum/docker-user" target="_blank">Docker-user</a>
+ is for people using Docker containers.
+ The <a href="https://groups.google.com/forum/#!forum/docker-dev" target="_blank">docker-dev</a>
+ group is for contributors and other people contributing to the Docker
+ project.
+ </td>
+ </tr>
+ <tr>
+ <td>Twitter</td>
+ <td>
+ You can follow <a href="https://twitter.com/docker/" target="_blank">Docker's Twitter feed</a>
+ to get updates on our products. You can also tweet us questions or just
+ share blogs or stories.
+ </td>
+ </tr>
+ <tr>
+ <td>Stack Overflow</td>
+ <td>
+ Stack Overflow has over 7000K Docker questions listed. We regularly
+ monitor <a href="https://stackoverflow.com/search?tab=newest&q=docker" target="_blank">Docker questions</a>
+ and so do many other knowledgeable Docker users.
+ </td>
+ </tr>
+</table>
+
### Legal
*Brought to you courtesy of our legal counsel. For more context,
@@ -246,9 +293,3 @@ Docker on a Mac
If you know of another project underway that should be listed here, please help
us keep this list up-to-date by submitting a PR.
-
-Mailing Lists
-=============
-
-* [Google group for Docker Users](https://groups.google.com/forum/#!forum/docker-user)
-* [Google group for Docker development discussions](https://groups.google.com/forum/#!forum/docker-dev)