You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/04/08 11:20:33 UTC
[17/19] incubator-brooklyn git commit: Revert the docs build changes
Revert the docs build changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/29326f9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/29326f9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/29326f9d
Branch: refs/heads/master
Commit: 29326f9d42c324e1b5773c11a15dc338edc1082e
Parents: 29a989c
Author: Valentin Aitken <bo...@gmail.com>
Authored: Sun Mar 29 15:20:55 2015 +0300
Committer: Valentin Aitken <bo...@gmail.com>
Committed: Sun Mar 29 15:21:07 2015 +0300
----------------------------------------------------------------------
docs/_build/build.sh | 4 ++--
docs/_build/config-website-root.yml | 3 +++
docs/_config.yml | 3 +--
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29326f9d/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index 562e531..40f826c 100755
--- a/docs/_build/build.sh
+++ b/docs/_build/build.sh
@@ -43,7 +43,7 @@ function parse_mode() {
help
exit 0 ;;
website-root)
- JEKYLL_CONFIG=_config.yml,_build/config-production.yml,_build/config-exclude-guide.yml
+ JEKYLL_CONFIG=_config.yml,_build/config-production.yml,_build/config-exclude-guide.yml,_build/config-website-root.yml
STYLE_SUBDIR=style
DIRS_TO_MOVE[0]=website
DIRS_TO_MOVE_TARGET[0]=""
@@ -90,7 +90,7 @@ function parse_mode() {
SUMMARY="user guide files in the root"
;;
test-both)
- JEKYLL_CONFIG=_config.yml,_build/config-production.yml,_build/config-exclude-root-index.yml,_build/config-guide-latest.yml
+ JEKYLL_CONFIG=_config.yml,_build/config-production.yml,_build/config-exclude-root-index.yml,_build/config-website-root.yml,_build/config-guide-latest.yml
DIRS_TO_MOVE[0]=guide
DIRS_TO_MOVE_TARGET[0]=v/latest
DIRS_TO_MOVE[1]=website
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29326f9d/docs/_build/config-website-root.yml
----------------------------------------------------------------------
diff --git a/docs/_build/config-website-root.yml b/docs/_build/config-website-root.yml
new file mode 100644
index 0000000..e5e4b07
--- /dev/null
+++ b/docs/_build/config-website-root.yml
@@ -0,0 +1,3 @@
+path:
+ website: ""
+ guide: "/v/latest"
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29326f9d/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 3bc42e9..10a5d5a 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -26,8 +26,7 @@ url_root: http://0.0.0.0:4000
path:
style: /style
guide: /guide
- #guide: "/v/latest"
- website: ""
+ website: /website
v: /v
# Use local copies of dependencies in dev build (switched to remote using URLs for prod build)