From bf6994c484daa2d3a51bbe79d77736d9e501874f Mon Sep 17 00:00:00 2001 From: Derek Murphy Date: Tue, 27 Jun 2017 17:32:17 -0400 Subject: [PATCH 1/2] Proofread of new text #2620 Added a comma and a couple new words. Looks good! --- doc/sphinx-guides/source/installation/prerequisites.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index 4288d5fb2d0..1829c6396e8 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -78,7 +78,7 @@ Adjust this :download:`Glassfish init script <../_static/installation/files/etc/ It is not necessary to have Glassfish running before you execute the Dataverse installation script because it will start Glassfish for you. -Please note that you must run Glassfish in an English locale. If you are using something like ``LANG=de_DE.UTF-8`` ingest of tabular data will fail with "RoundRoutines:decimal separator no in right place". +Please note that you must run Glassfish in an English locale. If you are using something like ``LANG=de_DE.UTF-8``, ingest of tabular data will fail with the message "RoundRoutines:decimal separator no in right place". PostgreSQL ---------- From 66c30c7f17b3a03575ab7a69e0c017ba0dde81a6 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Tue, 27 Jun 2017 21:34:00 -0400 Subject: [PATCH 2/2] An API token is sometimes called a key #1293 --- doc/sphinx-guides/source/api/intro.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/api/intro.rst b/doc/sphinx-guides/source/api/intro.rst index d2f6c4e2487..a9543dff0a5 100755 --- a/doc/sphinx-guides/source/api/intro.rst +++ b/doc/sphinx-guides/source/api/intro.rst @@ -21,7 +21,7 @@ We use the term "native" to mean that the API is not based on any standard. For Authentication -------------- -Most Dataverse APIs require the use of an API token. Instructions for getting a token are described in the :doc:`/user/account` section of the User Guide. +Most Dataverse APIs require the use of an API token. (In code we sometimes call it a "key" because it's shorter.) Instructions for getting a token are described in the :doc:`/user/account` section of the User Guide. There are two ways to pass your API token to Dataverse APIs. The preferred method is to send the token in the ``X-Dataverse-key`` HTTP header, as in the following curl example::