From e6093538f908d3f3ee65e1acf6c28e215e73960c Mon Sep 17 00:00:00 2001 From: Roberto Toro Date: Sun, 21 Feb 2021 19:01:10 +0100 Subject: [PATCH 1/5] Update glossary.md --- brainhack_book/glossary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brainhack_book/glossary.md b/brainhack_book/glossary.md index b5606ec0..f0c75d39 100644 --- a/brainhack_book/glossary.md +++ b/brainhack_book/glossary.md @@ -500,7 +500,7 @@ A conventionally named, standardised delivery method that is applied by a traine ### Unconference -Unconventional +An unconference is a participant-driven meeting. The term "unconference" has been applied, or self-applied, to a wide range of gatherings that try to avoid hierarchical aspects of a conventional conference, such as sponsored presentations and top-down organization.More at https://en.wikipedia.org/wiki/Unconference. ## **V** From 9be4e63bda0c3b947411f196e35a70a503288fb2 Mon Sep 17 00:00:00 2001 From: Anibal Solon Date: Mon, 22 Feb 2021 10:15:09 -0500 Subject: [PATCH 2/5] convert link to reference, use wiki perm link, comment old refs for now --- brainhack_book/glossary.md | 12 +++++++++--- brainhack_book/references.bib | 8 ++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 brainhack_book/references.bib diff --git a/brainhack_book/glossary.md b/brainhack_book/glossary.md index f0c75d39..07547e24 100644 --- a/brainhack_book/glossary.md +++ b/brainhack_book/glossary.md @@ -500,7 +500,7 @@ A conventionally named, standardised delivery method that is applied by a traine ### Unconference -An unconference is a participant-driven meeting. The term "unconference" has been applied, or self-applied, to a wide range of gatherings that try to avoid hierarchical aspects of a conventional conference, such as sponsored presentations and top-down organization.More at https://en.wikipedia.org/wiki/Unconference. +An unconference is a participant-driven meeting. The term "unconference" has been applied, or self-applied, to a wide range of gatherings that try to avoid hierarchical aspects of a conventional conference, such as sponsored presentations and top-down organization {cite}`wiki:unconference`. ## **V** @@ -536,9 +536,15 @@ Version control is the management of changes to documents, computer programs, la ## **References** - + + +```{bibliography} ./references.bib +:all: +:style: unsrt +``` \ No newline at end of file diff --git a/brainhack_book/references.bib b/brainhack_book/references.bib new file mode 100644 index 00000000..d6c7e10c --- /dev/null +++ b/brainhack_book/references.bib @@ -0,0 +1,8 @@ +@misc{ + wiki:unconference, + author = "{Wikipedia contributors}", + title = "Unconference --- {W}ikipedia{,} The Free Encyclopedia", + year = "2021", + url = "https://en.wikipedia.org/w/index.php?title=Unconference&oldid=998188187", + note = "[Online; accessed 22-Feb-2021]" +} \ No newline at end of file From 966976f75e4b1cd7f63f0fd1308b1e9dcfb03fed Mon Sep 17 00:00:00 2001 From: Anibal Solon Date: Mon, 22 Feb 2021 10:15:24 -0500 Subject: [PATCH 3/5] fix typo --- brainhack_book/glossary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brainhack_book/glossary.md b/brainhack_book/glossary.md index 07547e24..3cf4dfbe 100644 --- a/brainhack_book/glossary.md +++ b/brainhack_book/glossary.md @@ -485,7 +485,7 @@ Training is any organised activity that teaches, informs, or transfers skills or ### Training Format A conventionally named, standardised delivery method that is applied by a trainer and includes any number of the pedagogical tools necessary (i.e. motivation/demotivation, hands-on approaches, etc). -### Traintrak +### Traintrack ### Traditional From bdaa23696e2fa40520baf562dec2a78178425d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anibal=20S=C3=B3lon?= Date: Wed, 24 Feb 2021 09:05:05 -0600 Subject: [PATCH 4/5] use preprint style --- brainhack_book/glossary.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brainhack_book/glossary.md b/brainhack_book/glossary.md index 5b5fbe2b..b2db472f 100644 --- a/brainhack_book/glossary.md +++ b/brainhack_book/glossary.md @@ -396,7 +396,7 @@ Training is any organised activity that teaches, informs, or transfers skills or ### Training Format A conventionally named, standardised delivery method that is applied by a trainer and includes any number of the pedagogical tools necessary (i.e. motivation/demotivation, hands-on approaches, etc). -### Train Track +### TrainTrack A series of educational talks or workshops that runs in parallel to the project tracks through which attendees collaboratively work on projects. The content of the TrainTrack can range from tutorials that teach hands-on skills needed for the projects in a Brainhack (e.g., like code version-control using Git) to software demos with much narrower applications. ### Traditional @@ -446,4 +446,4 @@ The labor pool of a given institution, company, state, or group. It can be forma ```{bibliography} ./references.bib :all: :style: unsrt -``` \ No newline at end of file +``` From db195439720508704804262bd155df5b6b8ae9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anibal=20S=C3=B3lon?= Date: Wed, 24 Feb 2021 09:09:54 -0600 Subject: [PATCH 5/5] Merge definitions --- brainhack_book/glossary.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brainhack_book/glossary.md b/brainhack_book/glossary.md index b2db472f..400ad9c2 100644 --- a/brainhack_book/glossary.md +++ b/brainhack_book/glossary.md @@ -408,7 +408,10 @@ A series of educational talks or workshops that runs in parallel to the project ## U ### Unconference -An unconference is a participant-driven meeting. The term "unconference" has been applied, or self-applied, to a wide range of gatherings that try to avoid hierarchical aspects of a conventional conference, such as sponsored presentations and top-down organization {cite}`wiki:unconference`. +An unconference is a participant-driven meeting. +The term "unconference" has been applied, or self-applied, to a wide range of gatherings that try to avoid hierarchical aspects of a conventional conference, such as sponsored presentations and top-down organization {cite}`wiki:unconference`. +Commonly, participants present their research, project work, or any other topics of current interest in an informal setting to other participants. +The content of an unconference is usually decided very shortly before or during the Brainhack event itself, often inspired by ongoing within-team discussions that could be of interest to the larger group. ### Unconventional