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 2014/12/17 20:49:03 UTC
[1/3] incubator-brooklyn git commit: a few minor doc tweaks
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master d4cb22d10 -> 0faf4d942
a few minor doc tweaks
fix link to website from guide, and mention svn commands
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2b19dd27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2b19dd27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2b19dd27
Branch: refs/heads/master
Commit: 2b19dd27bea6eee19c5bcb0fcf4e216e52b4b0f3
Parents: d4cb22d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 17 19:33:35 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 17 19:33:35 2014 +0000
----------------------------------------------------------------------
docs/README.md | 6 +++++-
docs/_layouts/guide-normal.html | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b19dd27/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 6293eec..2b45a54 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -206,9 +206,13 @@ You can then preview the public site of [localhost:4000](http://localhost:4000)
_build/serve-public-site.sh
Next it is recommended to go to the SVN dir and
-review the changes using the usual `svn` commands -- `status`, `diff`, `add`, `rm`, etc:
+review the changes using the usual `svn` commands -- `status`, `diff`, `add`, `rm`, etc.
+Note in particular that deleted files need special attention (there is no analogue of
+`git add -A`!). Perhaps use:
cd ${BROOKLYN_SITE_DIR-../../incubator-brooklyn-site-public}
+ svn add * --force
+ svn rm $( svn status | sed -e '/^!/!d' -e 's/^!//' )
You must then check in the changes:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b19dd27/docs/_layouts/guide-normal.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-normal.html b/docs/_layouts/guide-normal.html
index 4e676ad..8633bbc 100644
--- a/docs/_layouts/guide-normal.html
+++ b/docs/_layouts/guide-normal.html
@@ -187,7 +187,7 @@ console.log("setting text to "+txt);
<div id="header">
<div id="identity">
- <a href="{{ site.path.website }}" rel="home">Brooklyn</a>
+ <a href="{{ site.path.website }}/">Brooklyn</a>
</div>
<ul id="quicklinks">
[2/3] incubator-brooklyn git commit: warning about deleting docs
Posted by he...@apache.org.
warning about deleting docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/37bd0c9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/37bd0c9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/37bd0c9f
Branch: refs/heads/master
Commit: 37bd0c9f9a9be51f575b8c001dae75f8f8850a43
Parents: 2b19dd2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 17 19:48:27 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 17 19:48:27 2014 +0000
----------------------------------------------------------------------
docs/README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/37bd0c9f/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 2b45a54..caaea02 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -208,13 +208,14 @@ You can then preview the public site of [localhost:4000](http://localhost:4000)
Next it is recommended to go to the SVN dir and
review the changes using the usual `svn` commands -- `status`, `diff`, `add`, `rm`, etc.
Note in particular that deleted files need special attention (there is no analogue of
-`git add -A`!). Perhaps use:
+`git add -A`!). Look at deletions carefully, to try to avoid breaking links, but once
+you've done that these commands might be useful:
cd ${BROOKLYN_SITE_DIR-../../incubator-brooklyn-site-public}
svn add * --force
svn rm $( svn status | sed -e '/^!/!d' -e 's/^!//' )
-You must then check in the changes:
+Then check in the changes (probably picking a better message than shown here):
svn ci -m 'Update Brooklyn website'
[3/3] incubator-brooklyn git commit: This closes #404
Posted by he...@apache.org.
This closes #404
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0faf4d94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0faf4d94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0faf4d94
Branch: refs/heads/master
Commit: 0faf4d9424b342f2ec1ce4818be8816547714577
Parents: d4cb22d 37bd0c9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 17 19:48:53 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 17 19:48:53 2014 +0000
----------------------------------------------------------------------
docs/README.md | 9 +++++++--
docs/_layouts/guide-normal.html | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------