brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [32/36] incubator-brooklyn git commit: Cherry-pick merge of PR #404 into 0.7.0-M2-incubating-docs branch
Date Fri, 09 Jan 2015 15:39:14 GMT
Cherry-pick merge of PR #404 into 0.7.0-M2-incubating-docs branch


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f10daa7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f10daa7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f10daa7f

Branch: refs/heads/0.7.0-M2-incubating-docs
Commit: f10daa7f9854dbd99e3811437b41dfbd4d21f8d2
Parents: 201818b
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Dec 17 19:48:53 2014 +0000
Committer: Richard Downer <richard@apache.org>
Committed: Tue Dec 23 13:48:52 2014 +0000

----------------------------------------------------------------------
 docs/README.md                  | 9 +++++++--
 docs/_layouts/guide-normal.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f10daa7f/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 6293eec..caaea02 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -206,11 +206,16 @@ 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`!). 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'
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f10daa7f/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">


Mime
View raw message