From ab0538b11416ac4d2557661cfdd4fafbaaf59bca Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Wed, 17 Apr 2019 10:01:55 -0400
Subject: [PATCH 01/13] trigger jenkins

---
 test | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test

diff --git a/test b/test
new file mode 100644
index 00000000000..e69de29bb2d

From e68ec009a4b91ef225c57591649273837e50d59c Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Wed, 17 Apr 2019 10:06:06 -0400
Subject: [PATCH 02/13] trigger jenkins

---
 test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test b/test
index e69de29bb2d..180cf832802 100644
--- a/test
+++ b/test
@@ -0,0 +1 @@
+test2

From 8e8c41113f3accf6ad3aa678d3ae92f86625ca7b Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Wed, 17 Apr 2019 10:09:03 -0400
Subject: [PATCH 03/13] trigger jenkins

---
 test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test b/test
index 180cf832802..df6b0d2bcc7 100644
--- a/test
+++ b/test
@@ -1 +1 @@
-test2
+test3

From bcb30ee95864a7e9a33b210cbe6d5910de1aa2e3 Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Wed, 17 Apr 2019 10:11:46 -0400
Subject: [PATCH 04/13] trigger jenkins

---
 test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test b/test
index df6b0d2bcc7..d234c5e057f 100644
--- a/test
+++ b/test
@@ -1 +1 @@
-test3
+test4

From 32cac589ace4e15be38bb1b309bdbd0bfc9894b9 Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Wed, 17 Apr 2019 10:21:46 -0400
Subject: [PATCH 05/13] trigger jenkins

---
 test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test b/test
index d234c5e057f..4f346f1ad5b 100644
--- a/test
+++ b/test
@@ -1 +1 @@
-test4
+test5

From a3acc48f65dba118ce8b31b26dfe1378233f640d Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Wed, 17 Apr 2019 10:25:10 -0400
Subject: [PATCH 06/13] trigger jenkins

---
 test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test b/test
index 4f346f1ad5b..8390c32b5e6 100644
--- a/test
+++ b/test
@@ -1 +1 @@
-test5
+test6

From e5f2dc1899c7685b20384676e68852417004bdb7 Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Tue, 21 May 2019 10:42:25 -0400
Subject: [PATCH 07/13] flyway hotfix

---
 .../resources/db/migration/V4.14.0.1__5822-export-var-meta.sql  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql b/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
index 7c43ac29d4d..e65f52c7c91 100644
--- a/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
+++ b/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
@@ -1,2 +1,2 @@
 ALTER TABLE variablemetadata
-ADD COLUMN postquestion text;
+ADD COLUMN IF NOT EXISTS postquestion text;

From 8d4cea06229f01860e2071a927026dd1991cf703 Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Tue, 21 May 2019 10:59:16 -0400
Subject: [PATCH 08/13] remove errant test file

---
 test | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 test

diff --git a/test b/test
deleted file mode 100644
index 8390c32b5e6..00000000000
--- a/test
+++ /dev/null
@@ -1 +0,0 @@
-test6

From c5b52d6fa14bc46fee685d7abc3d77935d14e58d Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Tue, 21 May 2019 14:55:24 -0400
Subject: [PATCH 09/13] update Create-a-Dataverse documentation

---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 94c74c1b9d5..f24541e2e3c 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -23,7 +23,7 @@ Create a Dataverse
 Generates a new dataverse under ``$id``. Expects a JSON content describing the dataverse, as in the example below.
 If ``$id`` is omitted, a root dataverse is created. ``$id`` can either be a dataverse id (long) or a dataverse alias (more robust). ::
 
-    POST http://$SERVER/api/dataverses/$id?key=$apiKey
+``curl -H "X-Dataverse-key:$API_TOKEN" http://$SERVER/api/dataverses/$id --upload-file sample.json``
 
 Download the :download:`JSON example <../_static/api/dataverse-complete.json>` file and modified to create dataverses to suit your needs. The fields ``name``, ``alias``, and ``dataverseContacts`` are required. The controlled vocabulary for ``dataverseType`` is
 

From f2b67b5b2fd19487d0aaff1644b641c756f159ca Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Tue, 21 May 2019 15:05:13 -0400
Subject: [PATCH 10/13] Revert "flyway hotfix"

This reverts commit e5f2dc1899c7685b20384676e68852417004bdb7.

Artifact from an earlier PR, shouldn't be in #5198
---
 .../resources/db/migration/V4.14.0.1__5822-export-var-meta.sql  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql b/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
index e65f52c7c91..7c43ac29d4d 100644
--- a/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
+++ b/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
@@ -1,2 +1,2 @@
 ALTER TABLE variablemetadata
-ADD COLUMN IF NOT EXISTS postquestion text;
+ADD COLUMN postquestion text;

From 8305646bd1c794374eb74fc94f8ac8a8202e5675 Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Tue, 21 May 2019 16:27:22 -0400
Subject: [PATCH 11/13] edits per phil

---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index f24541e2e3c..1d90b6c47e1 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -23,7 +23,7 @@ Create a Dataverse
 Generates a new dataverse under ``$id``. Expects a JSON content describing the dataverse, as in the example below.
 If ``$id`` is omitted, a root dataverse is created. ``$id`` can either be a dataverse id (long) or a dataverse alias (more robust). ::
 
-``curl -H "X-Dataverse-key:$API_TOKEN" http://$SERVER/api/dataverses/$id --upload-file sample.json``
+``curl -H "X-Dataverse-key:$API_TOKEN" -X POST $SERVER_URL/api/dataverses/$id --upload-file dataverse-complete.json``
 
 Download the :download:`JSON example <../_static/api/dataverse-complete.json>` file and modified to create dataverses to suit your needs. The fields ``name``, ``alias``, and ``dataverseContacts`` are required. The controlled vocabulary for ``dataverseType`` is
 

From 453a4e5d12d678a5ce6a08f507d06882225a0dbc Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 21 May 2019 19:08:02 -0400
Subject: [PATCH 12/13] clarify $id #5865 #5198 #3533

---
 doc/sphinx-guides/source/api/native-api.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 1d90b6c47e1..0287e0d1dff 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -21,7 +21,9 @@ Create a Dataverse
 ~~~~~~~~~~~~~~~~~~
 
 Generates a new dataverse under ``$id``. Expects a JSON content describing the dataverse, as in the example below.
-If ``$id`` is omitted, a root dataverse is created. ``$id`` can either be a dataverse id (long) or a dataverse alias (more robust). ::
+If ``$id`` is omitted, a root dataverse is created. ``$id`` can either be a dataverse id (long) or a dataverse alias (more robust). In the example below, "root" is the id, which means that the dataverse will be created as a child of the root dataverse::
+
+``export id=root`
 
 ``curl -H "X-Dataverse-key:$API_TOKEN" -X POST $SERVER_URL/api/dataverses/$id --upload-file dataverse-complete.json``
 

From d9f50d3d7e8969cf8b601665597b9360f4ea5d21 Mon Sep 17 00:00:00 2001
From: donsizemore <don.sizemore@gmail.com>
Date: Tue, 21 May 2019 10:42:25 -0400
Subject: [PATCH 13/13] flyway hotfix

---
 .../resources/db/migration/V4.14.0.1__5822-export-var-meta.sql  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql b/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
index 7c43ac29d4d..e65f52c7c91 100644
--- a/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
+++ b/src/main/resources/db/migration/V4.14.0.1__5822-export-var-meta.sql
@@ -1,2 +1,2 @@
 ALTER TABLE variablemetadata
-ADD COLUMN postquestion text;
+ADD COLUMN IF NOT EXISTS postquestion text;