aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-09-14 18:24:20 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2018-09-14 18:24:20 -0400
commitedfedc135cbce685e96e7386654e99eb1c43362b (patch)
treea58ceae245d08c5159827888c4018e06939657c6 /docs/hazmat
parent7700251f26c39c38dbf2be8924be46fec08ac2cb (diff)
downloadcryptography-edfedc135cbce685e96e7386654e99eb1c43362b.tar.gz
cryptography-edfedc135cbce685e96e7386654e99eb1c43362b.tar.bz2
cryptography-edfedc135cbce685e96e7386654e99eb1c43362b.zip
a few docs fixes and language improvements (#4472)
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/primitives/asymmetric/ec.rst2
-rw-r--r--docs/hazmat/primitives/twofactor.rst12
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/hazmat/primitives/asymmetric/ec.rst b/docs/hazmat/primitives/asymmetric/ec.rst
index ab781e92..226dea8c 100644
--- a/docs/hazmat/primitives/asymmetric/ec.rst
+++ b/docs/hazmat/primitives/asymmetric/ec.rst
@@ -455,7 +455,7 @@ Key Interfaces
.. attribute:: name
- :type: string
+ :type: str
The name of the curve. Usually the name used for the ASN.1 OID such as
``secp256k1``.
diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst
index 3b4f3961..b48db599 100644
--- a/docs/hazmat/primitives/twofactor.rst
+++ b/docs/hazmat/primitives/twofactor.rst
@@ -212,7 +212,7 @@ similar to the following code.
:param account_name: The display name of account, such as
``'Alice Smith'`` or ``'alice@example.com'``.
- :type: :term:`text`
+ :type account_name: :term:`text`
:param issuer: The optional display name of issuer. This is typically
the provider or service the user wants to access using the OTP
token.
@@ -222,11 +222,11 @@ similar to the following code.
Provisioning URI
~~~~~~~~~~~~~~~~
-The provisioning URI of HOTP and TOTP is not actual the part of RFC 4226 and
-RFC 6238, but a `spec of Google Authenticator`_. It is widely supported by web
-sites and mobile applications which are using Two-Factor authentication.
+The provisioning URI of HOTP and TOTP is a `feature of Google Authenticator`_
+and not actually part of the HOTP or TOTP RFCs. However, it is widely supported
+by web sites and mobile applications which are using Two-Factor authentication.
-For generating a provisioning URI, you could use the ``get_provisioning_uri``
+For generating a provisioning URI you can use the ``get_provisioning_uri``
method of HOTP/TOTP instances.
.. code-block:: python
@@ -241,5 +241,5 @@ method of HOTP/TOTP instances.
A common usage is encoding the provisioning URI into QR code and guiding users
to scan it with Two-Factor authentication applications in their mobile devices.
-.. _`spec of Google Authenticator`: https://github.com/google/google-authenticator/wiki/Key-Uri-Format
+.. _`feature of Google Authenticator`: https://github.com/google/google-authenticator/wiki/Key-Uri-Format
.. _`Issue #2915`: https://github.com/pyca/cryptography/issues/2915