aboutsummaryrefslogtreecommitdiff
path: root/doc/book/design/_index.md
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-01-30 17:58:05 +0000
committerAlex <alex@adnab.me>2023-01-30 17:58:05 +0000
commit30f1636a00ffc60d1c9ac1d3781ccee21669e54d (patch)
tree32a6f5e8a5d4e10b70f9f3254cd41164ca85b204 /doc/book/design/_index.md
parent4cff37397f626ef063dad29e5b5e97ab1206015d (diff)
parent8013a5cd584de891f1fa0099f775954ba5bdd82d (diff)
downloadgarage-30f1636a00ffc60d1c9ac1d3781ccee21669e54d.tar.gz
garage-30f1636a00ffc60d1c9ac1d3781ccee21669e54d.zip
Merge pull request 'Documentation updates' (#496) from doc-mention-talks into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/496
Diffstat (limited to 'doc/book/design/_index.md')
-rw-r--r--doc/book/design/_index.md12
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/book/design/_index.md b/doc/book/design/_index.md
index a3a6ac11..50933139 100644
--- a/doc/book/design/_index.md
+++ b/doc/book/design/_index.md
@@ -20,12 +20,16 @@ and could not do, etc.
We love to talk and hear about Garage, that's why we keep a log here:
- - [(fr, 2021-11-13, video) Garage : Mille et une façons de stocker vos données](https://video.tedomum.net/w/moYKcv198dyMrT8hCS5jz9) and [slides (html)](https://rfid.deuxfleurs.fr/presentations/2021-11-13/garage/) - during [RFID#1](https://rfid.deuxfleurs.fr/programme/2021-11-13/) event
+ - [(en, 2023-01-18) Presentation of Garage with some details on CRDTs and data partitioning among nodes](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/4cff37397f626ef063dad29e5b5e97ab1206015d/doc/talks/2023-01-18-tocatta/talk.pdf)
+
+ - [(fr, 2022-11-19) De l'auto-hébergement à l'entre-hébergement : Garage, pour conserver ses données ensemble](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/4cff37397f626ef063dad29e5b5e97ab1206015d/doc/talks/2022-11-19-Capitole-du-Libre/pr%C3%A9sentation.pdf)
- - [(en, 2021-04-28) Distributed object storage is centralised](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2021-04-28_spirals-team/talk.pdf)
+ - [(en, 2022-06-23) General presentation of Garage](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/4cff37397f626ef063dad29e5b5e97ab1206015d/doc/talks/2022-06-23-stack/talk.pdf)
+
+ - [(fr, 2021-11-13, video) Garage : Mille et une façons de stocker vos données](https://video.tedomum.net/w/moYKcv198dyMrT8hCS5jz9) and [slides (html)](https://rfid.deuxfleurs.fr/presentations/2021-11-13/garage/) - during [RFID#1](https://rfid.deuxfleurs.fr/programme/2021-11-13/) event
- - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2020-12-02_wide-team/talk.pdf)
+ - [(en, 2021-04-28) Distributed object storage is centralised](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2021-04-28_spirals-team/talk.pdf)
-*Did you write or talk about Garage? [Open a pull request](https://git.deuxfleurs.fr/Deuxfleurs/garage/) to add a link here!*
+ - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2020-12-02_wide-team/talk.pdf)