From a3164db1bfb77ac5f09d4883ed511de65cde2977 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Tue, 28 Apr 2015 10:54:11 +0100 Subject: [PATCH 1/4] Remove scripts for publishing to gh-pages --- bin/merge-into-gh-pages | 20 -------------------- bin/publish-gh-pages | 3 --- 2 files changed, 23 deletions(-) delete mode 100755 bin/merge-into-gh-pages delete mode 100755 bin/publish-gh-pages diff --git a/bin/merge-into-gh-pages b/bin/merge-into-gh-pages deleted file mode 100755 index 810fd3fd..00000000 --- a/bin/merge-into-gh-pages +++ /dev/null @@ -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 diff --git a/bin/publish-gh-pages b/bin/publish-gh-pages deleted file mode 100755 index 95622740..00000000 --- a/bin/publish-gh-pages +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -e -git push git@github.com:weaveworks/weave gh-pages:gh-pages From b16d4dff5e1216386ef4570a7c5d4a2e0a823870 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Tue, 28 Apr 2015 10:56:03 +0100 Subject: [PATCH 2/4] Update documentation URLs --- README.md | 12 ++++++------ site/systemd.md | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2f218727..3ca29836 100644 --- a/README.md +++ b/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,11 +131,11 @@ 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) + * [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/master/weavedns#readme) ## Contact Us diff --git a/site/systemd.md b/site/systemd.md index 3525fe55..95d4c758 100644 --- a/site/systemd.md +++ b/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 From c9bff8b5a7900122c394a1f983e28996046ebf22 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 6 May 2015 16:43:28 +0100 Subject: [PATCH 3/4] Publishing updates to the docs on latest release This uses a special branch `latest_release_doc_updates`, as don't require docs to be updated in retrospect for releases other then the latest. --- site/build-and-publish.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/build-and-publish.sh b/site/build-and-publish.sh index 2f86e9d4..dadcee22 100755 --- a/site/build-and-publish.sh +++ b/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 From 2daf805e9594360e79722f3426f63c9f0a726ac9 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Fri, 8 May 2015 11:16:35 +0100 Subject: [PATCH 4/4] Point to released docs for WeaveDNS --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ca29836..21cb585a 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ to each other. * [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/master/weavedns#readme) + * [Automatic Discovery with WeaveDNS](https://github.com/weaveworks/weave/tree/latest_release/weavedns#readme) ## Contact Us