diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index 52b97fb7..3d155409 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -303,7 +303,7 @@ credits = [ 'https://raw.githubusercontent.com/falconry/falcon/master/LICENSE' ], [ 'Fish', - '2005-2009 Axel Liljencrantz', + '2005-2009 Axel Liljencrantz, 2009-2020 fish-shell contributors', 'GPLv2', 'https://fishshell.com/docs/current/license.html' ], [ diff --git a/lib/docs/filters/fish/entries_sphinx.rb b/lib/docs/filters/fish/entries_sphinx.rb index f4fc939d..50341823 100755 --- a/lib/docs/filters/fish/entries_sphinx.rb +++ b/lib/docs/filters/fish/entries_sphinx.rb @@ -4,6 +4,8 @@ module Docs def get_name if slug == 'faq' 'FAQ' + elsif slug == 'fish_for_bash_users' + 'Fish for Bash Users' elsif slug.starts_with?('cmds/') slug.split('/').last else @@ -12,9 +14,9 @@ module Docs end def get_type - if root_page? || slug == 'faq' + if root_page? || slug == 'faq' || slug == 'completions' || slug == 'fish_for_bash_users' 'Manual' - elsif slug.starts_with?('cmds') + elsif slug.starts_with?('cmds') || slug == 'commands' 'Commands' elsif slug == 'tutorial' 'Tutorial' diff --git a/lib/docs/scrapers/fish.rb b/lib/docs/scrapers/fish.rb index 175c95e5..08f240e9 100644 --- a/lib/docs/scrapers/fish.rb +++ b/lib/docs/scrapers/fish.rb @@ -12,10 +12,18 @@ module Docs # https://fishshell.com/docs/current/license.html options[:attribution] = <<-HTML - © 2019 fish-shell developers
+ © 2020 fish-shell developers
Licensed under the GNU General Public License, version 2. HTML + version '3.2' do + self.release = '3.2.0' + self.base_url = "https://fishshell.com/docs/#{version}/" + + options[:skip].concat %w(genindex.html relnotes.html) + html_filters.push 'sphinx/clean_html', 'fish/clean_html_sphinx', 'fish/entries_sphinx' + end + version '3.1' do self.release = '3.1.2' self.base_url = "https://fishshell.com/docs/#{version}/"