Skip to content

Commit

Permalink
Merge pull request the-turing-way#3935 from RichardJActon/open-source…
Browse files Browse the repository at this point in the history
…-glossary-update-fixes

[Ready For Review] Fixes a couple of syntax errors in open source related terms in the glossary
  • Loading branch information
JimMadge authored Nov 7, 2024
2 parents 80b5ac2 + 2d66ae0 commit 38fb09d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions book/website/afterword/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Ethical Source Software
These licenses require that software is used in ways that respect fundamental human rights.
This can be thought of as relaxing the hardline 'freedom to run software for any purpose' stipulation required for software to qualify as free / libre or open source by the conventional definitions.
Whilst these licenses sought to be considered {term}`open source <Open Source Software>`, their terms place restrictions on the uses to which the software can be put so that anyone using the software in a way the licenses consider unethical would potentially expose themselves to liability.
Use restictions are prohibited by conventional definitions of open source so ethical source license could be thought of as a form of {term`source available<Source Available>`} license.
Use restictions are prohibited by conventional definitions of open source so ethical source license could be thought of as a form of {term}`source available<Source Available>` license.
See: {ref}`Ethical Source<rr-licensing-ethical>` for more.
```
Expand Down Expand Up @@ -433,14 +433,14 @@ Open Source
[opensource.com](https://web.archive.org/web/20240618150233/https://opensource.com/resources/what-open-source) describes open source as:
"Something people can modify and share because its design is publicly accessible".
The concept of 'open source' is now often extended beyond the context of its original coinage, {term}`software<Open Source Software>`,
to other forms of cultural or creative output, such as {term}`hardware<Open Source Hardware>` and {term}educational resources`{Open Educational Resources}`.
to other forms of cultural or creative output, such as {term}`hardware<Open Source Hardware>` and {term}`educational resources<Open Educational Resources>`.
Referring to something as 'open source' generally means that it is available under an {term}`open license<Open License>`.
The term can also extend to an {term}`open project<Open Project>` philosophy of collaboration beyond the mere availability and open licensing of the project's source materials.
The term tends to, but need not, be applied in contexts where there is some 'source' material that is processed or synthesised into an output.
For example an image created with a simple bitmap editor might be reffered to as 'open source' despite lacking something that can be considered a 'source'.
In such cases the notion of a '{term}`creative commons<Creative Commons>`' or '{term}`free cultural work<Free Cultural Works>`' may better apply as these do not as obviously emphasise the availability source materials but rather end products,
though they may include source materials.
There are also a number adjacent concepts which most often question the conventional open source prohibtion on restricting the uses to which open source things can be put, examples include: '{term}`ethical source<Ethical Source Software>`' '{term}`Fair Code<Fair Code>`'.
There are also a number adjacent concepts which most often question the conventional open source prohibtion on restricting the uses to which open source things can be put, examples include: '{term}`ethical source<Ethical Source Software>`' and '{term}`Fair Code<Fair Code>`'.
Open Source Hardware
Hardware whose design is made publicly available so that anyone can study, modify, distribute, make, and sell the design or hardware based on that design.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Book Dash was a success and the experience of working with an artist added t
They loved seeing their ideas translated into images - an (almost) immediate output they could collaborate on and feel proud to have contributed to.
This experience was brought back in subsequent Book Dash events in person and online and has always remained a highlight.

```{figure} ../../../../workshops/book-dash/figures/book_dash_mcr_art.*
```{figure} ../../figures/book_dash_mcr_art.*
---
height: 400px
name: book_dash_mcr_art
Expand Down
Binary file added book/website/figures/book_dash_mcr_art.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 38fb09d

Please sign in to comment.