Update branch

README.md

@@ -12,19 +12,7 @@ The University of Alabama Libraries Scholarly API Cookbook is an open online boo
 
 ## License and Reuse
 
-Most of the code in this repository is licensed under the [MIT License](https://github.com/UA-Libraries-Research-Data-Services/UALIB_ScholarlyAPI_Cookbook/blob/main/LICENSE).
-
-The Python scripts in this repository are licensed under the MIT License. However, these scripts may rely on external libraries such as matplotlib, pandas, and others. These libraries are licensed under their own respective terms and need to be installed separately. Refer to the documentation of each library for installation instructions and licensing details.
-
-Most of the R tutorial scripts are MIT licensed, but some are licensed under the [GPL-3 License](https://github.com/UA-Libraries-Research-Data-Services/UALIB_ScholarlyAPI_Cookbook/blob/main/LICENSE_selected_R_tutorials) because they depend on GPL-licensed R libraries (refer to the documentation of each R library for installation instructions and licensing details). The R tutorials with GPL-3 licenses are indicated at the top of the respective files and organized separately in the `src/r-gpl3/` folder.
-
-Lastly, the Bash tutorials are licensed under the MIT License (Bash itself is licensed under the GNU General Public License). Some of the included scripts may rely on external tools such as curl, jq, YAZ, and gnuplot, each of which is licensed under its own terms. Users must obtain and install these tools separately. Refer to the documentation of each tool for installation instructions and licensing details.
-
-We have endeavored to follow the appropriate terms and usage policies of each scholarly API, web service, and Z39.50 server. We have linked to the terms and policies where possible. Some database APIs may require a valid library subscription, institutional access, or individual account to use their services. Please be responsible when reusing these scripts and respect the API terms and usage policies (e.g., query limits, record downloads, data sharing restrictions). Data output snippets shown in this book are for demonstration purposes and are credited to the individual API or database service. The output generated from APIs or services remains subject to the terms and conditions of the respective provider. Some outputs (e.g., U.S. Government works) may be in the public domain, while others may require attribution or adherence to other conditions.
-
-If you reuse the code, attribution would be appreciated. Please link to the Cookbook and see the [Cite page](https://ua-libraries-research-data-services.github.io/UALIB_ScholarlyAPI_Cookbook/about/cite) for full citation information.
-
-Link to Cookbook: https://ua-libraries-research-data-services.github.io/UALIB_ScholarlyAPI_Cookbook
+Most of the code in this repository is licensed under the [MIT License](https://github.com/UA-Libraries-Research-Data-Services/UALIB_ScholarlyAPI_Cookbook/blob/main/LICENSE), but some of the R tutorial scripts are under the [GPL-3 License](https://github.com/UA-Libraries-Research-Data-Services/UALIB_ScholarlyAPI_Cookbook/blob/main/LICENSE_selected_R_tutorials). Please see the [License and Reuse page](https://ua-libraries-research-data-services.github.io/UALIB_ScholarlyAPI_Cookbook/about/license-reuse) for more information about licensing and reuse. We have endeavored to follow the appropriate terms and usage policies of each scholarly API, web service, and Z39.50 server. We have linked to the terms and policies where possible. If you reuse the code, attribution would be appreciated. Please link to the Cookbook and see the [Cite page](https://ua-libraries-research-data-services.github.io/UALIB_ScholarlyAPI_Cookbook/about/cite) for full citation information.
 
 ## Archived Recipes
 

src/_templates/layout.html

@@ -4,8 +4,7 @@
   {% set site_name = "University of Alabama Libraries Scholarly API Cookbook" %}
   {% set base = (html_baseurl or "https://ua-libraries-research-data-services.github.io/UALIB_ScholarlyAPI_Cookbook/") %}
   {% set page_url = base ~ pagename ~ ('' if pagename.endswith('.html') else '.html') %}
-  <!-- Canonical Link and Sitemap -->
-  <link rel="canonical" href="{{ page_url }}" />
+  <!-- Sitemap -->
   <link rel="sitemap" type="application/xml" title="Sitemap" href="{{ base }}sitemap.xml">
   {% set og_title = title|striptags %}
   {% set site_desc = "Example tutorials for working with scholarly APIs for academic research and teaching using Python and R." %}

src/about/introduction.rst

@@ -58,13 +58,19 @@ While there may be some introductory programming content in this book, the
 content is not meant to be a general introduction to programming. 
 Instead, our aim with the Scholarly API Cookbook is to provide 
 some short scripting based workflows for working with scholarly data and information APIs. 
-For more general introductions to programming, we recommend searching the 
-UA Libraries Scout database for programming books (e.g., `TI python`). 
+For more general introductions to programming, we recommend searching your institution's
+library catalog or discovery service for introductory books on programming
+(e.g., for UA Libraries, try `Scout`_). See also the `UA Libraries Research Computing Services Guide`_.
+
+.. _Scout: https://research.ebsco.com/c/2cdwag/search
+.. _UA Libraries Research Computing Services Guide: https://guides.lib.ua.edu/RCS/generalprogramming
 
 .. seealso::
 
-   UA Libraries Workshop lessons and references therein for more general 
-   programming content [#ua_work]_.
+   UA Libraries teaches a variety of computing related workshops, including introductions to 
+   general programming. See our `workshop calendar`_ for more information.
+
+.. _workshop calendar: https://ua.libcal.com/
 
 What programming languages are covered?
 ****************************************
@@ -91,8 +97,5 @@ Who is creating the content?
 
 The Scholarly API Cookbook content is authored by University of Alabama 
 Libraries faculty and student assistants. Specific authors are noted on each 
-tutorial or document page.
-
-.. rubric:: References
-
-.. [#ua_work] `<https://github.com/UA-Libraries-Research-Data-Services/UALIB_Workshops>`_
+tutorial or document page. See the :doc:`History page <history>` for more information 
+on the site's history and contributors.

src/about/license-reuse.rst

@@ -4,7 +4,7 @@ License and Reuse
 License and Reuse
 ******************
 
-Most of the code in this Scholarly API Cookbook is licensed under the `MIT License <https://github.com/UA-Libraries-Research-Data-Services/UALIB_ScholarlyAPI_Cookbook/blob/main/LICENSE>`_.
+Most of the code in this Scholarly API Cookbook is licensed under the `MIT License`_.
 
 The Python scripts in this Scholarly API Cookbook are licensed under the MIT License. However, these scripts may rely on external libraries such as matplotlib, pandas, and others. These libraries are licensed under their own respective terms and need to be installed separately. Refer to the documentation of each library for installation instructions and licensing details.
 
@@ -17,18 +17,18 @@ Lastly, most of the R tutorial scripts are MIT licensed, but some are licensed u
    We have endeavored to follow the appropriate terms and usage policies of each scholarly API, web service, and Z39.50 server. We have linked to the terms and policies where possible. Some database APIs may require a valid library subscription, institutional access, or individual account to use their services. Please be responsible when reusing these scripts and respect the API terms and usage policies (e.g., query limits, record downloads, data sharing restrictions). Data output snippets shown in this book are for demonstration purposes and are credited to the individual API or database service. The output generated from APIs or services remains subject to the terms and conditions of the respective provider. Some outputs (e.g., U.S. Government works) may be in the public domain, while others may require attribution or adherence to other conditions.
 
 If you reuse the code, attribution would be appreciated. Please link to the Cookbook and see the :doc:`Cite page </about/cite>` for full citation information.
-
-Link to Cookbook: `<https://ua-libraries-research-data-services.github.io/UALIB_ScholarlyAPI_Cookbook>`_
 
 Scholarly API Cookbook Archive
 ******************************
 
 We have decided to no longer maintain the MATLAB, Mathematica, Bash (except the Z39.50 Bash recipe), and C recipes and have removed them from the Scholarly API Cookbook. These archived recipes are still in the `UA Libraries Scholarly API Cookbook Archive <https://github.com/UA-Libraries-Research-Data-Services/Scholarly_API_Cookbook_Archive>`_.
 
-The code in the UA Libraries Scholarly API Cookbook Archive is licensed under the `MIT License <https://github.com/UA-Libraries-Research-Data-Services/Scholarly_API_Cookbook_Archive/blob/main/LICENSE>`_. This includes code written to be used with Wolfram Mathematica and MathWorks MATLAB. However, these proprietary software packages themselves are not covered under the MIT License, and users must have valid licenses for Mathematica and MATLAB to run the associated code.
+The code in the UA Libraries Scholarly API Cookbook Archive is licensed under the `MIT License`_. This includes code written to be used with Wolfram Mathematica and MathWorks MATLAB. However, these proprietary software packages themselves are not covered under the MIT License, and users must have valid licenses for Mathematica and MATLAB to run the associated code.
 
 The Python scripts in this Scholarly API Cookbook are licensed under the MIT License. However, these scripts may rely on external libraries such as matplotlib, pandas, and others. These libraries are licensed under their own respective terms and need to be installed separately. Refer to the documentation of each library for installation instructions and licensing details.
 
 The Bash scripts are licensed under the MIT License (Bash itself is licensed under the GNU General Public License). Some of the included scripts may rely on external tools such as curl, jq, YAZ, and gnuplot, each of which is licensed under its own terms. Users must obtain and install these tools separately. Refer to the documentation of each tool for installation instructions and licensing details.
 
 The C code in the archive is licensed under the MIT License. This repository provides only the source code, and users will need to compile the C programs to run them. Some of the C code depends on external libraries such as curl, jq, and YAZ, which are licensed under their own respective terms. These libraries will need to be obtained and installed separately by the user.
+
+.. _MIT License: https://github.com/UA-Libraries-Research-Data-Services/Scholarly_API_Cookbook_Archive/blob/main/LICENSE