Merge remote-tracking branch 'ghpages/gh-pages' into gh-pages

This commit is contained in:
Brian Clozel
2014-09-24 14:50:22 +02:00
2 changed files with 5 additions and 5 deletions

View File

@@ -30,4 +30,4 @@ custom_gradle_template: true
main_site_url: http://spring.io
projects_site_url: http://projects.spring.io
forum_url: http://forum.spring.io
questions_url: http://spring.io/questions

View File

@@ -72,7 +72,7 @@
href="{{site.main_site_url}}/projects">Projects</a></li>
<li class="navbar-link"><a href="{{site.main_site_url}}/blog">Blog</a>
</li>
<li class="navbar-link"><a href="{{site.forum_url}}">Forum</a>
<li class="navbar-link"><a href="{{site.questions_url}}">Questions</a>
</li>
<li class="navbar-link nav-search"><i
class="icon-search navbar-search--icon js-search-input-open"></i>
@@ -114,9 +114,9 @@
</div>
</div>
&copy; <script type="text/javascript"> var d = new Date();
document.write(d.getFullYear());</script> <a href="http://gopivotal.com">GoPivotal</a>, Inc. All Rights Reserved.
<a href="http://www.gopivotal.com/terms-of-use">Terms of Use</a> and
<a href="http://www.gopivotal.com/privacy-policy">Privacy</a>
document.write(d.getFullYear());</script> <a href="http://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
<a href="http://www.pivotal.io/terms-of-use">Terms of Use</a> and
<a href="http://www.pivotal.io/privacy-policy">Privacy</a>
</div>
<div class="span4 footer-newsletter--wrapper pull-right">
<div class="footer-newsletter--container">