Bladeren bron

Merge pull request #1533 from viq/patch-1

Update SaltStack documentation to version 3003
Simon Legner 4 jaren geleden
bovenliggende
commit
ff0ff27005
3 gewijzigde bestanden met toevoegingen van 6 en 20 verwijderingen
  1. 1 1
      assets/javascripts/templates/pages/about_tmpl.coffee
  2. 0 13
      docs/file-scrapers.md
  3. 5 6
      lib/docs/scrapers/salt_stack.rb

+ 1 - 1
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'
   ], [

+ 0 - 13
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`

+ 5 - 6
lib/docs/scrapers/salt_stack.rb

@@ -1,13 +1,12 @@
 module Docs
-  # The official documentation website is heavily rate-limited
-  class SaltStack < FileScraper
+  class SaltStack < UrlScraper
     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 +16,7 @@ module Docs
     options[:container] = '.body-content > .section'
 
     options[:attribution] = <<-HTML
-      &copy; 2019 SaltStack.<br>
+      &copy; 2021 SaltStack.<br>
       Licensed under the Apache License, Version 2.0.
     HTML