From 249e6d1217177d0dbef453402f42b6a3ee40a178 Mon Sep 17 00:00:00 2001
From: Daniel Kummer <daniel.kummer@namics.com>
Date: Fri, 17 Aug 2012 08:40:14 +0200
Subject: [PATCH] update cheatsheet text and reorder release publish step

---
 css/style.css |  1 -
 index.html    | 26 ++++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/css/style.css b/css/style.css
index 653062b..1baeef2 100644
--- a/css/style.css
+++ b/css/style.css
@@ -58,7 +58,6 @@ h3 {
 }
 
 p {
-    width: 95%;
     margin: 20px auto;
     text-shadow: 0 2px 1px #fff;
     color: #222438;
diff --git a/index.html b/index.html
index 34b7223..c2f2ff9 100644
--- a/index.html
+++ b/index.html
@@ -149,7 +149,7 @@
         <p>Development of new features starting from the 'develop' branch.</p>
         <p>Start developing a new feature with</p>
         <blockquote>
-            git-flow feature start MYFEATURE
+            git flow feature start MYFEATURE
         </blockquote>
         <p>This action creates a new feature branch based on 'develop' and switches to it</p>
 
@@ -184,7 +184,7 @@
         </ul>
 
         <blockquote>
-            git-flow feature finish MYFEATURE
+            git flow feature finish MYFEATURE
         </blockquote>
     </div>
     <div class="col-2">
@@ -202,7 +202,7 @@
         </p>
 
         <blockquote>
-            git-flow feature publish MYFEATURE
+            git flow feature publish MYFEATURE
         </blockquote>
     </div>
     <div class="col-2">
@@ -219,7 +219,7 @@
         </p>
 
         <blockquote>
-            git-flow feature pull MYFEATURE
+            git flow feature pull MYFEATURE
         </blockquote>
     </div>
     <div class="col-2">
@@ -248,6 +248,12 @@
         <p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
             be on the
             'develop' branch.</p>
+        <p class="divider">&#9733; &#9733; &#9733;</p>
+        <p>It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:</p>
+        <blockquote>
+            git flow release publish RELEASE
+        </blockquote>
+        <p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
     </div>
     <div class="col-2">
         <div class="release-start"></div>
@@ -268,13 +274,6 @@
         <blockquote>
             git flow release finish RELEASE
         </blockquote>
-
-        <p>It's wise to publish a finished release after finishing it. Do it similar to feature publishing with the
-            command:</p>
-        <blockquote>
-            git flow release publish RELEASE
-        </blockquote>
-        <p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
     </div>
     <div class="col-2">
         <div class="release-end"></div>
@@ -309,7 +308,10 @@
     <div class="col-1">
         <h3>Finish a hotfix</h3>
 
-        <p>By finishing a hotfix it gets merged back into develp and master. Additionally the master merge ist tagged.</p>
+        <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge ist tagged.</p>
+        <blockquote>
+            git flow hotfix finish RELEASE
+        </blockquote>
     </div>
     <div class="col-2">
         <div class="hotfix-end"></div>