Spelling fix
Merge pull request #14792 from cachedout/doc_spell

Spelling fix
catch exception for crypt module on windows
i can't computer
Update 'doc/.tx/config' - Build #136

  http://cookingwithsalt.org/job/salt/job/transifex/136/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge pull request #14801 from s0undt3ch/hotfix/transifex-updates

Update 'doc/.tx/config' - Build #136
Merge pull request #14800 from saltstack/bp-14773

Backport #14773 to 2014.7
remove grep and use rev-parse
expect head instead of an empty string branches

If the branch is detached, git rev-parse will return HEAD, instead of an
empty string.
Dont set upstream if ref is HEAD

If the ref is HEAD, the we should be in a detached HEAD, and thus don't
have a remote, so there is no point in setting this.
Simplify `user.list_users` on Windows

 - 'None' is simplier than 'localhost' and coherent with `module.win_file`
 - Level 0 is enough as we just need the username
 - Remove useless log
Use win32 API to get user info in `user.info`

Issue #14679: Calling `net user <name>` and parsing it is broken
on non-English Windows because the output is i18nized.
Improve `user.info` output on Windows

 - Add 'uid' information
 - Use it to get userprofile from registry
 - Fallback 'home' to 'profile' if not set
Improve `user.getent` on Windows

 - Call `user.list_users` instead of duplicating the behavior
 - Get 'uid' directly from `user.version` result
Fix manage.versions runner to use salt's version parser

Fixes #14788
Fix display of minion versions
Use the master_version object to make sure formatting matches
Merge pull request #14803 from saltstack/bp-14774

Backport #14774 to 2014.7
Merge pull request #14804 from saltstack/bp-14694

Backport #14694 to 2014.7
Merge pull request #14805 from basepi/manageversions14788

Fix manage.versions version comparison