Move

_pages/general/methods.md

@@ -20,9 +20,3 @@ sidebar:
 - [Scrivener](https://www.literatureandlatte.com/scrivener/): A word-processing program and outliner designed for authors which provides a management system for documents, notes and metadata.
 - [xmind](https://xmind.app/): A full-featured mind mapping and brainstorming app.
 - [LiquidPaper](https://www.liquidtext.net/): A PDF reader and editor which captures your reading, notes, highlights, annotations and observations just like paper; but goes further to reveal their connections: to source materials and each other in a way which documents and maps your project in a clear and shareable form.
-
-## Software choice
-
-- [switching.software](https://switching.software/): Ethical, easy-to-use and privacy-conscious alternatives to well-known software.
-- [Framasoft](https://framasoft.org/en/): A nonprofit organization focused on free software valorisation, it is one of the main French language portals to the free and open-source culture.
-- [Digital Scholar](https://digitalscholar.org/): Software and services designed by historians for research, publishing, and cultural heritage work.

_pages/general/software.md

@@ -7,6 +7,17 @@ sidebar:
 
 - [awesome](https://github.com/sindresorhus/awesome): Awesome lists about all kinds of interesting topics.
 
+## Good deals
+
+- [BackMarket](https://www.backmarket.com/en-us): Buy refurbished computer equipment at a fraction of the price
+- [OnTheHub](https://onthehub.com/): Academic software at discount prices for students and faculty
+
+## Software choice
+
+- [switching.software](https://switching.software/): Ethical, easy-to-use and privacy-conscious alternatives to well-known software.
+- [Framasoft](https://framasoft.org/en/): A nonprofit organization focused on free software valorisation, it is one of the main French language portals to the free and open-source culture.
+- [Digital Scholar](https://digitalscholar.org/): Software and services designed by historians for research, publishing, and cultural heritage work.
+
 ## Learning to program
 
 - [Computer Science Education](https://github.com/ossu/computer-science): Path to a free self-taught education in Computer Science
@@ -19,9 +30,4 @@ sidebar:
 
 - [VSCode](https://code.visualstudio.com/): A source-code editor made by Microsoft, ranked the most popular developer environment tool in 2022.
 - [Git](https://git-scm.com/): A distributed version control system that tracks changes in any set of computer files, usually used for coordinating work among programmers.
-- [GitHub](https://github.com/): An Internet hosting service for software development and version control using Git. It provides the distributed version control of Git plus access control, bug tracking, software feature requests, task management, continuous integration, and wikis for every project.
-
-## Good deals
-
-- [BackMarket](https://www.backmarket.com/en-us): Buy refurbished computer equipment at a fraction of the price
-- [OnTheHub](https://onthehub.com/): Academic software at discount prices for students and faculty
+- [GitHub](https://github.com/): An Internet hosting service for software development and version control using Git. It provides the distributed version control of Git plus access control, bug tracking, software feature requests, task management, continuous integration, and wikis for every project.