Commit Graph

32 Commits

Author SHA1 Message Date
Jacob Hammons
1c8b32ce26 Updated windows software repository docs 2015-10-01 22:02:01 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
twangboy
a996ea46e2 Added quotes to version numbers example
Fixes #27433
2015-09-28 12:52:59 -06:00
Erik Johnson
415c001a38 Add link to winrepo.update_git_repos runner function for consistency. 2015-09-09 09:04:52 -05:00
Erik Johnson
1dd77e7003 Fix misspelled word 2015-09-09 09:02:55 -05:00
Erik Johnson
d05e7b0875 Add information on winrepo cachedir name overrides 2015-09-09 05:44:15 -05:00
Erik Johnson
a45bb90230 Remove block describing hashed winrepo cachedirs
The behavior has now changed so this information is inaccurate.
2015-09-09 05:44:15 -05:00
twangboy
020b20ec41 Correctly detect packages with no version, docs 2015-08-24 17:52:30 -06:00
Pedro Algarvio
2f9b40ca25 Merge pull request #26577 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-23 08:14:04 +01:00
Colton Myers
667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/renderers/gpg.py
    tests/integration/loader/loader.py
2015-08-21 16:44:59 -06:00
Calle Pettersson
94ff4cff40 Doc-fix: Escape backslash in domain\username
The unescaped backslash in "mydomain\username" makes it appear like "mydomainusername", slightly confusing the documentation.
2015-08-21 09:44:20 -06:00
Erik Johnson
9852bedda2 Tweak wording a bit 2015-08-21 03:04:41 -05:00
Erik Johnson
fff709da81 Add a bunch more documentation for winrepo 2015-08-21 02:39:34 -05:00
Erik Johnson
dbeffe4944 Point git_pillar reference in winrepo documentation at a valid ref 2015-08-19 15:24:30 -05:00
TheBigBear
e57dc520f6 minor edits
lowercasing firefox as it's sls pkg name has been lowercased,
and fix one typo reops -> repos
2015-08-18 18:11:44 +01:00
Erik Johnson
a7623b73ee Add notes about new features and deprecated option names 2015-08-09 17:42:13 -05:00
Erik Johnson
f5fd2729c2 Add ref to winrepo docs 2015-08-09 17:42:12 -05:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
2015-08-03 14:50:50 -06:00
TheBigBear
c994d22696 Minor update to msi un-installer info
The ```uninstaller`` string can be either the windows GUID (aka msi prodcut code) OR the URL to the msi file. Both options work to uninstall a msi installed software.
2015-07-31 16:31:33 +01:00
TheBigBear
0d33bae104 Update 7-zip msi un-installer instructions
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
2015-07-30 17:24:04 -06:00
TheBigBear
333fbdde30 Update 7-zip msi un-installer instructions
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
2015-07-30 17:21:45 -06:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
David Boucha
99d2fd109a update docs to reflect new win rep changes 2015-06-26 09:58:47 -06:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
Alexander Backlund
e5c59deab3 added support for multiple source files in windows repo to fix saltstack/salt#9028 2015-01-22 11:55:33 -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
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
Seth House
c87aa30c03 Misc rST fixes 2014-04-18 15:12:18 -06:00
Samuel Lai
a85136d0b8 Added page documenting Windows-specific behaviour. 2014-04-14 23:12:27 +10:00
Oz Nahum
86baf5bb53 Improve windows-package-manager documentation
Fix for issue #10234
2014-03-04 14:08:52 +01:00
Mike Place
a559f5a114 Moving around Windows docs. 2014-02-26 13:32:33 -07:00