History

Update Fish documentation (3.2.0)

Simon Legner committed 5 years ago

Commit 6f7ff4d1 parent 74802573 files · +14 −4Browse files

Unified · Split

3 files
  1. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  2. lib/docs/filters/fish/entries_sphinx.rb +4 −2
  3. lib/docs/scrapers/fish.rb +9 −1
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -303,7 +303,7 @@ credits = [ · 302 unmodified lines
303 'https://raw.githubusercontent.com/falconry/falcon/master/LICENSE'303 'https://raw.githubusercontent.com/falconry/falcon/master/LICENSE'
304 ], [304 ], [
305 'Fish',305 'Fish',
306 '2005-2009 Axel Liljencrantz',306 '2005-2009 Axel Liljencrantz, 2009-2020 fish-shell contributors',
307 'GPLv2',307 'GPLv2',
308 'https://fishshell.com/docs/current/license.html'308 'https://fishshell.com/docs/current/license.html'
309 ], [309 ], [
lib/docs/filters/fish/entries_sphinx.rb+4−2
@@ -4,6 +4,8 @@ module Docs · 3 unmodified lines
4 def get_name4 def get_name
5 if slug == 'faq'5 if slug == 'faq'
6 'FAQ'6 'FAQ'
7 elsif slug == 'fish_for_bash_users'
8 'Fish for Bash Users'
7 elsif slug.starts_with?('cmds/')9 elsif slug.starts_with?('cmds/')
8 slug.split('/').last10 slug.split('/').last
9 else11 else
@@ -12,9 +14,9 @@ module Docs · 2 unmodified lines
12 end14 end
13 15
14 def get_type16 def get_type
15 if root_page? || slug == 'faq'17 if root_page? || slug == 'faq' || slug == 'completions' || slug == 'fish_for_bash_users'
16 'Manual'18 'Manual'
17 elsif slug.starts_with?('cmds')19 elsif slug.starts_with?('cmds') || slug == 'commands'
18 'Commands'20 'Commands'
19 elsif slug == 'tutorial'21 elsif slug == 'tutorial'
20 'Tutorial'22 'Tutorial'
lib/docs/scrapers/fish.rb+9−1
@@ -12,10 +12,18 @@ module Docs · 11 unmodified lines
12 12
13 # https://fishshell.com/docs/current/license.html13 # https://fishshell.com/docs/current/license.html
14 options[:attribution] = <<-HTML14 options[:attribution] = <<-HTML
15 &copy; 2019 fish-shell developers<br>15 &copy; 2020 fish-shell developers<br>
16 Licensed under the GNU General Public License, version 2.16 Licensed under the GNU General Public License, version 2.
17 HTML17 HTML
18 18
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
19 version '3.1' do27 version '3.1' do
20 self.release = '3.1.2'28 self.release = '3.1.2'
21 self.base_url = "https://fishshell.com/docs/#{version}/"29 self.base_url = "https://fishshell.com/docs/#{version}/"