Fixing typos, many examples in here still don't work (ex. salt -t 15 …

…'*' gpg.create_key throws errors), but some low hanging fruit is fixed.
saltstack · Feb 9, 2016 · 271c446 · 271c446
1 parent 7dafc6d
commit 271c446
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/doc/man/salt.7 b/doc/man/salt.7
@@ -106738,7 +106738,7 @@ CLI Example:
 .ft C
 salt \(aq*\(aq gpg.decrypt filename=\(aq/path/to/important.file.gpg\(aq
 
-salt \(aq*\(aq gpg.decrypt filename=\(aq/path/to/important.file.gpg\(aq use_pasphrase=True
+salt \(aq*\(aq gpg.decrypt filename=\(aq/path/to/important.file.gpg\(aq use_passphrase=True
 .ft P
 .fi
 .UNINDENT
@@ -106833,7 +106833,7 @@ salt \(aq*\(aq gpg.encrypt text=\(aqHello there.  How are you?\(aq
 
 salt \(aq*\(aq gpg.encrypt filename=\(aq/path/to/important.file\(aq
 
-salt \(aq*\(aq gpg.encrypt filename=\(aq/path/to/important.file\(aq use_pasphrase=True
+salt \(aq*\(aq gpg.encrypt filename=\(aq/path/to/important.file\(aq use_passphrase=True
 .ft P
 .fi
 .UNINDENT
@@ -106871,7 +106871,7 @@ salt \(aq*\(aq gpg.export_key keyids=3FAD9F1E
 
 salt \(aq*\(aq gpg.export_key keyids=3FAD9F1E secret=True
 
-salt \(aq*\(aq gpg.export_key keyid="[\(aq3FAD9F1E\(aq,\(aq3FBD8F1E\(aq]" user=username
+salt \(aq*\(aq gpg.export_key keyids="[\(aq3FAD9F1E\(aq,\(aq3FBD8F1E\(aq]" user=username
 .ft P
 .fi
 .UNINDENT
@@ -107141,7 +107141,7 @@ salt \(aq*\(aq gpg.sign text=\(aqHello there.  How are you?\(aq
 
 salt \(aq*\(aq gpg.sign filename=\(aq/path/to/important.file\(aq
 
-salt \(aq*\(aq gpg.sign filename=\(aq/path/to/important.file\(aq use_pasphrase=True
+salt \(aq*\(aq gpg.sign filename=\(aq/path/to/important.file\(aq use_passphrase=True
 .ft P
 .fi
 .UNINDENT
@@ -107213,7 +107213,7 @@ salt \(aq*\(aq gpg.verify text=\(aqHello there.  How are you?\(aq
 
 salt \(aq*\(aq gpg.verify filename=\(aq/path/to/important.file\(aq
 
-salt \(aq*\(aq gpg.verify filename=\(aq/path/to/important.file\(aq use_pasphrase=True
+salt \(aq*\(aq gpg.verify filename=\(aq/path/to/important.file\(aq use_passphrase=True
 .ft P
 .fi
 .UNINDENT

diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py
@@ -724,7 +724,7 @@ def export_key(keyids=None, secret=False, user=None, gnupghome=None):
 
         salt '*' gpg.export_key keyids=3FAD9F1E secret=True
 
-        salt '*' gpg.export_key keyid="['3FAD9F1E','3FBD8F1E']" user=username
+        salt '*' gpg.export_key keyids="['3FAD9F1E','3FBD8F1E']" user=username
 
     '''
     gpg = _create_gpg(user, gnupghome)
@@ -921,7 +921,7 @@ def sign(user=None,
 
         salt '*' gpg.sign filename='/path/to/important.file'
 
-        salt '*' gpg.sign filename='/path/to/important.file' use_pasphrase=True
+        salt '*' gpg.sign filename='/path/to/important.file' use_passphrase=True
 
     '''
     gpg = _create_gpg(user, gnupghome)
@@ -982,7 +982,7 @@ def verify(text=None,
 
         salt '*' gpg.verify filename='/path/to/important.file'
 
-        salt '*' gpg.verify filename='/path/to/important.file' use_pasphrase=True
+        salt '*' gpg.verify filename='/path/to/important.file' use_passphrase=True
 
     '''
     gpg = _create_gpg(user)
@@ -1058,7 +1058,7 @@ def encrypt(user=None,
 
         salt '*' gpg.encrypt filename='/path/to/important.file'
 
-        salt '*' gpg.encrypt filename='/path/to/important.file' use_pasphrase=True
+        salt '*' gpg.encrypt filename='/path/to/important.file' use_passphrase=True
 
     '''
     ret = {
@@ -1151,7 +1151,7 @@ def decrypt(user=None,
 
         salt '*' gpg.decrypt filename='/path/to/important.file.gpg'
 
-        salt '*' gpg.decrypt filename='/path/to/important.file.gpg' use_pasphrase=True
+        salt '*' gpg.decrypt filename='/path/to/important.file.gpg' use_passphrase=True
 
 
     '''