From dfd7f868c999409bcdc1a8754d0499c9399e4902 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 17 Apr 2020 20:45:07 +0200 Subject: [PATCH 1/2] Adding partners and sponsors --- docs.md | 1 + docs_fr.md | 1 + partners_sponsors.md | 9 +++++++++ partners_sponsors_fr.md | 1 + 4 files changed, 12 insertions(+) create mode 100644 partners_sponsors.md create mode 100644 partners_sponsors_fr.md diff --git a/docs.md b/docs.md index 9518991a9..5591d5865 100644 --- a/docs.md +++ b/docs.md @@ -26,6 +26,7 @@ YunoHost's documentation has 2 different sections: * [Chat rooms](/chat_rooms_en) * [Communication](/communication_en) * [Support / Help](/help) + * [Partners and sponsors](/partners_sponsors) * Use example: * [YunoHost for non-profit organisations](/use_case_non-profit_organisations_en) diff --git a/docs_fr.md b/docs_fr.md index 7469efcec..6d25bb2bc 100644 --- a/docs_fr.md +++ b/docs_fr.md @@ -26,6 +26,7 @@ La documentation de YunoHost s’articule autour de deux sections : - [Salons de discussions](/chat_rooms_fr) * [Communication extérieure](/communication) * [Support / Aide](/help_fr) + * [Partenaires et mécénes](/partners_sponsors_fr) * Exemple d'utilisation: * [YunoHost pour les organisations à but non lucratif](/use_case_non-profit_organisations_fr) diff --git a/partners_sponsors.md b/partners_sponsors.md new file mode 100644 index 000000000..3a01d988d --- /dev/null +++ b/partners_sponsors.md @@ -0,0 +1,9 @@ +# Partners and sponsors + + + +- [GLOBENET globenet.org +- TETANEUTRAL-NET tetaneutral.net +- GITOYEN gitoyen.net +- LDN-NET ldn-fai.net +- NBS System https://www.nbs-system.com/ \ No newline at end of file diff --git a/partners_sponsors_fr.md b/partners_sponsors_fr.md new file mode 100644 index 000000000..287850ba2 --- /dev/null +++ b/partners_sponsors_fr.md @@ -0,0 +1 @@ +# Partenaires et mécénes \ No newline at end of file From 09f5a09c53935730bbc68e69026750cc5e48a1c1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 17 Apr 2020 20:56:19 +0200 Subject: [PATCH 2/2] Adding informations --- partners_sponsors.md | 15 ++++++++------- partners_sponsors_fr.md | 11 ++++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/partners_sponsors.md b/partners_sponsors.md index 3a01d988d..531381d84 100644 --- a/partners_sponsors.md +++ b/partners_sponsors.md @@ -1,9 +1,10 @@ # Partners and sponsors - - -- [GLOBENET globenet.org -- TETANEUTRAL-NET tetaneutral.net -- GITOYEN gitoyen.net -- LDN-NET ldn-fai.net -- NBS System https://www.nbs-system.com/ \ No newline at end of file +Here is a list of Yunohost partners ans sponsors: +- [GLOBENET](http://www.globenet.org): activist association, at the service of freedom of expression, offering internet services. +- [TETANEUTRAL-NET](https://tetaneutral.net/): associative Internet access provider currently operating a radio network in Toulouse and its surroundings and a hoster. +- [GITOYEN](https://gitoyen.net): association bringing together several companies and associations acting as a provider of hosting infrastructure and Internet access. +- [LDN-NET](https://ldn-fai.net/) : association for the defense of a free, neutral and decentralized Internet whose main means of action is to be an Internet access provider associative and local. +- [NBS System](https://www.nbs-system.com/): company specialized in hosting, securing Clouds, outsourcing (Information Systems, SaaS Applications, Web Platforms) and managed services. +- [Framasoft](https://framasoft.org/) : popular education association, a group of friends convinced that an emancipatory digital world is possible, convinced that it will happen thanks to concrete actions on the ground and online with you and for you! +- [FDN](https://www.fdn.fr/): associative Internet access provider. \ No newline at end of file diff --git a/partners_sponsors_fr.md b/partners_sponsors_fr.md index 287850ba2..448b790de 100644 --- a/partners_sponsors_fr.md +++ b/partners_sponsors_fr.md @@ -1 +1,10 @@ -# Partenaires et mécénes \ No newline at end of file +# Partenaires et mécénes + +Une liste des partenaires et sponsors de YunoHost: +- [GLOBENET](http://www.globenet.org): association militante, au service de la liberté d’expression, proposant des services internet. +- [TETANEUTRAL-NET](https://tetaneutral.net/): fournisseur d'accès à Internet associatif opérant actuellement un réseau radio sur Toulouse et ses environs et un hébergeur. +- [GITOYEN](https://gitoyen.net): association regroupant plusieurs entreprises et associations intervenant comme fournisseur d’infrastructure d’hébergement et d’accès à Internet. +- [LDN-NET](https://ldn-fai.net/) : association pour la défense d’un Internet libre, neutre et décentralisé dont le moyen d’action principale est d’être un fournisseur d’accès Internet (FAI) assocatif et local. +- [NBS System](https://www.nbs-system.com/): société spécialisée dans l’hébergement, la sécurisation de des Clouds, l’infogérance (Systèmes d’information, Applications SaaS, Plateformes web) et les services managés +- [Framasoft](https://framasoft.org/) : association d’éducation populaire, un groupe d’ami·es convaincu·es qu’un monde numérique émancipateur est possible, persuadé·es qu’il adviendra grâce à des actions concrètes sur le terrain et en ligne avec vous et pour vous ! +- [FDN](https://www.fdn.fr/): fournisseur d'accès à Internet associatif. \ No newline at end of file