diff --git a/reference/gnupg/functions/gnupg-decryptverify.xml b/reference/gnupg/functions/gnupg-decryptverify.xml index f0c223bfe8..ee344f28fc 100644 --- a/reference/gnupg/functions/gnupg-decryptverify.xml +++ b/reference/gnupg/functions/gnupg-decryptverify.xml @@ -1,5 +1,5 @@ - + gnupg_decryptverify @@ -15,17 +15,17 @@ role="reference">stringplaintext - Decrypts and verifies a given text and returns informations about the + Decrypts and verifies a given text and returns information about the signature. - The parameter plaintext gets filled with the decrypted + The parameter plaintext gets filled with the decrypted text. &reftitle.returnvalues; - On success, this function returns informations about the signature and - fills plaintext with the decrypted text. + On success, this function returns information about the signature and + fills the plaintext parameter with the decrypted text. On failure, this function returns &false;. diff --git a/reference/gnupg/functions/gnupg-encrypt.xml b/reference/gnupg/functions/gnupg-encrypt.xml index 29ba827562..28878e1b5f 100644 --- a/reference/gnupg/functions/gnupg-encrypt.xml +++ b/reference/gnupg/functions/gnupg-encrypt.xml @@ -1,5 +1,5 @@ - + gnupg_encrypt @@ -13,7 +13,8 @@ stringplaintext - Encrypts the given plaintext with the keys, which were set with plaintext with the keys, which + were set with gnupg_addencryptkey before and returns the encrypted text. diff --git a/reference/gnupg/functions/gnupg-encryptsign.xml b/reference/gnupg/functions/gnupg-encryptsign.xml index 690b920ffb..67f6e4fd16 100644 --- a/reference/gnupg/functions/gnupg-encryptsign.xml +++ b/reference/gnupg/functions/gnupg-encryptsign.xml @@ -1,5 +1,5 @@ - + gnupg_encryptsign @@ -13,7 +13,8 @@ stringplaintext - Encrypts and signs the given plaintext with the keys, which were set with + Encrypts and signs the given plaintext with the + keys, which were set with gnupg_addsignkey and gnupg_addencryptkey before and returns the encrypted and signed text. diff --git a/reference/gnupg/functions/gnupg-export.xml b/reference/gnupg/functions/gnupg-export.xml index 822bf5a938..a039e8f8a1 100644 --- a/reference/gnupg/functions/gnupg-export.xml +++ b/reference/gnupg/functions/gnupg-export.xml @@ -1,5 +1,5 @@ - + gnupg_export @@ -13,7 +13,7 @@ stringfingerprint - Exports the key fingerprint + Exports the key fingerprint. diff --git a/reference/gnupg/functions/gnupg-import.xml b/reference/gnupg/functions/gnupg-import.xml index 1aab352b76..77e35b44fe 100644 --- a/reference/gnupg/functions/gnupg-import.xml +++ b/reference/gnupg/functions/gnupg-import.xml @@ -1,5 +1,5 @@ - + gnupg_import @@ -13,8 +13,8 @@ stringkeydata - Iports the key keydata and returns an array with - informations about the importprocess. + Imports the key keydata and returns an array with + information about the importprocess. diff --git a/reference/gnupg/functions/gnupg-keyinfo.xml b/reference/gnupg/functions/gnupg-keyinfo.xml index 4c396c563d..2b37e5be89 100644 --- a/reference/gnupg/functions/gnupg-keyinfo.xml +++ b/reference/gnupg/functions/gnupg-keyinfo.xml @@ -1,9 +1,9 @@ - + gnupg_keyinfo - returns an array with informations about all keys that matches + returns an array with information about all keys that matches the given pattern @@ -17,7 +17,7 @@ &reftitle.returnvalues; - returns an array with informations about all keys that matches the given + Returns an array with information about all keys that matches the given pattern or &false;, if an error has occured. diff --git a/reference/gnupg/functions/gnupg-setarmor.xml b/reference/gnupg/functions/gnupg-setarmor.xml index b105014b29..5ad6686f09 100644 --- a/reference/gnupg/functions/gnupg-setarmor.xml +++ b/reference/gnupg/functions/gnupg-setarmor.xml @@ -1,5 +1,5 @@ - + gnupg_setarmor @@ -34,7 +34,7 @@ ]]> diff --git a/reference/gnupg/functions/gnupg-setsignmode.xml b/reference/gnupg/functions/gnupg-setsignmode.xml index 34c229a0c3..634d36c430 100644 --- a/reference/gnupg/functions/gnupg-setsignmode.xml +++ b/reference/gnupg/functions/gnupg-setsignmode.xml @@ -1,5 +1,5 @@ - + gnupg_setsignmode @@ -13,7 +13,7 @@ intsignmode - signmode is a constant indicating what type of + signmode takes a constant indicating what type of signature should be produced. The possible values are GNUPG_SIG_MODE_NORMAL, GNUPG_SIG_MODE_DETACH and GNUPG_SIG_MODE_CLEAR. By default GNUPG_SIG_MODE_CLEAR is used. diff --git a/reference/gnupg/functions/gnupg-sign.xml b/reference/gnupg/functions/gnupg-sign.xml index dba901287a..344d3169e6 100644 --- a/reference/gnupg/functions/gnupg-sign.xml +++ b/reference/gnupg/functions/gnupg-sign.xml @@ -1,5 +1,5 @@ - + gnupg_sign @@ -13,16 +13,17 @@ stringplaintext - Signs the given plaintext with the keys, which were set with plaintext with the keys, which were + set with gnupg_addsignkey before and returns the signed text or the signature, depending on what was set with - gnupg_setsignmode + gnupg_setsignmode. &reftitle.returnvalues; - On success, this function returns the signed text/ the signature. + On success, this function returns the signed text or the signature. On failure, this function returns &false;. diff --git a/reference/gnupg/functions/gnupg-verify.xml b/reference/gnupg/functions/gnupg-verify.xml index 2f91239545..6a74847eb5 100644 --- a/reference/gnupg/functions/gnupg-verify.xml +++ b/reference/gnupg/functions/gnupg-verify.xml @@ -1,5 +1,5 @@ - + gnupg_verify @@ -16,11 +16,11 @@ choice="opt" role="reference">stringplaintext - Verifies the given signed_text and returns informations about the + Verifies the given signed_text and returns information about the signature. To verify a clearsigned text, set signature to &false;. - If the optional parameter plaintext is passed, it is - filled with the plaintext. + If the optional parameter plaintext is passed, it is + filled with the plaintext. diff --git a/reference/gnupg/reference.xml b/reference/gnupg/reference.xml index 9283796ec5..c739196d70 100644 --- a/reference/gnupg/reference.xml +++ b/reference/gnupg/reference.xml @@ -1,5 +1,5 @@ - + @@ -40,7 +40,7 @@ This extension makes use of the keyring of the current user. This keyring is normaly located in ~./.gnupg/. To specify a custom location, store the path to the keyring in the - enviroment variable GNUPGHOME. See putenv for more information how to do this. @@ -82,7 +82,7 @@ foreach($iterator as $fingerprint => $userid){