Merge branch 'master' into snapshot

build-docs.rb

@@ -27,15 +27,16 @@ config['projects'].each do |project_name, project_config|
     puts 'Cloning ...'
     FileUtils.mkdir_p(project_dir)
     repo = Git.clone(project_config['git'], clone_target)
+    puts "Checkout ref '#{project_config['ref']}'"
+    repo.branch(project_config['ref']).checkout
   else
     repo = Git.open(clone_target)
     repo.fetch()
+    puts "Checkout ref '#{project_config['ref']}'"
+    repo.branch(project_config['ref']).checkout
+    repo.pull('origin', project_config['ref'])
   end
 
-  puts "Checkout ref '#{project_config['ref']}'"
-  repo.branch(project_config['ref']).checkout
-  repo.pull()
-
   puts "Building page index from #{project_docs_dir}"
   Dir.glob("#{project_docs_dir}/*.md", File::FNM_CASEFOLD).sort.each do |file|
     filepath = file.gsub('projects/', '')

mkdocs.template.yml

@@ -27,7 +27,7 @@ extra:
     - text: 'Blog'
       link: 'https://www.icinga.com/blog/'
     - text: 'Download'
-      link: 'https://www.icinga.com/downloads/'
+      link: 'https://www.icinga.com/download/'
       cssid: 'download-button'
   social:
     - type: 'facebook'