Merge branch 'main' into sql-styles

Author: tobyhodges

CONTRIBUTING.md

@@ -26,12 +26,13 @@ introduce yourself and to meet some of our community members.
 
 2. If you have a [GitHub][github] account, or are willing to [create
    one][github-join], but do not know how to use Git, you can report problems
-   or suggest improvements by [creating an issue][issues]. This allows us to
-   assign the item to someone and to respond to it in a threaded discussion.
+   or suggest improvements by [creating an issue][repo-issues]. This allows us
+   to assign the item to someone and to respond to it in a threaded discussion.
 
 3. If you are comfortable with Git, and would like to add or change material,
    you can submit a pull request (PR). Instructions for doing this are
-   [included below](#using-github).
+   [included below](#using-github). For inspiration about changes that need to
+   be made, check out the [list of open issues][issues] across the Carpentries.
 
 Note: if you want to build the website locally, please refer to [The Workbench
 documentation][template-doc].
@@ -49,8 +50,8 @@ There are many ways to contribute, from writing new exercises and improving
 existing ones to updating or filling in the documentation and submitting [bug
 reports][issues] about things that do not work, are not clear, or are missing.
 If you are looking for ideas, please see [the list of issues for this
-repository][repo], or the issues for [Data Carpentry][dc-issues], [Library
-Carpentry][lc-issues], and [Software Carpentry][swc-issues] projects.
+repository][repo-issues], or the issues for [Data Carpentry][dc-issues],
+[Library Carpentry][lc-issues], and [Software Carpentry][swc-issues] projects.
 
 Comments on issues and reviews of pull requests are just as welcome: we are
 smarter together than we are on our own. **Reviews from novices and newcomers
@@ -101,7 +102,8 @@ community listed at <https://carpentries.org/connect/> including via social
 media, slack, newsletters, and email lists. You can also [reach us by
 email][contact].
 
-[repo]: https://example.com/FIXME
+[repo]: https://github.com/LibraryCarpentry/lc-sql
+[repo-issues]: https://github.com/LibraryCarpentry/lc-sql/issues
 [contact]: mailto:team@carpentries.org
 [cp-site]: https://carpentries.org/
 [dc-issues]: https://github.com/issues?q=user%3Adatacarpentry
@@ -111,7 +113,7 @@ email][contact].
 [github]: https://github.com
 [github-flow]: https://guides.github.com/introduction/flow/
 [github-join]: https://github.com/join
-[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
+[how-contribute]: https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github
 [issues]: https://carpentries.org/help-wanted-issues/
 [lc-issues]: https://github.com/issues?q=user%3ALibraryCarpentry
 [swc-issues]: https://github.com/issues?q=user%3Aswcarpentry

episodes/04-ordering-commenting.md

@@ -73,8 +73,10 @@ their effects as we went along.  For complex queries, this is a good strategy, t
 When the queries become more complex, it can be useful to add comments to express to yourself, or to others, what you are doing with your query. Comments help explain the logic of a section and provide context for anyone reading the query. It's essentially a way of making notes within your SQL. In SQL, comments begin using <code class="language-plaintext highlighter-rouge">\--</code> and end at the end of the line. To mark a whole paragraph as a comment, you can enclose it with the characters /\* and \*/. For example, a commented version of the above query can be written as:
 
 ```sql
-/*In this section, even though JOINS (see link below this code block) are not introduced until Episode 6, we want to give an example how to
-join multiple tables because they represent a good example of using comments in SQL to explain more complex queries.*/
+/*In this section, even though JOINS (see link below this code block)
+are not introduced until Episode 6, we want to give an example how to
+join multiple tables because they represent a good example of using
+comments in SQL to explain more complex queries.*/
 
 -- First we mention all the fields we want to display
 SELECT articles.Title, articles.First_Author, journals.Journal_Title, publishers.Publisher

index.md

@@ -8,7 +8,7 @@ This Library Carpentry lesson introduces librarians to relational database manag
 
 ## Before You Start:
 
-You will need to install **DB Browser for SQLite** and download the **doaj-article-sample** database. See [Setup](https://librarycarpentry.org/lc-sql/setup.html) for instructions and further information.
+You will need to install **DB Browser for SQLite** and download the **doaj-article-sample** database. See [Setup](learners/setup.md) for instructions and further information.
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::