Benjamin Drung
5f7fc5f94b
Fix typo an edditable -> editable
2015-11-04 11:06:16 +01:00
Michael Vogel
cb8a72d580
Fix #28060
...
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
2015-10-19 09:54:12 -06:00
Colton Myers
d3d0e004d9
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/minion.py
salt/modules/gpg.py
salt/modules/keystone.py
salt/modules/pw_user.py
salt/states/reg.py
setup.py
2015-08-17 16:54:16 -06:00
Pedro Algarvio
e7cb3be2a0
Document the added options
2015-08-17 19:48:48 +01:00
Colton Myers
99fc7ecb4b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt.7
salt/cloud/__init__.py
salt/fileclient.py
salt/modules/file.py
salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
Justin Findlay
152a9b2a12
fix some malformed doc links and anchors
2015-06-24 16:56:52 -06:00
rallytime
54a7089fd6
Link the new labels doc in contributing and hacking docs
2015-06-04 11:39:39 -06:00
rallytime
475a32d3aa
Link the new labels doc in contributing and hacking docs
2015-05-05 13:23:08 -06:00
Thomas S Hatch
0529136858
Merge pull request #19510 from JensRantil/sphinx-1.3b2
...
doc(dev-bootstrap): Sphinx 1.3b2
2015-01-08 09:57:42 -07:00
Jens Rantil
9e92864398
doc(dev-bootstrap): Sphinx 1.3b2
...
I was getting an error that the current stable version of Sphinx wasn't
new enough. Installing Sphinx 1.3b2 did the trick.
2015-01-08 08:04:11 +01:00
Thomas S Hatch
35af81b4b7
Merge pull request #19482 from JensRantil/warn-socketpath-early
...
Development bootstrap documentation improvements
2015-01-07 14:55:43 -07:00
Jens Rantil
30978b1070
doc(bootstrap-dev): mention short virtualenv path early
...
This was the second time I ran into this issue. Annoying after going
through all the steps of installing applications in the virtual
environment etc.
2015-01-07 22:25:31 +01:00
Jens Rantil
4666b29174
doc(bootstrap-dev): make long socket path warning a note
...
It doesn't really feel like part of the text body.
2015-01-07 22:25:24 +01:00
Jens Rantil
fee650b4b0
one less command to get started when bootstrapping
2015-01-07 21:41:19 +01:00
Thomas Jackson
fb7e5630d8
Comma cleanup
2014-12-12 11:39:40 -08: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
Nitin Madhok
d2685b8fa2
Fixing sphinx errors
2014-12-08 11:18:12 -05:00
Seth House
75ef72b7fb
Merge pull request #18523 from saltstack/revert-18148-six_docs_build
...
Revert "[don't merge!!] Add six dependency notice to building docs intru...
2014-11-26 16:19:42 -07:00
T.J. Yang
a6535cf37d
makefile update at Wed Nov 26 16:21:18 CST 2014
2014-11-26 16:21:18 -06:00
Nicole Thomas
e1157d13be
Revert "[don't merge!!] Add six dependency notice to building docs intructions"
2014-11-26 12:23:13 -07:00
rallytime
4660a04d30
Add six dep to build the docs in hacking doc
2014-11-17 13:17:37 -07:00
Sylvain Bellemare
9f6ecc4874
Removed duplicate occurrences of the word "the"
2014-08-11 16:05:29 +02:00
Erik Johnson
67df3a9db4
Fix code-block
...
This is another fix to make the docs more accurate with the new sphinx
theme.
2014-07-05 22:51:05 -05:00
Erik Johnson
a76747f780
Split up contributing/development docs
...
This page has become massive and merits being split into two pages.
Also, it affords the opportunity of getting rid of an ambiguous header
name that causes confusion.
Fixes #10830 .
2014-04-22 17:25:58 -05:00
Mike Place
4893b046cb
A note about cherry-picking
2014-04-09 09:26:28 -06:00
Erik Johnson
645ac140c0
Add information on yum-utils requirement for yum pkg mgmt
2014-03-05 12:09:07 -06:00
Mike Place
6af7ff5dff
First pass at refactoring Salt documentation.
2014-02-26 13:31:11 -07:00
