diff --git a/CHANGELOG.md b/CHANGELOG.md index 405fb670..c31aa27c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -105,7 +105,7 @@ mkdir -p media/images ## MR 163: Fix install re2o Refactored install_re2o.sh script. -* There are more tools available with it but some function have changed, report to [the dedicated wiki page](https://gitlab.federez.net/federez/re2o/wikis/User%20Documentation/Setup%20script)for more informations or run: +* There are more tools available with it but some function have changed, report to [the dedicated wiki page](https://gitlab.federez.net/re2o/re2o/wikis/User%20Documentation/Setup%20script)for more informations or run: ``` install_re2o.sh help ``` @@ -121,7 +121,7 @@ python3 manage.py collectstatic ## MR 172: Refactor API -Creates a new (nearly) REST API to expose all models of Re2o. See [the dedicated wiki page](https://gitlab.federez.net/federez/re2o/wikis/API/Raw-Usage) for more details on how to use it. +Creates a new (nearly) REST API to expose all models of Re2o. See [the dedicated wiki page](https://gitlab.federez.net/re2o/re2o/wikis/API/Raw-Usage) for more details on how to use it. * For testing purpose, add `volatildap` package: ``` pip3 install volatildap diff --git a/README.md b/README.md index 1e76daa9..a78caafb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Il est possible d'activer très facilement des services qui améliorerons les po ## Installation -Un tutoriel pour installer le projet est disponible [sur le wiki](https://gitlab.federez.net/federez/re2o/wikis/User%20Documentation/Quick%20Start). +Un tutoriel pour installer le projet est disponible [sur le wiki](https://gitlab.federez.net/re2o/re2o/wikis/User%20Documentation/Quick%20Start). ## Fonctionnement Général @@ -30,7 +30,7 @@ Les données stockées dans Re2o sont disponibles via un API Rest. Les services # Wiki -Le [Wiki](https://gitlab.federez.net/federez/re2o/-/wikis/home) est accessible sur le gitlab de Federez. Il regroupe les informations et instructions pour la plupart des composants de Re2o. +Le [Wiki](https://gitlab.federez.net/re2o/re2o/-/wikis/home) est accessible sur le gitlab de Federez. Il regroupe les informations et instructions pour la plupart des composants de Re2o. ---- @@ -47,7 +47,7 @@ On top of this, it is possible to plug services to enhance the possibilities and # Setup -A tutorial is available on the [Wiki](https://gitlab.federez.net/federez/re2o/wikis/User%20Documentation/Quick%20Start) to describe the setup process. +A tutorial is available on the [Wiki](https://gitlab.federez.net/re2o/re2o/wikis/User%20Documentation/Quick%20Start) to describe the setup process. # General Functioning @@ -61,4 +61,4 @@ Re2o provide a Rest API to allow external services (dhcp, dns, firewall,...) ins # Wiki -The [Wiki](https://gitlab.federez.net/federez/re2o/-/wikis/home) is available to provide information and instruction for most components of Re2o. +The [Wiki](https://gitlab.federez.net/re2o/re2o/-/wikis/home) is available to provide information and instruction for most components of Re2o. diff --git a/re2o/locale/fr/LC_MESSAGES/django.po b/re2o/locale/fr/LC_MESSAGES/django.po index 6c6f4422..c4f5be9e 100644 --- a/re2o/locale/fr/LC_MESSAGES/django.po +++ b/re2o/locale/fr/LC_MESSAGES/django.po @@ -177,7 +177,7 @@ msgstr "" "être un outil indépendant de toute infrastructure réseau pour pouvoir être " "installé en « quelques étapes ». Cet outil est entièrement gratuit et est " "disponible sous licence GNU Public Licence v2 (GPLv2) sur le gitlab de FedeRez.
\n" +"\"https://gitlab.federez.net/re2o/re2o/\">gitlab de FedeRez.
\n" "Les mainteneurs de Re2o sont de fiers bénévoles venant principalement " "d'écoles d'ingénieurs françaises (mais pas seulement) qui ont donné beaucoup " "de leur temps pour faire en sorte que ce projet soit possible. Donc s'il " diff --git a/re2o/templates/re2o/about.html b/re2o/templates/re2o/about.html index b74d7e81..99396474 100644 --- a/re2o/templates/re2o/about.html +++ b/re2o/templates/re2o/about.html @@ -62,7 +62,7 @@ with this program; if not, write to the Free Software Foundation, Inc., It is intended to be a tool independent from any network infrastructure so it can be setup in "a few steps". This tool is entirely free and available under a GNU Public License v2 (GPLv2) license on - FedeRez gitlab.
+ FedeRez gitlab.
Re2o's maintainers are volunteers mainly from French schools.
If you want to get involved in the development process, we will be glad to welcome you so do not hesitate to contact us and come help us build the