Erik Johnson
f89d2ccd30
Clean up Sphinx warnings
2018-06-06 08:42:21 -05:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/modules/all/index.rst
- doc/topics/grains/index.rst
- doc/topics/releases/2016.3.4.rst
- doc/topics/spm/spm_formula.rst
- doc/topics/tutorials/cron.rst
- doc/topics/tutorials/index.rst
- doc/topics/tutorials/stormpath.rst
- salt/engines/slack.py
- salt/log/handlers/fluent_mod.py
- salt/modules/cyg.py
- salt/modules/junos.py
- salt/modules/namecheap_dns.py
- salt/modules/namecheap_domains.py
- salt/modules/namecheap_ns.py
- salt/modules/namecheap_ssl.py
- salt/modules/namecheap_users.py
- salt/modules/reg.py
- salt/modules/tomcat.py
- salt/modules/vault.py
- salt/modules/win_file.py
- salt/modules/zpool.py
- salt/output/highstate.py
- salt/renderers/pass.py
- salt/runners/cache.py
- salt/states/boto_apigateway.py
- salt/states/boto_iam.py
- salt/states/boto_route53.py
- salt/states/msteams.py
- salt/states/reg.py
- salt/states/win_iis.py
- tests/integration/modules/test_cmdmod.py
- tests/integration/states/test_user.py
- tests/support/helpers.py
- tests/unit/cloud/clouds/test_openstack.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_junos.py
- tests/unit/pillar/test_git.py
- tests/unit/states/test_win_path.py
- tests/unit/test_pillar.py
- tests/unit/utils/test_format_call.py
- tests/unit/utils/test_utils.py
- tests/unit/utils/test_warnings.py
2018-06-01 14:54:12 -04:00
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
dd3e6f3f0a
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/man/salt-api.1
- doc/man/salt-call.1
- doc/man/salt-cloud.1
- doc/man/salt-cp.1
- doc/man/salt-key.1
- doc/man/salt-master.1
- doc/man/salt-minion.1
- doc/man/salt-proxy.1
- doc/man/salt-run.1
- doc/man/salt-ssh.1
- doc/man/salt-syndic.1
- doc/man/salt-unity.1
- doc/man/salt.1
- doc/man/salt.7
- doc/man/spm.1
- salt/states/pkgrepo.py
2018-05-15 12:29:29 -04:00
Mike Place
6d2ddd050f
One more grammar fixup
2018-05-11 11:32:33 -05:00
Mike Place
2d5ff01261
Grammar fix
2018-05-11 09:18:55 -05:00
Ch3LL
138847c9c4
Update debian install docs to reflect new latest debian releases
2018-05-11 09:51:50 -04:00
rallytime
e8864b7b0b
Merge branch '2017.7' into '2018.3'
2018-03-28 13:52:28 -04:00
Denys Havrysh
a1cc55da3d
[DOC] Remove mentions of COPR repo from RHEL installation page
...
Fixes #28142
2018-03-28 12:30:07 +03:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- .kitchen.yml
- Gemfile
- pkg/windows/build_env_2.ps1
- pkg/windows/build_env_3.ps1
- pkg/windows/req.txt
- salt/client/ssh/__init__.py
- salt/client/ssh/ssh_py_shim.py
- salt/modules/boto_vpc.py
- salt/modules/file.py
- salt/modules/heat.py
- salt/modules/smartos_vmadm.py
- salt/modules/win_dsc.py
- salt/returners/elasticsearch_return.py
- salt/runners/salt.py
- salt/states/module.py
- salt/utils/win_functions.py
- setup.py
- tests/integration/modules/test_state.py
- tests/unit/grains/test_core.py
- tests/unit/test_pillar.py
2018-03-15 17:22:05 -04:00
Benjamin Drung
a3c54b50f6
Fix various spelling mistakes
...
lintian found various spelling mistakes.
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 15:25:42 +01:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/cli/api.py
- salt/client/ssh/wrapper/state.py
- salt/config/__init__.py
- salt/crypt.py
- salt/daemons/masterapi.py
- salt/key.py
- salt/loader.py
- salt/master.py
- salt/modules/archive.py
- salt/modules/hipchat.py
- salt/modules/pip.py
- salt/modules/state.py
- salt/modules/virt.py
- salt/modules/x509.py
- salt/state.py
- salt/transport/tcp.py
- salt/transport/zeromq.py
- salt/utils/__init__.py
- salt/utils/event.py
- salt/utils/extmods.py
- salt/utils/files.py
- salt/utils/parsers.py
- salt/utils/verify.py
- tests/integration/shell/test_call.py
- tests/unit/utils/test_args.py
2018-03-06 13:45:59 -05:00
Ch3LL
21aa848c89
Add mac py2 and py3 packages to mac installation docs
2018-03-06 11:09:33 -05:00
Dmitry Kuzmenko
a67fe51a5c
Fixed some tests, updated a doc.
2018-01-25 20:31:59 +03:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/client/ssh/wrapper/state.py
- salt/modules/yumpkg.py
2018-01-04 17:45:29 -05:00
sumeetisp
1b4806e2b9
Updating python version
...
As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency
2018-01-04 10:56:56 +05:30
twangboy
467013a08f
Fix punctuation and erroneous characters
2017-12-21 13:11:24 -07:00
twangboy
50b247a001
Update docs and help
2017-12-20 19:43:26 -07:00
twangboy
42607982cb
Update docs for new support
...
Fix some types in the help for the installer
2017-12-19 11:10:05 -07:00
twangboy
e22b2a4856
Fix some grammer issues in the docs
2017-10-16 10:51:33 -06:00
twangboy
78124181cd
Fix typo
2017-10-16 10:51:33 -06:00
twangboy
7bcf8b48ec
Update documentation with new changes to installer
2017-10-16 10:51:33 -06:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- tests/unit/utils/test_parsers.py
2017-09-22 09:40:03 -04:00
Raymond Piller
d91c47c6f0
Salt Repo has Deb 9 and 8
2017-09-21 10:24:41 -04:00
Raymond Piller
5f47ef721c
Salt Repo has Deb 9 and 8
2017-09-20 21:41:08 -05:00
Mircea Ulinic
93be79a135
Index eos under the installation instructions list
2017-08-12 23:15:11 +01:00
Mircea Ulinic
f903e7bc39
Minor eos doc correction
2017-08-12 23:11:25 +01:00
Frankie Hui
1598571f52
Add eos.rst in the installation guide
2017-08-02 17:47:31 +08:00
twangboy
b6201bac33
Fix version numbers
2017-06-15 09:53:57 -06:00
twangboy
45975e299e
Remove reference to Salt Enterprise
2017-06-14 09:39:29 -06:00
twangboy
22601201c4
Add note about salt-master on Windows
2017-06-13 15:09:38 -06:00
twangboy
d67c1dfbf7
Remove references to salt master installation
2017-06-13 15:02:44 -06:00
Mike Place
e540b4616e
Update Solaris installation document
...
The OpenCSW packages are no longer maintained. Include details about
installing via setup.py.
2017-02-25 19:24:02 -07:00
rallytime
e91fcbeaac
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/dockerng.py
- salt/thorium/key.py
2017-01-26 16:02:06 -07:00
Robert James Hernandez
9cc9c6110d
Adding explicit call to python-systemd in jessie-backports
2017-01-24 14:25:45 -08:00
rallytime
5b43a252c9
Merge branch '2016.11' into 'develop'
...
Conflicts:
- conf/master
- doc/topics/installation/ubuntu.rst
- salt/modules/pillar.py
- salt/netapi/rest_tornado/saltnado.py
- salt/states/influxdb_user.py
- salt/utils/minions.py
- salt/utils/openstack/nova.py
2017-01-17 09:50:06 -07:00
rallytime
4e1e45d640
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-01-13 14:45:36 -07:00
rallytime
30429b2e44
Remove the installation instructions for out-of-date community ppa
...
These packages are not being updated and it is causing confusion.
Ubuntu packages should be installed with the instructions on
repo.saltstack.com.
2017-01-09 17:13:50 -07:00
rallytime
342a5ac0b8
Merge branch '2016.11' into 'develop'
...
No conflicts.
2017-01-06 10:31:51 -05:00
rallytime
30f14d15df
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/config/__init__.py
- salt/engines/slack.py
2017-01-04 16:54:58 -05:00
rallytime
8b1897ace9
Update arch installation docs with correct package name
...
When 2016.11.0 was released, the naming of the salt package was
changed. The salt-zmq version is now named just "salt" and the
salt-raet pacakge is no longer being updated.
2017-01-04 13:08:47 -05:00
rallytime
9ad362fbde
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2
Change OSX/OS X to macOS where possible
2016-12-28 14:49:46 -07:00
rallytime
494a06bee2
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/configuration/minion.rst
2016-12-20 10:03:44 -07: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
5c42a361a0
Remove ":doc:" references from all doc/topics/installation/* files
2016-12-15 16:50:16 -07:00
rallytime
4aafa41d22
Remove ":doc:" references from a bunch of doc/* files
2016-12-15 16:09:27 -07:00
rallytime
6e32267d0c
Remove ":doc:" references in salt/* files
2016-12-15 14:03:56 -07:00
rallytime
7b2341bbfd
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/topics/releases/releasecandidate.rst
- salt/modules/file.py
- salt/states/file.py
- salt/utils/network.py
2016-11-10 15:59:51 -07:00
Mike Place
6d2b2e1881
Slight grammar fix
2016-11-08 13:27:06 +13:00