Merge pull request #612 from errordeveloper/post-docs-move

Post docs move

README.md

@@ -103,7 +103,7 @@ Note that we could instead have told the weave on `$HOST1` to connect to
 weave automatically (re)connects to peers when they become
 available. Also, we can tell weave to connect to multiple peers by
 supplying multiple addresses, separated by spaces. And we can
-[add peers dynamically](http://weaveworks.github.io/weave/features.html#dynamic-topologies).
+[add peers dynamically](http://docs.weave.works/weave/latest_release/features.html#dynamic-topologies).
 
 Now that we've got everything set up, let's see whether our containers
 can talk to each other...
@@ -131,12 +131,12 @@ to each other.
 
 ## Find out more
 
- * [Documentation homepage](http://weaveworks.github.io/weave/)
- * [Features](http://weaveworks.github.io/weave/features.html)
- * [Troubleshooting](http://weaveworks.github.io/weave/troubleshooting.html)
- * [Building](http://weaveworks.github.io/weave/building.html)
- * [How it works](http://weaveworks.github.io/weave/how-it-works.html)
- * [Automatic Discovery with WeaveDNS](https://github.com/weaveworks/weave/tree/master/weavedns#readme)
+ * [Documentation homepage](http://docs.weave.works/weave/latest_release/)
+ * [Features](http://docs.weave.works/weave/latest_release/features.html)
+ * [Troubleshooting](http://docs.weave.works/weave/latest_release/troubleshooting.html)
+ * [Building](http://docs.weave.works/weave/latest_release/building.html)
+ * [How it works](http://docs.weave.works/weave/latest_release/how-it-works.html)
+ * [Automatic Discovery with WeaveDNS](https://github.com/weaveworks/weave/tree/latest_release/weavedns#readme)
 
 ## Contact Us
 

bin/merge-into-gh-pages

@@ -1,20 +0,0 @@
-#! /bin/bash
-set -e
-
-# For info on why/how to use this script, see
-# https://github.com/weaveworks/weave/wiki/WorkingOnWeave#working-on-docs
-
-MERGE_ARGS="-X subtree=site"
-
-merge_dir=$(mktemp -d -t weave-merge.XXXXXX)/weave
-git clone -b gh-pages . $merge_dir
-
-pushd $merge_dir
-git pull --ff-only git@github.com:weaveworks/weave gh-pages
-git fetch origin master
-git merge $MERGE_ARGS -e -m "Merge master into gh-pages" origin/master
-
-popd
-git fetch $merge_dir gh-pages:gh-pages
-
-# rm -rf $merge_dir

bin/publish-gh-pages

@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-git push git@github.com:weaveworks/weave gh-pages:gh-pages

site/build-and-publish.sh

@@ -13,6 +13,10 @@ if [ -n "${TRAVIS_TAG}" ]; then
   OUTPUT="weave/${TRAVIS_TAG}"
 fi
 
+if [ "${BRANCH}" = "latest_release_doc_updates" ]; then
+  OUTPUT="weave/latest_release"
+fi
+
 export BRANCH COMMIT OUTPUT
 
 bundle install --path=.bundle

site/systemd.md

@@ -15,7 +15,7 @@ normally place it in `/etc/systemd/system/weave.service`.
 
     [Unit]
     Description=Weave Network
-    Documentation=http://weaveworks.github.io/weave/
+    Documentation=http://docs.weave.works/weave/latest_release/
     Requires=docker.service
     After=docker.service
     [Service]
@@ -65,6 +65,6 @@ context with the commands shown below. You will need to have the
     sudo restorecon /usr/local/bin/weave
 
 [readme]: https://github.com/weaveworks/weave/blob/master/README.md#installation
-[connect]: http://weaveworks.github.io/weave/features.html#dynamic-topologies
+[connect]: features.html#dynamic-topologies
 [systemd]: http://www.freedesktop.org/wiki/Software/systemd/
-[encryption]: http://weaveworks.github.io/weave/how-it-works.html#crypto
+[encryption]: how-it-works.html#crypto