diff --git a/ghpages.sh b/ghpages.sh index e1063ce3..91905757 100644 --- a/ghpages.sh +++ b/ghpages.sh @@ -12,20 +12,13 @@ if ! [ -d docs/target/generated-docs ]; then exit 0 fi -# Find name of current branch -################################################################### -branch=$TRAVIS_BRANCH -[ "$branch" == "" ] && branch=`git rev-parse --abbrev-ref HEAD` -target=. -if [ "$branch" != "master" ]; then target=./$branch; mkdir -p $target; fi - # Stash any outstanding changes ################################################################### git diff-index --quiet HEAD dirty=$? if [ "$dirty" != "0" ]; then git stash; fi -# Switch to gh-pages branch to sync it with current branch +# Switch to gh-pages branch to sync it with master ################################################################### git checkout gh-pages @@ -33,22 +26,21 @@ for f in docs/target/generated-docs/*; do file=${f#docs/target/generated-docs/*} if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then # Not ignored... - cp -rf $f $target - git add -A $target/$file + cp -rf $f . + git add -A $file fi done -git add -A README.adoc || echo "No change to README.adoc" -git commit -a -m "Sync docs from $branch to gh-pages" || echo "Nothing committed" +git commit -a -m "Sync docs from master to gh-pages" # Uncomment the following push if you want to auto push to -# the gh-pages branch whenever you commit to branch locally. +# the gh-pages branch whenever you commit to master locally. # This is a little extreme. Use with care! ################################################################### -git push origin gh-pages || echo "Cannot push gh-pages" +git push origin gh-pages -# Finally, switch back to the current branch and exit block -git checkout $branch +# Finally, switch back to the master branch and exit block +git checkout master if [ "$dirty" != "0" ]; then git stash pop; fi exit 0 diff --git a/spring-cloud-config.html b/spring-cloud-config.html index ff5dd4b6..3e9b7fe0 100644 --- a/spring-cloud-config.html +++ b/spring-cloud-config.html @@ -429,11 +429,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
  • Key Management
  • Creating a Key Store for Testing
  • Using Multiple Keys and Key Rotation
  • +
  • Embedding the Config Server
  • -
  • Serving Plain Text
  • -
  • Embedding the Config Server
  • -
  • Push Notifications and Spring Cloud Bus
  • Spring Cloud Config Client