Merge remote-tracking branch 'bitcoin.org/master' into generatingtxes

Conflicts:
	_includes/guide_payment_processing.md
	_less/screen.less
This commit is contained in:
David A. Harding 2014-06-02 11:40:38 -04:00
commit 78b4c5452e
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
99 changed files with 5216 additions and 917 deletions

View file

@ -51,20 +51,20 @@ module Jekyll
Dir.foreach('.') do |file1|
if /^[a-z]{2}(_[A-Z]{2})?$/.match(file1) and File.directory?(file1)
Dir.foreach(file1) do |file2|
next if !/\.html$/.match(file2)
next if !/\.html$|\.md$/.match(file2)
data = File.read(file1+'/'+file2)
sitemap.puts '<url>'
sitemap.puts ' <loc>https://bitcoin.org/'+file1+'/'+file2.gsub('.html','')+'</loc>'
sitemap.puts ' <loc>https://bitcoin.org/'+file1+'/'+file2.gsub('.html','').gsub('.md','')+'</loc>'
sitemap.puts '</url>'
end
end
next if !/\.html$/.match(file1)
next if file1 == 'index.html'
next if !/\.html$|\.md$/.match(file1)
next if file1 == 'index.html' or file1 == '404.html' or file1 == 'README.md'
#Ignore google webmaster tools
data = File.read(file1)
next if !data.index('google-site-verification:').nil?
sitemap.puts '<url>'
sitemap.puts ' <loc>https://bitcoin.org/'+file1.gsub('.html','')+'</loc>'
sitemap.puts ' <loc>https://bitcoin.org/'+file1.gsub('.html','').gsub('.md','')+'</loc>'
sitemap.puts '</url>'
end
#Add english alerts pages