From 42a7752874bc5ac1da82229d815cfd9e0a9853f4 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandro.alonso@kaleidos.net>
Date: Tue, 4 Nov 2014 09:52:20 +0100
Subject: [PATCH] Updating github integration doc

---
 app/partials/admin-third-parties-github.jade | 31 +++++++++++++-------
 gulpfile.coffee                              |  2 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/partials/admin-third-parties-github.jade b/app/partials/admin-third-parties-github.jade
index f2d255a5..1fe70404 100644
--- a/app/partials/admin-third-parties-github.jade
+++ b/app/partials/admin-third-parties-github.jade
@@ -37,7 +37,9 @@ block content
                 h3 Configure Taiga
                 ol
                    li Fill
-                       span  Secret key.
+                       span  Secret key
+                       |  or use the auto generated one
+
                    li Copy the
                        span  Payload URL field.
 
@@ -57,32 +59,39 @@ block content
                     li Secret must be filled with the same content as the secret field of this screen.
                     li Content type must be
                         span  application/json.
-                    li You must check
-                        span  "Send me everything".
+                    li Taiga currently listen for three different kind of events:
+                        ol
+                            li Push events: changing element status via commit message
+                            li Issues: issues created in github appear automatically in Taiga
+                            li Issue comment: issue comments created in github appear automatically in Taiga
+
+                        p Just check "send me everything" or just the events you want Taiga to listen for.
 
                 .img
                     .alt-image Github Webhooke page
                     img(src="/images/github-help.png", alt="webhook")
 
-                h3 Commit message
+                h2 Changing elements status via commit message
 
-                p The commits message must have this command.
+                p
+                    | The status of any issue, task or user story can be changed via commit message.
+                    | Just add to your commit message something like:
 
                 code
                     | TG-REF #STATUS
 
                 ul.code-info
                     li
-                        span REF
-                        |  US/Issue/Task reference
+                        span REF:
+                        |  US/Issue/Task reference of the element you want to modify
                     li
-                        span STATUS
-                        |  Status slug, you can get the status slug in
+                        span STATUS:
+                        |  New status slug to set, you can find all of them in:
                         a(href="", tg-nav="project-admin-project-values-us-status:project=project.slug")  US STATUSES.
 
-                h3 Example
+                h3 An example please!
 
                 code
                     | TG-123 #closed
 
-                p In this example, 123 is an issue and with this command, the issue will change its status to closed.
+                p In this example, 123 is an issue reference and with this command, the issue will change its status to closed.
diff --git a/gulpfile.coffee b/gulpfile.coffee
index 85d7788b..caacb07a 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -303,7 +303,7 @@ gulp.task "express", ->
         # Just send the index.html for other files to support HTML5Mode
         res.sendFile("index.html", {root: "#{__dirname}/dist/"})
 
-    app.listen(9001)
+    app.listen(9011)
 
 # Rerun the task when a file changes
 gulp.task "watch", ->