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 2016/02/02 02:41:36 UTC
svn commit: r1728032 - in /brooklyn/site/v/0.9.0-SNAPSHOT:
dev/code/index.html misc/javadoc/overview-summary.html
Author: heneveld
Date: Tue Feb 2 01:41:36 2016
New Revision: 1728032
URL: http://svn.apache.org/viewvc?rev=1728032&view=rev
Log:
Update Brooklyn website with minor tweak to submodule command alternative
Modified:
brooklyn/site/v/0.9.0-SNAPSHOT/dev/code/index.html
brooklyn/site/v/0.9.0-SNAPSHOT/misc/javadoc/overview-summary.html
Modified: brooklyn/site/v/0.9.0-SNAPSHOT/dev/code/index.html
URL: http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0-SNAPSHOT/dev/code/index.html?rev=1728032&r1=1728031&r2=1728032&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0-SNAPSHOT/dev/code/index.html (original)
+++ brooklyn/site/v/0.9.0-SNAPSHOT/dev/code/index.html Tue Feb 2 01:41:36 2016
@@ -393,9 +393,7 @@ Some options which may be useful:</p>
<ul>
<li>Use <code>--depth 1</code> with <code>git clone</code> to skip the history (much faster but your <code>git log</code> will be incomplete)</li>
<li>Use <code>-DskipTests</code> with <code>mvn</code> to skip tests (again much faster but it wonât catch failures)</li>
- <li>Drop <code>--recursive</code> on the <code>git clone</code> and set up some submodules manually
-(e.g. with <code>git submodule init && git submodule update --remote [module]</code>)
-or avoid submodules, following the directions below</li>
+ <li>See below if you donât want to use submodules</li>
</ul>
<p>Thereafter to update the code in submodules, we strongly recommend doing this:</p>
@@ -407,7 +405,8 @@ or avoid submodules, following the direc
giving nice errors on conflicts.
Itâs fine also to do branching and pulling in each submodule,
but running <code>update</code> without these parameters can cause chaos!
-This chaos â and a <code>git sup</code> alias for this command â are described in the <a href="submodules.html">submodules</a> page.</p>
+The <a href="submodules.html">submodules</a> page will elaborate on potential chaos and pitfalls,
+and it provides instructions for setting up an alias <code>git sup</code> for this command.</p>
<h3 id="if-you-cant-stand-submodules">If You Canât Stand Submodules</h3>
Modified: brooklyn/site/v/0.9.0-SNAPSHOT/misc/javadoc/overview-summary.html
URL: http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0-SNAPSHOT/misc/javadoc/overview-summary.html?rev=1728032&r1=1728031&r2=1728032&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0-SNAPSHOT/misc/javadoc/overview-summary.html (original)
+++ brooklyn/site/v/0.9.0-SNAPSHOT/misc/javadoc/overview-summary.html Tue Feb 2 01:41:36 2016
@@ -1152,7 +1152,7 @@ Javadoc for <a href="http://brooklyn.io"
<p>
<!-- BROOKLYN_VERSION_BELOW -->
-This is the Javadoc for v 0.9.0-SNAPSHOT (git SHA1 hash f1da1755a15ab0d68556fa27bf78920666cb837d) auto-generated on 2016-02-02.
+This is the Javadoc for v 0.9.0-SNAPSHOT (git SHA1 hash 4e4aed4b5a47772b18d0d047858f796685a27c4e) auto-generated on 2016-02-02.
</p></div>
</div>
</div>