Skip to content

Commit 6f7ff4d

Browse files
committed
Update Fish documentation (3.2.0)
1 parent 7480257 commit 6f7ff4d

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

assets/javascripts/templates/pages/about_tmpl.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ credits = [
303303
'https://raw.githubusercontent.com/falconry/falcon/master/LICENSE'
304304
], [
305305
'Fish',
306-
'2005-2009 Axel Liljencrantz',
306+
'2005-2009 Axel Liljencrantz, 2009-2020 fish-shell contributors',
307307
'GPLv2',
308308
'https://fishshell.com/docs/current/license.html'
309309
], [

lib/docs/filters/fish/entries_sphinx.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ class EntriesSphinxFilter < Docs::EntriesFilter
44
def get_name
55
if slug == 'faq'
66
'FAQ'
7+
elsif slug == 'fish_for_bash_users'
8+
'Fish for Bash Users'
79
elsif slug.starts_with?('cmds/')
810
slug.split('/').last
911
else
@@ -12,9 +14,9 @@ def get_name
1214
end
1315

1416
def get_type
15-
if root_page? || slug == 'faq'
17+
if root_page? || slug == 'faq' || slug == 'completions' || slug == 'fish_for_bash_users'
1618
'Manual'
17-
elsif slug.starts_with?('cmds')
19+
elsif slug.starts_with?('cmds') || slug == 'commands'
1820
'Commands'
1921
elsif slug == 'tutorial'
2022
'Tutorial'

lib/docs/scrapers/fish.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,18 @@ class Fish < UrlScraper
1212

1313
# https://fishshell.com/docs/current/license.html
1414
options[:attribution] = <<-HTML
15-
&copy; 2019 fish-shell developers<br>
15+
&copy; 2020 fish-shell developers<br>
1616
Licensed under the GNU General Public License, version 2.
1717
HTML
1818

19+
version '3.2' do
20+
self.release = '3.2.0'
21+
self.base_url = "https://fishshell.com/docs/#{version}/"
22+
23+
options[:skip].concat %w(genindex.html relnotes.html)
24+
html_filters.push 'sphinx/clean_html', 'fish/clean_html_sphinx', 'fish/entries_sphinx'
25+
end
26+
1927
version '3.1' do
2028
self.release = '3.1.2'
2129
self.base_url = "https://fishshell.com/docs/#{version}/"

0 commit comments

Comments
 (0)