diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | INSTALL.md | 2 | ||||
| -rw-r--r-- | Makefile.example | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | README.rst | 10 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 2 | ||||
| -rw-r--r-- | docs/fr/source/interface-administrateur.rst | 2 |
7 files changed, 11 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 709aa2a79..f7a41c5b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ build-v3: tags: - buster only: - - master + - main - develop test-v3: @@ -32,7 +32,7 @@ test-v3: tags: - buster only: - - master + - main - develop debian: diff --git a/INSTALL.md b/INSTALL.md index 7edfe8ff4..0c087a671 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -23,7 +23,7 @@ bash ./ishtar-install ``` • Default PostgreSQL host? [localhost] • Which webserver do you want to use? ([nginx]/none) -• Which version would you like to use? ([develop]/master) +• Which version would you like to use? ([develop]/main) • Which base install path for Ishtar? [/srv/] ``` ``` diff --git a/Makefile.example b/Makefile.example index 1ac950635..483e411c5 100644 --- a/Makefile.example +++ b/Makefile.example @@ -262,7 +262,7 @@ push_install: clean tar cvjf $$ARCHIVE_NAME install/ ; \ scp $$ARCHIVE_NAME root@git.iggdrasil.net:$$INSTALL_PATH ; \ rm $$ARCHIVE_NAME ; - #ifeq ($(BRANCH_NAME),master) \ + #ifeq ($(BRANCH_NAME),main) \ # ssh root@git rm $$INSTALL_PATH"install-ishtar-latest.tar.bz2" ; \ # ssh root@git ln -s $$INSTALL_PATH$$ARCHIVE_NAME $$INSTALL_PATH"install-ishtar-latest.tar.bz2" ;\ #endif \ @@ -1,7 +1,7 @@ Ishtar ====== -[](https://gitlab.com/iggdrasil/ishtar/commits/master) [](http://ishtar.readthedocs.io/fr/latest/) [](https://badge.fury.io/py/ishtar) +[](https://gitlab.com/iggdrasil/ishtar/commits/main) [](http://ishtar.readthedocs.io/fr/latest/) [](https://badge.fury.io/py/ishtar) Description ----------- diff --git a/README.rst b/README.rst index 968e80f1a..5a3dbf23e 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Ishtar ====== -|build status| |doc status| |PyPI version| +|build status| |doc status| Description ----------- @@ -49,9 +49,7 @@ Docs Documentation is not yet available but help can be provided on the `forum <http://forum.ishtar-archeo.net>`__. -.. |build status| image:: https://gitlab.com/iggdrasil/ishtar/badges/master/build.svg - :target: https://gitlab.com/iggdrasil/ishtar/commits/master +.. |build status| image:: https://gitlab.com/iggdrasil/ishtar/badges/main/build.svg + :target: https://gitlab.com/iggdrasil/ishtar/commits/main .. |doc status| image:: https://readthedocs.org/projects/ishtar/badge/?version=latest - :target: http://ishtar.readthedocs.io/fr/latest/ -.. |PyPI version| image:: https://badge.fury.io/py/ishtar.svg - :target: https://badge.fury.io/py/ishtar + :target: http://ishtar.readthedocs.io/fr/main/ diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 3eefe5d61..1e85b4f5a 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -1273,7 +1273,7 @@ class OperationInitTest(object): if hasattr(self, 'user'): self.user.delete() self.user = None - # all try/except is necessary for bad migrations on master... + # all try/except is necessary for bad migrations on main... # should be removed at the next big version if hasattr(self, 'operations'): for ope in self.operations: diff --git a/docs/fr/source/interface-administrateur.rst b/docs/fr/source/interface-administrateur.rst index 824add940..04e49f406 100644 --- a/docs/fr/source/interface-administrateur.rst +++ b/docs/fr/source/interface-administrateur.rst @@ -194,7 +194,7 @@ Un premier patron Pour créer un patron, la première étape est de récupérer toutes les variables disponibles pour l'élément à partir duquel on veut générer un document. Il existe pour cela un `document de référence`_ que l'on peut attacher à l'élément pour lequel on souhaite éditer un nouveau document. -.. _document de référence: https://gitlab.com/iggdrasil/ishtar/raw/master/archaeological_operations/tests/document_reference.odt +.. _document de référence: https://gitlab.com/iggdrasil/ishtar/raw/main/archaeological_operations/tests/document_reference.odt .. note:: En cas d'indisponibilité du lien pour ce document, ce document est très simple et peut être recréé facilement, il suffit d'insérer : ``{{VALUES}}`` dans un document ODT vide et de sauvegarder le document. |