martinqt
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+
+# You can add one username per supported platform and one custom link
+open_collective: gitextensions
+custom: https://github.com/gitextensions/gitextensions/wiki
diff --git a/.gitignore b/.gitignore
@@ -1 +1,10 @@
 build
+source/_build/
+*.orig
+tx.exe
+GitExtensions.settings.backup
+.vscode/
+source/locale/.doctrees/
+/source/__pycache__/
+/source/extensions/__pycache__/
+*.pyc
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,22 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: source/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+  - requirements: source/requirements.txt
diff --git a/GitExtensions.settings b/GitExtensions.settings
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dictionary>
+  <item>
+    <key>
+      <string>RevisionLinkDefs</string>
+    </key>
+    <value>
+      <string>&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;ArrayOfGitExtLinkDef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;GitExtLinkDef&gt;
+    &lt;SearchInParts&gt;
+      &lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
+      &lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
+      &lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
+    &lt;/SearchInParts&gt;
+    &lt;LinkFormats&gt;
+      &lt;GitExtLinkFormat&gt;
+        &lt;Caption&gt;Issue {0}&lt;/Caption&gt;
+        &lt;Format&gt;https://github.com/gitextensions/gitextensionsdoc/issues/{0}&lt;/Format&gt;
+      &lt;/GitExtLinkFormat&gt;
+    &lt;/LinkFormats&gt;
+    &lt;Name&gt;GitHub - issues&lt;/Name&gt;
+    &lt;SearchPattern&gt;(\s*(,|and)?\s*#\d+)+&lt;/SearchPattern&gt;
+    &lt;NestedSearchPattern&gt;(\d+)+&lt;/NestedSearchPattern&gt;
+    &lt;Enabled&gt;true&lt;/Enabled&gt;
+  &lt;/GitExtLinkDef&gt;
+  &lt;GitExtLinkDef&gt;
+    &lt;SearchInParts&gt;
+      &lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
+    &lt;/SearchInParts&gt;
+    &lt;LinkFormats&gt;
+      &lt;GitExtLinkFormat&gt;
+        &lt;Caption&gt;View on GitHub&lt;/Caption&gt;
+        &lt;Format&gt;https://github.com/gitextensions/gitextensionsdoc/commit/%COMMIT_HASH%&lt;/Format&gt;
+      &lt;/GitExtLinkFormat&gt;
+    &lt;/LinkFormats&gt;
+    &lt;Name&gt;GitHub - commit&lt;/Name&gt;
+    &lt;SearchPattern&gt;.*&lt;/SearchPattern&gt;
+    &lt;NestedSearchPattern /&gt;
+    &lt;Enabled&gt;true&lt;/Enabled&gt;
+  &lt;/GitExtLinkDef&gt;
+&lt;/ArrayOfGitExtLinkDef&gt;</string>
+    </value>
+  </item>
+</dictionary>
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sou
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -33,7 +33,6 @@ help:
 	@echo "  man        to make manual pages"
 	@echo "  texinfo    to make Texinfo files"
 	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
@@ -42,7 +41,7 @@ clean:
 	-rm -rf $(BUILDDIR)/*
 
 html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
@@ -131,11 +130,6 @@ info:
 	make -C $(BUILDDIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
 
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
 changes:
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
 	@echo

diff --git a/make-html_docker.cmd b/make-html_docker.cmd
@@ -0,0 +1 @@
+docker run --rm -v %CD%:/docs sphinxdoc/sphinx sphinx-build -b html -d build/doctrees source build/html
diff --git a/make.cmd b/make.cmd
@@ -31,7 +31,6 @@ if "%1" == "help" (
 	echo.  text       to make text files
 	echo.  man        to make manual pages
 	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
 	echo.  changes    to make an overview over all changed/added/deprecated items
 	echo.  linkcheck  to check all external links for integrity
 	echo.  doctest    to run all doctests embedded in the documentation if enabled
@@ -153,14 +152,6 @@ if "%1" == "texinfo" (
 	goto end
 )
 
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
 if "%1" == "changes" (
 	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
 	if errorlevel 1 exit /b 1

diff --git a/progress.md b/progress.md
diff --git a/readme.md b/readme.md
@@ -1,41 +1,65 @@
-Git Extensions Manual
-=====================
+# Git Extensions Manual
+
 This repository contains the new Git extensions Manual. Feel free to help us improve this manual by sending pull requests
 or by opening issues.
 
-View Online
------------
-The current documentation can be viewed here: https://gitextensions.readthedocs.org/en/latest/
+Refer to the Wiki here: <https://github.com/gitextensions/gitextensions/wiki> for details on how to update the documentation.
+
+## View Online
+
+The current documentation can be viewed here: <https://git-extensions-documentation.readthedocs.org/>
 
-PDF and others format can be downloaded here: https://readthedocs.org/projects/gitextensions/downloads/
+PDF and other formats can be downloaded here: <https://readthedocs.org/projects/git-extensions-documentation/downloads/>
 
-**Note:** Only the HTML is "supported" (i.e: on the display point of view). Other format might have layout issue
-but the content remains the same for all format, wether or not you build it locally (provided your local clone is 
+**Note:** Only the HTML format is "supported" (i.e. from the display point of view). Other formats might have layout issues
+but the content remains the same for all formats, whether or not you build it locally (provided your local clone is
 up to date).
 
-Build
------
+## Build
+
+To generate the documentation, you need to have Sphinx installed: <https://www.sphinx-doc.org/en/master/usage/installation.html#windows>
+The following installs and build the GE html documentation for any Python package with PIP included:
+
+- pip install -U sphinx
+- sphinx-build -b html -d build/doctrees source build/html
+
+If you have docker installed, you could also generate the documentation using the command in a `cmd` prompt (or run the file `make-html_docker.cmd`):
+
+```
+docker run --rm -v %CD%:/docs sphinxdoc/sphinx sphinx-build -b html -d build/doctrees source build/html
+```
 
 ### HTML
+
 Simply run `make-html.cmd`. You can also use `make-singlehtml.cmd` to generate a single HTML
 file. The `make_and_start_Browser.cmd` is an alias of `make-html.cmd` that will open in your
 default browser the documentation main index.
 
 ### HTML Help Files
-**Warning:** This format is not completly supported (i.e: you can generate it but we don't 
-guarantee an as good display quality as for HTML).
 
-Download HTML Help Workshop (http://www.microsoft.com/en-us/download/details.aspx?id=21138).
+**Warning:** This format is not completely supported (i.e. you can generate it but we don't
+guarantee as good a display quality as for HTML).
+
+Download HTML Help Workshop (<https://www.microsoft.com/en-us/download/details.aspx?id=21138>).
 
-To build the file, use `makeHTMLHelp.cmd`
+To build the file, use `make-HTMLHelp.cmd`
 
 ### PDF
-**Warning:** This format is not completly supported (i.e: you can generate it but we don't 
-guarantee an as good display quality as for HTML).
+
+**Warning:** This format is not completely supported (i.e. you can generate it but we don't
+guarantee as good a display quality as for HTML).
 
 To use the PDF builder, you'll need to install:
 
-* rst2pdf `easy_install rst2pdf`
-* pil `easy_install pil`
+- rst2pdf `easy_install rst2pdf`
+- pil `easy_install pil`
 
 Also add `,'rst2pdf.pdfbuilder'` to the source/conf.py file at the line 28. Then run `make.cmd pdf`.
+
+## Version update
+
+- Set version in source/conf.py
+- Create release branch release/x.y (this is the default from the GE About menu for released versions, 'master' for development builds).
+- When releasing final, push 'latest' branch to release/x.y commit (this branch is the default when browsing <https://git-extensions-documentation.readthedocs.io/>).
+- Edit versions in <https://readthedocs.org/projects/git-extensions-documentation/versions/> (admin privileges needed). Keep relevant versions active.
+- Trigger a build for changed versions
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		docker run --rm -v %CD%:/docs sphinxdoc/sphinx sphinx-build -b html -d build/doctrees source build/html