From e3e589e185335fe5d965c36a65321b322da2e1bd Mon Sep 17 00:00:00 2001 From: Botato <51982229+Botato300@users.noreply.github.com> Date: Tue, 20 May 2025 11:53:48 -0300 Subject: [PATCH 1/2] fix broken links: change from .txt to .adoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some links like “/docs/howto/update-hook-example” redirected to URLs ending in .txt, which no longer exist. They now redirect to the same URLs ending in .adoc. --- script/update-docs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/update-docs.rb b/script/update-docs.rb index 919db2b15e..83782c3f98 100644 --- a/script/update-docs.rb +++ b/script/update-docs.rb @@ -605,7 +605,7 @@ def index_doc(filter_tags, doc_list, get_content) type = 'tree' target = 'howto' else - target += '.txt' + target += '.adoc' end front_matter = { "redirect_to" => "https://github.com/git/git/#{type}/HEAD/Documentation/#{target}" } # ltrim `docs/` FileUtils.mkdir_p(File.dirname(doc_path)) From 617f4916d11a511c11e1886246135e3c0121a9f3 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 2 Jul 2025 20:18:53 +0200 Subject: [PATCH 2/2] docs/howto/*: re-generate The script determines that it does not need to do anything if the `docs/howto/*.html` in question exists already. But we have to fix the `.txt` extension, which is now the `.adoc` extension. So, after `git rm external/docs/content/docs/howto/*.html`, I simply re-built them via: REBUILD_DOC=v2.50.0 RERUN=1 \ bundle exec ruby script/update-docs.rb git-worktree en Signed-off-by: Johannes Schindelin --- external/docs/content/docs/howto/maintain-git.html | 2 +- external/docs/content/docs/howto/revert-a-faulty-merge.html | 2 +- .../docs/content/docs/howto/setup-git-server-over-http.html | 2 +- external/docs/content/docs/howto/update-hook-example.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external/docs/content/docs/howto/maintain-git.html b/external/docs/content/docs/howto/maintain-git.html index 238722b92f..026c49fca6 100644 --- a/external/docs/content/docs/howto/maintain-git.html +++ b/external/docs/content/docs/howto/maintain-git.html @@ -1,5 +1,5 @@ --- ### DO NOT EDIT! Generated by script/update-docs.rb -redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/maintain-git.txt +redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/maintain-git.adoc --- diff --git a/external/docs/content/docs/howto/revert-a-faulty-merge.html b/external/docs/content/docs/howto/revert-a-faulty-merge.html index f1b18ca7ce..1b69856771 100644 --- a/external/docs/content/docs/howto/revert-a-faulty-merge.html +++ b/external/docs/content/docs/howto/revert-a-faulty-merge.html @@ -1,5 +1,5 @@ --- ### DO NOT EDIT! Generated by script/update-docs.rb -redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/revert-a-faulty-merge.txt +redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/revert-a-faulty-merge.adoc --- diff --git a/external/docs/content/docs/howto/setup-git-server-over-http.html b/external/docs/content/docs/howto/setup-git-server-over-http.html index 5d350ccf26..20bd8351fa 100644 --- a/external/docs/content/docs/howto/setup-git-server-over-http.html +++ b/external/docs/content/docs/howto/setup-git-server-over-http.html @@ -1,5 +1,5 @@ --- ### DO NOT EDIT! Generated by script/update-docs.rb -redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/setup-git-server-over-http.txt +redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/setup-git-server-over-http.adoc --- diff --git a/external/docs/content/docs/howto/update-hook-example.html b/external/docs/content/docs/howto/update-hook-example.html index 0876ac5143..f1400d7e13 100644 --- a/external/docs/content/docs/howto/update-hook-example.html +++ b/external/docs/content/docs/howto/update-hook-example.html @@ -1,5 +1,5 @@ --- ### DO NOT EDIT! Generated by script/update-docs.rb -redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/update-hook-example.txt +redirect_to: https://github.com/git/git/blob/HEAD/Documentation/howto/update-hook-example.adoc ---