Explorar o código

Merge pull request #13119 from psankar/master

Followup commit to https://github.com/docker/docker/pull/12986
Fred Lifton %!s(int64=10) %!d(string=hai) anos
pai
achega
4a743c39dd
Modificáronse 2 ficheiros con 55 adicións e 14 borrados
  1. 8 8
      CONTRIBUTING.md
  2. 47 6
      README.md

+ 8 - 8
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="45%">
   <col width="65%">
   <col width="65%">
   <tr>
   <tr>
-    <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</th>
+    <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</td>
     <td>
     <td>
       <p>
       <p>
         IRC a direct line to our most knowledgeable Docker users; we have
         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
         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>.
         <a href="https://botbot.me/freenode/docker/#" target="_blank">our chat archives</a>.
       </p>
       </p>
@@ -146,9 +146,9 @@ However, there might be a way to implement that feature *on top of* Docker.
     <td>
     <td>
       There are two groups.
       There are two groups.
       <a href="https://groups.google.com/forum/#!forum/docker-user" target="_blank">Docker-user</a>
       <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.
       project.
     </td>
     </td>
   </tr>
   </tr>
@@ -156,14 +156,14 @@ However, there might be a way to implement that feature *on top of* Docker.
     <td>Twitter</td>
     <td>Twitter</td>
     <td>
     <td>
       You can follow <a href="https://twitter.com/docker/" target="_blank">Docker's Twitter feed</a>
       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.
       share blogs or stories.
     </td>
     </td>
   </tr>
   </tr>
   <tr>
   <tr>
     <td>Stack Overflow</td>
     <td>Stack Overflow</td>
     <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>
       monitor <a href="https://stackoverflow.com/search?tab=newest&q=docker" target="_blank">Docker questions</a>
       and so do many other knowledgeable Docker users.
       and so do many other knowledgeable Docker users.
     </td>
     </td>

+ 47 - 6
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.
 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
 ### Legal
 
 
 *Brought to you courtesy of our legal counsel. For more context,
 *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 
 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.
 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)