Merge remote-tracking branch 'kalikaneko/doc-fixes' into develop

.gitignore

@@ -38,6 +38,8 @@ nosetests.xml
 .\#*
 \#*\#
 *~
+*.swp
+*.swo
 
 # tags
 TAGS

README

@@ -36,19 +36,18 @@ and import the module like so:
 The primary interface class you'll likely want to interact with is
 [```gnupg.GPG```](https://python-gnupg.readthedocs.org/en/latest/gnupg.html#gpg):
 ```
->>> gpg = gnupg.GPG(gpgbinary='/usr/bin/gpg',
-...     gpghome='./keys',
-...     pubring='pubring.gpg',
+>>> gpg = gnupg.GPG(binary='/usr/bin/gpg',
+...     homedir='./keys',
+...     keyring='pubring.gpg',
 ...     secring='secring.gpg')
->>> batch_key_input = gpg.gen_key_input()
+>>> batch_key_input = gpg.gen_key_input(
+...     key_type='RSA',
+...     key_length=4096)
 >>> print batch_key_input
 Key-Type: RSA
 Name-Email: isis@wintermute
-Name-Comment: Generated by gnupg.py
 Key-Length: 4096
 Name-Real: Autogenerated Key
-%pubring /home/isis/code/python-gnupg/keys/pubring.gpg
-%secring /home/isis/code/python-gnupg/keys/secring.gpg
 %commit
 
 >>> key = gpg.gen_key(batch_key_input)

examples/make-8192-bit-key.py

@@ -12,9 +12,10 @@ from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import os
 import logging
+
 import gnupg
-import sys
 
 from gnupg import _logger