Merge pull request #2948 from jcbagneris/devel

Fixes in apt module doc: typos, examples
reviewable/pr18780/r1
Michael DeHaan 12 years ago
commit 47675caab5

@ -85,19 +85,19 @@ options:
requirements: [ python-apt, aptitude ] requirements: [ python-apt, aptitude ]
author: Matthew Williams author: Matthew Williams
notes: notes:
- Two of the upgrade modes (C(full) and C(dist)) require C(aptitude), otherwise - Three of the upgrade modes (C(full), C(safe) and its alias C(yes)) require C(aptitude), otherwise
C(apt-get) suffices. C(apt-get) suffices.
examples: examples:
- code: "apt: pkg=foo update_cache=yes" - code: "apt: pkg=foo update_cache=yes"
description: Update repositories cache and install C(foo) package description: Update repositories cache and install C(foo) package
- code: "apt: pkg=foo state=removed" - code: "apt: pkg=foo state=absent"
description: Remove C(foo) package description: Remove C(foo) package
- code: "apt: pkg=foo state=installed" - code: "apt: pkg=foo state=present"
description: Install the package C(foo) description: Install the package C(foo)
- code: "apt: pkg=foo=1.00 state=installed" - code: "apt: pkg=foo=1.00 state=present"
description: Install the version '1.00' of package C(foo) description: Install the version '1.00' of package C(foo)
- code: "apt: pkg=nginx state=latest default_release=squeeze-backports update_cache=yes" - code: "apt: pkg=nginx state=latest default_release=squeeze-backports update_cache=yes"
description: Update the repository cache and update package C(ngnix) to latest version using default release C(squeeze-backport) description: Update the repository cache and update package C(nginx) to latest version using default release C(squeeze-backport)
- code: "apt: pkg=openjdk-6-jdk state=latest install_recommends=no" - code: "apt: pkg=openjdk-6-jdk state=latest install_recommends=no"
description: Install latest version of C(openjdk-6-jdk) ignoring C(install-reccomends) description: Install latest version of C(openjdk-6-jdk) ignoring C(install-reccomends)
- code: "apt: upgrade=dist" - code: "apt: upgrade=dist"

Loading…
Cancel
Save