Merge branch 'gh-pages' of https://github.com/spring-projects/gh-pages into gh-pages

Conflicts:
	.gitignore
	README.markdown
	_config.yml
	_includes/billboard.html
	_includes/page.html
	css/projects.css.css

README.markdown

@@ -15,8 +15,7 @@ From within your Spring project's git checkout directory:
 
 ### Remove all files
 
-    git rm -rf *
-    git rm -rf '.*'
+    git rm -rf `git ls-files` && rm -rf *
 
 ### Add the gh-pages-upstream remote
 
@@ -50,11 +49,11 @@ At this point you need to make a decision: is your project a "grouping project",
 
 Based on your choice above, copy the correct sample page to `index.html`, e.g.:
 
-    $ cp sample-pages/project.html index.html
+    $ cp _sample-pages/project.html index.html
 
 or
 
-    $ cp sample-pages/project_group.html index.html
+    $ cp _sample-pages/project_group.html index.html
 
 
 ## Edit the content of your home page
@@ -96,9 +95,10 @@ Assuming you're already within your project's clone directory, and you've alread
 
 ### Install jekyll if you have not already
 
-> **Note:** Jekyll 1.1.2 is a known good version.
+> **Note:** Jekyll 1.1.2 is a known good version, and it is specifically referred to in `Gemfile.lock` so you have to use `bundle` (not `gem install ...`) to install it:
 
-    gem install jekyll
+    gem install bundler
+    bundle
 
 ### Run jekyll
 

_config.yml

@@ -34,4 +34,4 @@ custom_gradle_template: false
 
 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

_includes/billboard.html

@@ -17,10 +17,12 @@
                             <a href="{{ site.github_repo_url }}" class="project-link">
                                 <i class="icon-github"></i>
                             </a>
+{% if site.forum %}
                             <a href="{{ site.forum }}" class="project-link project-link-forum">
                                 <div class="spring-icon spring-icon-forum">
                                 </div>
                             </a>
+{% endif %}
                         </div>
                     </div>
 

_includes/page.html

@@ -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">

css/projects.css.css

@@ -143,7 +143,7 @@
 
 .projects--wrapper.project-aggregator .project--container a {
     padding: 30px 20px;
-    height: 100px;
+    height: 160px;
     width: 288px;
     display: inline-block;
     color: #34302D;