Permalink
Browse files

Merge branch 'master' of github.com:imatix/zguide into chapter4-wip

  • Loading branch information...
2 parents d1dd557 + e934771 commit 3617ac1395bec94a1ac8ef5bb48470c3ac430ead @hintjens hintjens committed Mar 2, 2011
Showing with 10 additions and 18 deletions.
  1. +7 −11 README.md
  2. +3 −7 README.txt
  3. BIN images/README_1.png
View
@@ -8,7 +8,7 @@ Written by Pieter Hintjens <ph@imatix.com>, CEO iMatix Corporation.
A ØMQ socket is what you get when you take a normal TCP socket, inject it with a mix of radioactive isotopes stolen from a secret Soviet atomic research project, bombard it with 1950-era cosmic rays, and put it into the hands of a drug-addled comic book author with a badly-disguised fetish for bulging muscles clad in spandex. Yes, ØMQ sockets are the world-saving superheros of the networking world.
<center>
-<img src="http://github.com/imatix/zguide/raw/master/images/README_1.png" alt="1">
+<img src="https://github.com/imatix/zguide/raw/master/images/README_1.png" alt="1">
</center>
<A name="toc2-34" title="Contents" />
@@ -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
@@ -1,4 +1,4 @@
-.set GIT=http://github.com/imatix/zguide
+.set GIT=https://github.com/imatix/zguide
.sub 0MQ=ØMQ
0MQ - The Guide
@@ -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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3617ac1

Please sign in to comment.