Commit Graph

13 Commits

Author SHA1 Message Date
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
rallytime
513058945c Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
2016-12-19 14:58:39 -07:00
rallytime
23bce1c929 Remove ":doc:" references from all doc/topics/releases/* files 2016-12-15 16:45:51 -07:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
2016-03-02 13:48:11 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
2016-02-12 14:38:50 -07:00
Benjamin Drung
708f2ff8ea Fix typo reponse -> response 2016-02-04 13:06:04 +01:00
Benjamin Drung
72c4eab6d7 Fix typo propogate -> propagate 2016-02-04 13:04:27 +01:00
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
Colton Myers
ff8561df8d Add minor CVEs to 2014.7.4 release notes 2015-04-15 19:01:28 -06:00
rallytime
becc997de4 Apply release note fix to develop branch 2015-04-13 15:34:24 -06:00
rallytime
1f243d6276 Apply release note change to develop 2015-04-13 13:53:03 -06:00
Colton Myers
74dcd7df1c Add 2014.7.4 release notes 2015-03-26 09:03:35 -06:00