Re: [PATCH] Documentation: remove redundant contributing page

[Alyssa Ross <hi@alyssa.is>]

[-- Attachment #1: Type: text/plain, Size: 2932 bytes --]

Valentin Gagarin <valentin@gagarin.work> writes:

> diff --git a/Documentation/doc/contributing/index.adoc b/Documentation/doc/contributing/index.adoc
> index 04ff34a..c34f4c1 100644
> --- a/Documentation/doc/contributing/index.adoc
> +++ b/Documentation/doc/contributing/index.adoc
> @@ -1,5 +1,6 @@
>  = Contributing
>  :page-nav_order: 5
> +:page-redirect_from: ["/contributing.html"]
>  
>  // SPDX-FileCopyrightText: 2023 Unikie
>  // SPDX-License-Identifier: GFDL-1.3-no-invariants-or-later OR CC-BY-SA-4.0

I'd prefer to handle the redirects in nginx config if that's okay with
you, so it's a proper server-side redirect.  That's where all the
existing redirects are.  (This configuration is not currently in the
Spectrum repo, but I plan for it to be, so it will be possible to still
get the benefits of an atomic change once that's done.)

> diff --git a/Documentation/index.html b/Documentation/index.html
> index 5ce078c..c88cf79 100644
> --- a/Documentation/index.html
> +++ b/Documentation/index.html
> @@ -4,9 +4,10 @@ title: Spectrum, a step towards usable secure computing
>  no_heading: true
>  nav_order: 0
>  ---
> -<!-- SPDX-FileCopyrightText: 2019-2020, 2022, 2024 Alyssa Ross <hi@alyssa.is> -->
>  <!-- SPDX-License-Identifier: CC-BY-SA-4.0 OR GFDL-1.3-no-invariants-or-later -->
>  <!-- SPDX-License-Identifier: GPL-3.0-or-later -->
> +<!-- SPDX-FileCopyrightText: 2019-2020, 2022, 2024 Alyssa Ross <hi@alyssa.is> -->
> +<!-- SPDX-FileCopyrightText: 2026 Valentin Gagarin <valentin@gagarin.work> -->

Are we adopting FileCopyrightText then License-Identifier as the
official style, then?  I'll do it across the board if so — if it's
important enough to rearrange, we should be doing it consistently.

>  
>  <a href="logo" style="float: left; margin: 0 1em 0.5em 0">
>    <img class="logo" src="logo/logo_html.svg" width="70" height="70" alt="Spectrum logo">
> @@ -47,7 +48,7 @@ desktop systems.
>  <p>
>  Spectrum is free software, currently under active development.  If you
>  are interested
> -in <a href="/doc/contributing/communication.html">participating</a>,
> +in <a href="/doc/contributing/index.html">contributing</a>,
>  we'd love to have you.
>  
>  <h2>Funding</h2>
> @@ -91,7 +92,7 @@ initiative by the Digital Single Market of the European Commission.
>      and mailing lists</a>
>      <li><a href="https://spectrum-os.org/git">Git repositories</a>
>      <li><a href="doc/">Documentation</a>
> -    <li><a href="contributing.html">Contributing to Spectrum</a>
> +    <li><a href="doc/contributing/index.html">Contributing to Spectrum</a>

doc/contributing is nicer, no?

>      <li><a href="https://pad.lassul.us/s/mDfFPvHjA">Bugs and upcoming projects</a>
>      <li><a href="https://cryptpad.fr/kanban/#/2/kanban/view/yLtGXWLV6U7X5+Z1ay+oXKZMrSacqQe+51nXZYRh3ck/">Upstream bug/patch tracking</a>
>    </ul>
> -- 
> 2.54.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]