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]>

Author: dscho

.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: |

README.md

@@ -15,6 +15,7 @@ This site is built with [Hugo](https://gohugo.io/) and served via GitHub Pages.
 $ scalar clone https://github.com/git/git-scm.com
 $ cd git-scm.com/src
 $ git sparse-checkout set layouts content static assets hugo.yml data script
+```
 
 If your Git installation comes without `scalar`, you can create a sparse, partial clone manually, like this:
 
@@ -24,6 +25,7 @@ $ cd git-scm.com
 $ git sparse-checkout set layouts content static assets hugo.yml data script
 $ git reset --hard
 ```
+
 > [!NOTE]
 > If you _already_ have a full clone and wish to accelerate development by focusing only on a small subset of the pages, you may want to run the `git sparse-checkout set [...]` command mentioned above.
 

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 {

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>

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>

content/site/_index.html

@@ -9,12 +9,12 @@
   <h1>About git-scm.com</h1>
 
   This site is open source and maintained by members of the Git
-  community.  We welcome patches, suggestions, and corrections.
+  community. We welcome patches, suggestions, and corrections.
 
   <h2>Open Source</h2>
 
   The content on this site is pulled from multiple sources. It is
-  available under various licenses, and bugs reports should be directed
+  available under various licenses, and bug reports should be directed
   to the appropriate repositories:
 
   <ul>
@@ -81,6 +81,6 @@ <h2>Sponsors</h2>
   </ul>
 
   For a detailed view of the site's network layout, see our
-  <a href="https://github.com/git/git-scm.com/blob/main/ARCHITECTURE.md">architecture document</a>.
+  <a href="https://github.com/git/git-scm.com/blob/gh-pages/ARCHITECTURE.md">architecture document</a>.
 
 </div>