rallytime
6464236f68
Merge branch '2016.3' into 'develop'
...
Conflicts:
- doc/conf.py
- doc/ref/returners/index.rst
- salt/states/disk.py
2016-08-25 16:09:01 -06:00
Nicole Thomas
cd90052187
Documentation spelling fixes ( #35773 )
...
Fixes #35771
2016-08-25 13:41:03 -06:00
Adam Chainz
64d9a62f89
Convert readthedocs links for their .org -> .io migration for hosted projects
...
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/ ) ‘Securing subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified.
2016-06-11 12:33:37 +01:00
Denys Havrysh
aebc48163d
Remove trailing white spaces in documentation files
2016-03-01 17:36:23 +02:00
Jonathan Ballet
276eb3a843
Fix GCE documentation
2016-01-25 12:19:21 +01:00
Aditya Kulkarni
10bfcb8cb0
Add documentation about scopes (GCE)
2015-12-17 09:42:15 -07:00
Colton Myers
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
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-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
salt/modules/pip.py
salt/states/user.py
2015-10-07 12:06:12 -06:00
rallytime
8dc047dc18
If external_up is set to None, don't stacktrace, just use the private ip.
2015-10-01 16:37:17 -06:00
rallytime
2bf566d934
Allow IP-forwarding in GCE driver
...
Fixes #21390
2015-09-23 14:27:55 -06:00
rallytime
484015a7a3
Added version tag for ex_disk_type option
2015-09-23 14:21:17 -06:00
rallytime
a71ebc97b2
Allow use of rst header links by separating options out from yaml example
...
Also added docs to use the ex_disk_type option
2015-09-23 14:21:06 -06:00
rallytime
1d3925bbfb
Added version tag for ex_disk_type option
2015-09-23 13:08:18 -06:00
rallytime
f23369300c
Allow use of rst header links by separating options out from yaml example
...
Also added docs to use the ex_disk_type option
2015-09-23 13:06:25 -06:00
rallytime
cced6e9031
Don't repeat GCE setup instructions, and make the use of .json files clearer
2015-09-17 15:07:49 -06:00
Colton Myers
2c2a5f85ac
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/gce.rst
salt/cli/api.py
salt/cli/call.py
salt/cli/cp.py
salt/cli/key.py
salt/cli/run.py
salt/cli/salt.py
salt/modules/dockerio.py
salt/states/dockerio.py
2015-09-17 10:54:33 -06:00
rallytime
a07db909bd
Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples
2015-09-16 12:51:47 -06:00
Jacob Hammons
d8d5045d3b
Updates to cloud docs for the provider > driver change in provider configs.
...
Refs #24797
2015-08-10 09:20:26 -06:00
Colton Myers
3a7289a0cb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/states/all/salt.states.aptpkg.rst
doc/ref/states/all/salt.states.etcd_mod.rst
doc/topics/releases/releasecandidate.rst
salt/client/mixins.py
salt/modules/win_pkg.py
tests/unit/modules/boto_vpc_test.py
2015-07-08 16:24:58 -06:00
Tom Melendez
4078c8db25
added message recommending JSON file be used if the libcloud version is >= 0.17.0
2015-07-06 10:07:16 -06:00
rallytime
0dba3feb63
Change provider config refernces to driver in docs
2015-06-17 16:41:03 -06:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Benoit Beausejour
680689e78a
Updated documentation for GCE:
...
- Support for fixed address
- New salt function for create_address, delete_address, show_address
2014-12-02 15:38:00 -05:00
rallytime
6d632d8f17
Update salt-cloud gce docs to use downloaded p12 key file
2014-08-24 12:15:04 -06:00
Erik Johnson
57096ca59c
Convert double-colon to code-block
2014-07-14 12:37:13 -05:00
rallytime
7778a6e24d
clarifications to gce cloud docs
2014-06-26 11:31:52 -06:00
Chris Rebert
8af229253f
more copyediting
2014-04-30 13:55:48 -07:00
Sam Kalnins
f36823bfd7
Adjust the salt-cloud docs for GCE SSH keys to make the example clearer
2014-04-29 21:08:25 +01:00
Eric Johnson
d99e639411
fixed #10800 - updating GCE docs
2014-02-26 22:45:43 +00:00
Joseph Hall
c968443508
Update docs to reflect pycrypto dependency
2013-12-13 15:43:24 -07:00
Eric Johnson
9256e92e8e
small issue in libcloud, need to install from source for now
2013-12-04 19:44:30 +00:00
Henrik Holmboe
d456a7eb53
Copy edit gce.rst
2013-11-25 15:31:16 +01:00
Joseph Hall
401f9c7d15
Fixing spelling errors in GCE doc
2013-11-22 19:04:00 -07:00
Eric Johnson
30064bc1c2
adding GCE docs
2013-11-22 18:19:16 +00:00
