~final QA updates

doc/release-notes/7440-multilicense.md

@@ -121,5 +121,6 @@ With the change to support multiple licenses, which can include cases where CC0
 - Schema.org metadata in page headers and the Schema.org json-ld metadata export now reference the license via URL (which should avoid the current warning from Google about an invalid license object in the page metadata)
 - Metadata exports and import methods (including Sword) use either the license name (e.g. in the JSON export) or URL (e.g. in the OAI_ORE export) rather than a hardcoded value of "CC0" or "CC0 Waiver" currently (if the CC0 license is available, it's default name would be "CC0 1.0")
 - API calls (e.g. for import, migrate) that specify both a license and custom terms will be considered an error, as would having no license and an empty/blank value for Terms of Use
+- Rollback. In general one should not deploy an earlier release over a database that has been modified by deployment of a later release. (Make a db backup before upgrading and use that copy if you go back to a prior version.) Due to the nature of the db changes in this release, attempts to deploy an earlier version of Dataverse will fail unless the database is also restored to it's pre-release state.
 
 Also note that, since CC0 Waiver is no longer a hardcoded option, text strings reference it have been edited or removed from Bundle.properties. This means that the ability to provide translations of the CC0 license name/description has been removed. The initial release of multiple license functionality doesn't include an alternative mechanism to provide translations of license names/descriptions, so this is a regression in capability. (The instructions and help information about license and terms remains internationalizable, it is only the name/description of the licenses themselves that cannot yet be translated).

doc/sphinx-guides/source/api/native-api.rst

@@ -3750,16 +3750,16 @@ Superusers can change whether an existing license is active (usable for new data
 .. code-block:: bash
 
   export STATE=true
-  curl -X PUT -H 'Content-Type: application/json' --data-binary @edit-license.json $SERVER_URL/api/licenses/$ID/:active/$STATE
+  curl -X PUT -H 'Content-Type: application/json' -H X-Dataverse-key:$API_TOKEN $SERVER_URL/api/licenses/$ID/:active/$STATE
 
 Superusers can set which license is the default specified by the license ``$ID``:
 
 .. code-block:: bash
 
-  curl -X PUT -H 'Content-Type: application/json' --data-binary @edit-license.json $SERVER_URL/api/licenses/default/$ID
+  curl -X PUT -H 'Content-Type: application/json' -H X-Dataverse-key:$API_TOKEN --data-binary @edit-license.json $SERVER_URL/api/licenses/default/$ID
 
 Superusers can delete a license that is not in useby the license ``$ID``:
 
 .. code-block:: bash
 
-  curl -X DELETE http://$SERVER/api/licenses/$ID
+  curl -X DELETE -H X-Dataverse-key:$API_TOKEN $SERVER_URL/api/licenses/$ID

src/main/webapp/dataset.xhtml

@@ -1690,7 +1690,7 @@
                                             target="_blank">#{DatasetUtil:getLicenseName(DatasetPage.workingVersion)}
                                         </a>
                                         <ui:fragment
-                                            rendered="#{empty workingVersion.termsOfUseAndAccess.license}">
+                                            rendered="#{empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
                                             <h:outputText
                                                 value="#{bundle['file.dataFilesTab.terms.list.license.customterms.txt']}"
                                                 escape="false" />