Merge branch 'master' of github.com:ukko/phpredis-phpdoc

Author: ukko

README.markdown

@@ -21,9 +21,18 @@ Do not forget to declare a variable type $ redis
 
 ### Install
 
- * Install redis-server
+ * Install [redis-server](http://redis.io/download)
  * Install [phpredis extension](https://github.com/nicolasff/phpredis)
- * Download [phpredis-phpdoc](https://github.com/ukko/phpredis-phpdoc/tarball/master)
+ * The simpliest way to install and use redisphp-phpdoc is to use Composer, as there is a package on Packagist. Just add this to your project composer.json file :
+
+    {
+        "require": {
+            "ukko/redisphp-phpdoc": "*"
+        },
+        "minimum-stability": "dev"
+    }
+
+ * Or direct download [phpredis-phpdoc](https://github.com/ukko/phpredis-phpdoc/tarball/master)
 
 ### Setup in IDE PhpStorm
 
@@ -38,5 +47,11 @@ Do not forget to declare a variable type $ redis
  * Click "Open"
  * Click "OK"
 
-### Setup in IDE Eclipse PDT
+### Setup in Zend Studio IDE (Eclipse PDT)
+
+ * Open "Window" -> "Preferences"
+ * In preferences dialog open "PHP" -> "PHP Libriaries"
+ * Click "New" button, in "User library name" enter "Redis", click "OK"
+ * Select newly created "Redis", library Click "Add external folder", select path to the folder which contains your checkout of phpredis-phpdoc or you can download single "Redis.php" file https://raw.github.com/ukko/phpredis-phpdoc/master/src/Redis.php
+ * Include your custom library in your project: open "Project" -> "Properties" -> "PHP Include Path", click add library, select "User library", click "Next", check "Redis", click "Finish"
 

composer.json

@@ -16,8 +16,7 @@
     "require":{
         "php":">=5.3.0"
     },
-    "version": "2.6.0-dev",
-    "minimum-stability": "dev",
+    "version": "2.6.0",
     "autoload": {
         "psr-0": {
             "phpredis-phpdoc": "src/"