From 9a801359bc50c3115ed58ef5ea5f1714643d1835 Mon Sep 17 00:00:00 2001 From: viq Date: Thu, 29 Apr 2021 22:33:29 +0200 Subject: [PATCH 1/3] Update Salt version and project page Update version, project page, and copyright year. --- lib/docs/scrapers/salt_stack.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/docs/scrapers/salt_stack.rb b/lib/docs/scrapers/salt_stack.rb index 01a23c60..bcb706ca 100644 --- a/lib/docs/scrapers/salt_stack.rb +++ b/lib/docs/scrapers/salt_stack.rb @@ -3,11 +3,11 @@ module Docs class SaltStack < FileScraper self.type = 'simple' self.slug = 'saltstack' - self.release = '2019.2.0' - self.base_url = 'https://docs.saltstack.com/en/latest/' + self.release = '3003' + self.base_url = 'https://docs.saltproject.io/en/latest/' self.root_path = 'ref/index.html' self.links = { - home: 'https://www.saltstack.com/', + home: 'https://www.saltproject.io/', code: 'https://github.com/saltstack/salt' } @@ -17,7 +17,7 @@ module Docs options[:container] = '.body-content > .section' options[:attribution] = <<-HTML - © 2019 SaltStack.
+ © 2021 SaltStack.
Licensed under the Apache License, Version 2.0. HTML From 28bf21241999fdde6707b7ca79d4e6d0d3a481c2 Mon Sep 17 00:00:00 2001 From: viq Date: Thu, 29 Apr 2021 23:27:22 +0200 Subject: [PATCH 2/3] Update year in about_tmpl.coffee --- assets/javascripts/templates/pages/about_tmpl.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index 2cd6798e..f9546d42 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -738,7 +738,7 @@ credits = [ 'https://raw.githubusercontent.com/ReactiveX/rxjs/master/LICENSE.txt' ], [ 'Salt Stack', - '2019 SaltStack', + '2021 SaltStack', 'Apache', 'https://raw.githubusercontent.com/saltstack/salt/develop/LICENSE' ], [ From 7c0cc5ac12b06b851b0ea2b2794f1b49622d5c18 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Thu, 29 Apr 2021 23:48:40 +0200 Subject: [PATCH 3/3] SaltStack: migrate to UrlScraper --- docs/file-scrapers.md | 13 ------------- lib/docs/scrapers/salt_stack.rb | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/docs/file-scrapers.md b/docs/file-scrapers.md index ea5b5d8f..590faa4d 100644 --- a/docs/file-scrapers.md +++ b/docs/file-scrapers.md @@ -202,19 +202,6 @@ tar -xf ruby.tar; cd ruby-$RELEASE; ./configure && make html; mv .ext/html path/ To generate the htmls file you have to run `make` command but it does not install Ruby in your system, only generates html files so you have not to worry about cleaning or removing a new Ruby installation. -## Salt Stack - -Replace `2019.2` with the correct tag. - -```sh -git clone https://github.com/saltstack/salt.git --branch 2019.2 --depth 1 -cd salt/doc -pip install sphinx -make html -``` - -The generated html is in `salt/doc/_build/html`. Copy it to - ## Scala See `lib/docs/scrapers/scala.rb` diff --git a/lib/docs/scrapers/salt_stack.rb b/lib/docs/scrapers/salt_stack.rb index bcb706ca..e27ad1ad 100644 --- a/lib/docs/scrapers/salt_stack.rb +++ b/lib/docs/scrapers/salt_stack.rb @@ -1,6 +1,5 @@ module Docs - # The official documentation website is heavily rate-limited - class SaltStack < FileScraper + class SaltStack < UrlScraper self.type = 'simple' self.slug = 'saltstack' self.release = '3003'