Browse code

hack/RELEASE: add step for updating doc branch

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: google)

Johan Euphrosine authored on 2014/02/14 04:42:14
Showing 1 changed files
... ...
@@ -173,9 +173,13 @@ git push origin $VERSION
173 173
 It's very important that we don't make the tag until after the official
174 174
 release is uploaded to get.docker.io!
175 175
 
176
-### 10. Go to github to merge the `bump_$VERSION` into release
176
+### 10. Go to github to merge the `bump_$VERSION` branch into release
177 177
 
178
-Merging the pull request to the release branch will automatically
178
+Don't delete the leftover branch just yet, as we will need it for the next step.
179
+
180
+### 11. Go to github to merge the `bump_$VERSION` branch into docs
181
+
182
+Merging the pull request to the docs branch will automatically
179 183
 update the documentation on the "latest" revision of the docs. You
180 184
 should see the updated docs 5-10 minutes after the merge. The docs
181 185
 will appear on http://docs.docker.io/. For more information about
... ...
@@ -184,7 +188,7 @@ documentation releases, see `docs/README.md`.
184 184
 Don't forget to push that pretty blue button to delete the leftover
185 185
 branch afterwards!
186 186
 
187
-### 11. Create a new pull request to merge release back into master
187
+### 12. Create a new pull request to merge release back into master
188 188
 
189 189
 ```bash
190 190
 git checkout master
... ...
@@ -202,7 +206,7 @@ echo "https://github.com/dotcloud/docker/compare/master...merge_release_$VERSION
202 202
 Again, get two maintainers to validate, then merge, then push that pretty
203 203
 blue button to delete your branch.
204 204
 
205
-### 12. Rejoice and Evangelize!
205
+### 13. Rejoice and Evangelize!
206 206
 
207 207
 Congratulations! You're done.
208 208