Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated contribution policy

  • Loading branch information...
commit 3dff9d666e728e65762b55e15dbb429e4f6546ba 1 parent 32173a2
@hintjens hintjens authored
Showing with 8 additions and 16 deletions.
  1. +6 −10 README.md
  2. +2 −6 README.txt
  3. BIN  images/README_1.png
View
16 README.md
@@ -19,8 +19,8 @@ Contents
&emsp;<a href="#toc2-46">Thanks</a>
&emsp;<a href="#toc2-52">General</a>
&emsp;<a href="#toc2-60">Examples</a>
-&emsp;<a href="#toc2-74">Guidelines</a>
-&emsp;<a href="#toc2-86">Build Process</a>
+&emsp;<a href="#toc2-70">Guidelines</a>
+&emsp;<a href="#toc2-82">Build Process</a>
<A name="toc2-40" title="License" />
License
@@ -48,15 +48,11 @@ Examples
The examples from the Guide help people to learn and use ØMQ. While we wrote most of the examples in C, we welcome translations into other languages. All example code is licensed under MIT/X11.
-Please send your translations, and fixes as patches to the zeromq-dev list with the subject line "[PATCH] zguide: <filename>". We'll review the code and add it to the zguide repository if it's ok.
+Languages with a 100% translation of examples get their own version of the Guide. So far, only the PHP community have managed this. To send us a translation, please clone this git and make a pull request, following the process explained here: http://www.zeromq.org/docs:contributing.
-Patches are the way we accept contributions. It ensures that more than one person can work on code at the same time.
+If you don't want to use git, you can email us entire examples but only if the code was empty before. If you want to update or change an example you MUST use git pull requests.
-The best way to submit patches is to clone this repository, make your changes, and use git to create a patch. See http://www.zeromq.org/docs:contributing.
-
-If you don't want to use git, you can send us entire examples but only if the code was empty before. If you want to update or change an example you MUST use git patches.
-
-<A name="toc2-74" title="Guidelines" />
+<A name="toc2-70" title="Guidelines" />
Guidelines
----------
@@ -68,7 +64,7 @@ Please:
Thanks!
-<A name="toc2-86" title="Build Process" />
+<A name="toc2-82" title="Build Process" />
Build Process
-------------
View
8 README.txt
@@ -57,13 +57,9 @@ Examples
The examples from the Guide help people to learn and use 0MQ. While we wrote most of the examples in C, we welcome translations into other languages. All example code is licensed under MIT/X11.
-Please send your translations, and fixes as patches to the zeromq-dev list with the subject line "[PATCH] zguide: <filename>". We'll review the code and add it to the zguide repository if it's ok.
+Languages with a 100% translation of examples get their own version of the Guide. So far, only the PHP community have managed this. To send us a translation, please clone this git and make a pull request, following the process explained here: http://www.zeromq.org/docs:contributing.
-Patches are the way we accept contributions. It ensures that more than one person can work on code at the same time.
-
-The best way to submit patches is to clone this repository, make your changes, and use git to create a patch. See http://www.zeromq.org/docs:contributing.
-
-If you don't want to use git, you can send us entire examples but only if the code was empty before. If you want to update or change an example you MUST use git patches.
+If you don't want to use git, you can email us entire examples but only if the code was empty before. If you want to update or change an example you MUST use git pull requests.
Guidelines
----------
View
BIN  images/README_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.