Merge branch 'book-v1-redirects' into gh-pages

Let's integrate this into my fork so that it is deployed to https://dscho.github.io/git-scm.com (to be able to play around with it). Signed-off-by: Johannes Schindelin <[email protected]>
dscho · Nov 17, 2024 · 865a3ff · 865a3ff
2 parents 6604584 + d162536
commit 865a3ff
Show file tree

Hide file tree

Showing 1,063 changed files with 6,862 additions and 37 deletions.
diff --git a/.github/workflows/update-book.yml b/.github/workflows/update-book.yml
@@ -52,9 +52,12 @@ jobs:
         with:
           sparse-checkout: |
             script
+            data/
             external/book/sync
             external/book/data
             external/book/content/book/${{ matrix.language.lang }}
+            external/book/content/book${{ matrix.language.lang != 'en' && '/en' || '' }}
+            external/book/content/book${{ matrix.language.lang != 'en' && '/en' || 'v1' }}
             external/book/static/book/${{ matrix.language.lang }}
       - name: clone ${{ matrix.language.repository }}
         run: |

diff --git a/assets/sass/sidebar.scss b/assets/sass/sidebar.scss
@@ -51,9 +51,9 @@ aside.sidebar.active {
     border: none;
     left: 0;
     width: 1.6rem;
-    &:focus + .sidebar {
-      @include responsive-sidebar-ui;
-    }
+  }
+  .sidebar-btn:focus + .sidebar, .sidebar:focus-within {
+    @include responsive-sidebar-ui;
   }
   aside{
     &.sidebar {

diff --git a/content/downloads/guis/_index.html b/content/downloads/guis/_index.html
@@ -15,7 +15,7 @@ <h1>GUI Clients</h1>
     Git comes with built-in GUI tools for committing (<a href="{{< relurl "docs/git-gui" >}}">git-gui</a>) and browsing (<a href="{{< relurl "docs/gitk" >}}">gitk</a>), but there are several third-party tools for users looking for platform-specific experience.
   </p>
   <p>
-    <small>If you want to add another GUI tool to this list, just <a href="https://github.com/git/git-scm.com/blob/main/README.md#adding-new-gui">follow the instructions</a>.</small>
+    <small>If you want to add another GUI tool to this list, just <a href="https://github.com/git/git-scm.com/blob/main/README.md#adding-a-new-gui">follow the instructions</a>.</small>
   </p>
 
   <p>

diff --git a/content/downloads/linux.html b/content/downloads/linux.html
@@ -17,7 +17,7 @@ <h3>Debian/Ubuntu</h3>
   <p>For the latest stable version for your release of Debian/Ubuntu</p>
   <code># apt-get install git</code>
   <p>For Ubuntu, this PPA provides the latest stable upstream Git version</p>
-  <code># add-apt-repository ppa:git-core/ppa</code>
+  <code># add-apt-repository ppa:git-core/ppa</code><br>
   <code># apt update; apt install git</code>
 
   <h3>Fedora</h3>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ <h1>GUI Clients</h1> @@
         Git comes with built-in GUI tools for committing (<a href="{{< relurl "docs/git-gui" >}}">git-gui</a>) and browsing (<a href="{{< relurl "docs/gitk" >}}">gitk</a>), but there are several third-party tools for users looking for platform-specific experience.
       </p>
       <p>
-        <small>If you want to add another GUI tool to this list, just <a href="https://github.com/git/git-scm.com/blob/main/README.md#adding-new-gui">follow the instructions</a>.</small>
+        <small>If you want to add another GUI tool to this list, just <a href="https://github.com/git/git-scm.com/blob/main/README.md#adding-a-new-gui">follow the instructions</a>.</small>
       </p>
       <p>
@@ Expand Down @@