Skip to content

Commit

Permalink
Merge branch '3614-user-list' of github.com:IQSS/dataverse into 3614-…
Browse files Browse the repository at this point in the history
…user-list
  • Loading branch information
raprasad committed Jun 28, 2017
2 parents f1166a7 + 66c30c7 commit 2594f40
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/api/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/installation/prerequisites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------
Expand Down

0 comments on commit 2594f40

Please sign in to comment.