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

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

@@ -29,6 +29,10 @@ guides_base_url: http://docs.spring.io/spring-security/site/docs/3.2.x/guides
 custom_pom_template: false
 custom_gradle_template: false
 
+# If you want to include a custom pom.xml or gradle template set these value to true and add _include files
+custom_pom_template: false
+custom_gradle_template: false
+
 
 ### The following properties are constant for most projects
 

_includes/page.html

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