From 366adfb8f939f9a559f0fe0f4f7aab57319efb5c Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 13 May 2015 08:34:17 +0100 Subject: [PATCH 1/4] Move WeaveDNS docs to docs.weave.works (close #471) --- site/index.md | 3 +++ weavedns/design.md => site/weavedns-design.md | 0 weavedns/README.md => site/weavedns-readme.md | 0 3 files changed, 3 insertions(+) rename weavedns/design.md => site/weavedns-design.md (100%) rename weavedns/README.md => site/weavedns-readme.md (100%) diff --git a/site/index.md b/site/index.md index 544f341d..f58f1b9f 100644 --- a/site/index.md +++ b/site/index.md @@ -10,6 +10,9 @@ layout: default * [Troubleshooting](troubleshooting.html) * [Building](building.html) * [How it works](how-it-works.html) + * *WeaveDNS* + * [User guide](weavedns-readme.html) + * [Design notes](weavedns-design.html) * [Contact information](https://github.com/weaveworks/weave#contact-us) * *Installation Notes* * [Using with boot2docker](boot2docker.html) diff --git a/weavedns/design.md b/site/weavedns-design.md similarity index 100% rename from weavedns/design.md rename to site/weavedns-design.md diff --git a/weavedns/README.md b/site/weavedns-readme.md similarity index 100% rename from weavedns/README.md rename to site/weavedns-readme.md From 2199c5c2735c6f9459b5ffd614038701385071fe Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 13 May 2015 10:36:22 +0100 Subject: [PATCH 2/4] Add Jekyll "frontmatter", it does not build it otherwise --- site/weavedns-design.md | 5 +++++ site/weavedns-readme.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/site/weavedns-design.md b/site/weavedns-design.md index 67c44214..5c09afc3 100644 --- a/site/weavedns-design.md +++ b/site/weavedns-design.md @@ -1,3 +1,8 @@ +--- +title: WeaveDNS Design Notes +layout: default +--- + # Weave DNS (service discovery) design The model is that each host has a service that is notified of diff --git a/site/weavedns-readme.md b/site/weavedns-readme.md index 70898077..852cfbf1 100644 --- a/site/weavedns-readme.md +++ b/site/weavedns-readme.md @@ -1,3 +1,8 @@ +--- +title: WeaveDNS User Guide +layout: default +--- + # Weave DNS server The Weave DNS server answers name queries in a Weave network. This From ca4d813b71c4d327f5dc70fce9b193e077582bf8 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 13 May 2015 12:47:43 +0100 Subject: [PATCH 3/4] Cleanup documentation index, add getting started guides --- site/index.md | 10 +++------- site/weavedns-readme.md | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/site/index.md b/site/index.md index f58f1b9f..bcf85121 100644 --- a/site/index.md +++ b/site/index.md @@ -5,15 +5,11 @@ layout: default # weave documentation - * [Introduction and example (in README)](https://github.com/weaveworks/weave#readme) + * [Introduction, Installation and Example](https://github.com/weaveworks/weave#readme) + * [Getting Started Guides](http://weave.works/guides/) * [Features](features.html) + * [Automatic Discovery with WeaveDNS](weavedns-readme.html) * [Troubleshooting](troubleshooting.html) * [Building](building.html) * [How it works](how-it-works.html) - * *WeaveDNS* - * [User guide](weavedns-readme.html) - * [Design notes](weavedns-design.html) * [Contact information](https://github.com/weaveworks/weave#contact-us) - * *Installation Notes* - * [Using with boot2docker](boot2docker.html) - * [Using with systemd](systemd.html) diff --git a/site/weavedns-readme.md b/site/weavedns-readme.md index 852cfbf1..cec6a961 100644 --- a/site/weavedns-readme.md +++ b/site/weavedns-readme.md @@ -1,5 +1,5 @@ --- -title: WeaveDNS User Guide +title: Automatic Discovery with WeaveDNS layout: default --- From d63a9785bd5ee932aef1970cd30d5070b7fa2071 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 13 May 2015 13:59:41 +0100 Subject: [PATCH 4/4] Point to new location for WeaveDNS docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21cb585a..abf40ef1 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/latest_release/weavedns#readme) + * [Automatic Discovery with WeaveDNS](http://docs.weave.works/weave/latest_release/weavedns-readme.html) ## Contact Us