Merge pull request #3963 from GeotrekCE/revert-3890-mfu-improve-doc

Revert " [📝 Documentation] Improve doc with new sections"
GeotrekCE · Feb 29, 2024 · 84eab09 · 84eab09
2 parents 531a27a + a58b614
commit 84eab09
Show file tree

Hide file tree

Showing 83 changed files with 1,680 additions and 2,380 deletions.
diff --git a/docs/contribute/contributing.rst → docs/CONTRIBUTING.rst b/docs/contribute/contributing.rst → docs/CONTRIBUTING.rst
@@ -2,10 +2,6 @@
 Contributing
 ============
 
-.. contents::
-   :local:
-   :depth: 2
-
 Conventions
 -----------
 
@@ -18,6 +14,7 @@ Conventions
 * Commits messages are explicit and mention issue number (``(ref #12)`` or ``(fixes #23)``), they should contains corresponding tag (see below)
 * Features are developed in a branch and merged from Github pull-requests.
 
+
 Definition of done
 ------------------
 
@@ -99,7 +96,7 @@ Merge     twisted_rightwards_arrows 🔀
 
 
 Release
---------
+-------
 
 On master branch:
 
@@ -112,18 +109,4 @@ On master branch:
 * Run ``dch -v <version>+dev --no-force-save-on-release`` and save
 * Commit with message 'Back to development' and push to ```master``
 
-* When creating a new release 'x.y.z' on github, Github actions will generate the .deb package file, and publish it on https://packages.geotrek.fr (see ``.github/workflows/test.yml`` file for details)
-
-Other ways to contribute
--------------------------
-
-* Help the users and answers questions on the `mailing-list <https://groups.google.com/g/geotrek-fr>`_ ;
-* `Open a ticket <https://github.com/GeotrekCE/Geotrek-admin/issues/new>`_ when you encounter a bug ;
-* `Open a ticket <https://github.com/GeotrekCE/Geotrek-admin/issues/new>`_ when you have a suggestion or feature idea ;
-* Translate the documentation ;
-* Translate the menus, buttons and labels (we use `Weblate <https://weblate.makina-corpus.net>`_) ;
-* Maintain the installation script for different Linux distributions (*requires some basic Linux skills*) ;
-* Fix bugs or improve layout and apparence (*requires Webmaster skills*) ;
-* Fix bugs or improve core modules (*requires python/Django skills*).
-
-Join the `mailing list <https://groups.google.com/forum/#!forum/geotrek-fr>`_! Send an email to ``geotrek-fr+subscribe@googlegroups.com`` and you will receive an invitation automatically.
+* When creating a new release 'x.y.z' on github, Github actions will generate the .deb package file, and publish it on https://packages.geotrek.fr (see ``.circleci/config.yml`` file for details)
diff --git a/docs/_static/favicon.png b/docs/_static/favicon.png
diff --git a/docs/_static/logo.svg b/docs/_static/logo.svg
diff --git a/docs/about/geotrek.rst b/docs/about/geotrek.rst
diff --git a/docs/others/authors.rst → docs/authors.rst b/docs/others/authors.rst → docs/authors.rst
@@ -2,10 +2,6 @@
 Authors
 =======
 
-.. contents::
-   :local:
-   :depth: 2
-
 Makina Corpus
 -------------
 
@@ -32,7 +28,7 @@ Makina Corpus
 * Hugo Hasson
 * Joaquim Nallar
 
-.. image:: https://makina-corpus.com/profiles/makina/themes/makina_front/img/logo.png
+.. image:: http://depot.makina-corpus.org/public/logo.gif
     :target: http://www.makina-corpus.com
 
 Parc national des Ecrins

diff --git a/docs/others/changelog.rst → docs/changelog.rst b/docs/others/changelog.rst → docs/changelog.rst
@@ -9,10 +9,6 @@ CHANGELOG
 
 - Add `include_externals` filter to Cirkwi trek exports, to allow excluding treks with an external id (eid) (#3947)
 
-**Documentation**
-
-- Reorganize major sections in documentation, and add content
-
 
 2.102.1 (2024-02-20)
 --------------------