aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-30 17:43:25 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-30 17:48:36 +0100
commit56384677fa70bace19a4f2b555d84de7f77339e0 (patch)
tree19360e346ef1c57f89a2fa3c2140ca228bcb1f8c /doc
parent4cff37397f626ef063dad29e5b5e97ab1206015d (diff)
downloadgarage-56384677fa70bace19a4f2b555d84de7f77339e0.tar.gz
garage-56384677fa70bace19a4f2b555d84de7f77339e0.zip
Add links to presentationsdoc-mention-talks
Diffstat (limited to 'doc')
-rw-r--r--doc/book/design/_index.md6
-rw-r--r--doc/book/design/related-work.md3
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/book/design/_index.md b/doc/book/design/_index.md
index a3a6ac11..b54b4f8e 100644
--- a/doc/book/design/_index.md
+++ b/doc/book/design/_index.md
@@ -20,12 +20,14 @@ and could not do, etc.
We love to talk and hear about Garage, that's why we keep a log here:
+ - [(en, 2023-01-18) Presentation of Garage at Inria](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)
+
- [(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, 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)
- [(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)
-*Did you write or talk about Garage? [Open a pull request](https://git.deuxfleurs.fr/Deuxfleurs/garage/) to add a link here!*
-
diff --git a/doc/book/design/related-work.md b/doc/book/design/related-work.md
index f96c6618..6c1a6b12 100644
--- a/doc/book/design/related-work.md
+++ b/doc/book/design/related-work.md
@@ -72,8 +72,7 @@ We considered there v2's design but concluded that it does not fit both our *Sel
**[Riak CS](https://docs.riak.com/riak/cs/2.1.1/index.html):**
*Not written yet*
-**[IPFS](https://ipfs.io/):**
-*Not written yet*
+**[IPFS](https://ipfs.io/):** IPFS has design goals radically different from Garage, we have [a blog post](@/blog/2022-ipfs/index.md) talking about it.
## Specific research papers