[PATCH] doc: update NixOS wiki url to the official wiki

  • Done
  • quality assurance status badge
Details
3 participants
  • Christopher Baines
  • pelzflorian (Florian Pelz)
  • picnoir
Owner
unassigned
Submitted by
picnoir
Severity
normal
P
P
picnoir wrote on 9 May 09:15 +0200
(address . guix-patches@gnu.org)(name . Picnoir)(address . picnoir@alternativebit.fr)
aefb91fbc40a4269ef9f5f3ba46e0758703574a2.1715238949.git.picnoir@alternativebit.fr
From: Picnoir <picnoir@alternativebit.fr>

* doc/guix.texi (Nix service): nixos.wiki was created by a community member a
long time ago. It turned out to be very useful to the community, it became an
official service last month hosted on the NixOS.org domain name. To ease the
long term maintainance among other things.
* po/doc/guix-manual.de.po: update NixOS wiki url
* po/doc/guix-manual.es.po: update NixOS wiki url
* po/doc/guix-manual.fr.po: update NixOS wiki url
* po/doc/guix-manual.pt_BR.po: update NixOS wiki url
* po/doc/guix-manual.ru.po: update NixOS wiki url
* po/doc/guix-manual.zh_CN.po: update NixOS wiki url

Change-Id: Ia95074fbfad494e8ceb5c2cdb3faab23f3604882
---
doc/guix.texi | 2 +-
po/doc/guix-manual.de.po | 4 ++--
po/doc/guix-manual.es.po | 2 +-
po/doc/guix-manual.fr.po | 2 +-
po/doc/guix-manual.pt_BR.po | 2 +-
po/doc/guix-manual.ru.po | 2 +-
po/doc/guix-manual.zh_CN.po | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)

Toggle diff (97 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index 1c1e0164e7..ce1a06747c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40669,7 +40669,7 @@ Miscellaneous Services
@itemize
@item Add a Nix channel and update it. See
-@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more
+@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} for more
information about the available channels. If you would like to use the
unstable Nix channel you can do this by running:
diff --git a/po/doc/guix-manual.de.po b/po/doc/guix-manual.de.po
index 8af1fc6082..14842ee711 100644
--- a/po/doc/guix-manual.de.po
+++ b/po/doc/guix-manual.de.po
@@ -79007,8 +79007,8 @@ msgstr "Fügen Sie einen Nix-Kanal ein und aktualisieren Sie ihn. Siehe"
#. type: itemize
#: guix-git/doc/guix.texi:40641
-msgid "@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
-msgstr "@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} für eine Übersicht, welche Kanäle es gibt. Wenn Sie den Nix-Kanal „unstable“ nutzen möchten, führen Sie dazu das aus:"
+msgid "@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
+msgstr "@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} für eine Übersicht, welche Kanäle es gibt. Wenn Sie den Nix-Kanal „unstable“ nutzen möchten, führen Sie dazu das aus:"
#. type: example
#: guix-git/doc/guix.texi:40645
diff --git a/po/doc/guix-manual.es.po b/po/doc/guix-manual.es.po
index efe3de9dd9..e7c236936a 100644
--- a/po/doc/guix-manual.es.po
+++ b/po/doc/guix-manual.es.po
@@ -83709,7 +83709,7 @@ msgstr "Añada un canal Nix y lance una actualización. Véase"
#. type: itemize
#: guix-git/doc/guix.texi:40641
-msgid "@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
+msgid "@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
msgstr ""
#. type: example
diff --git a/po/doc/guix-manual.fr.po b/po/doc/guix-manual.fr.po
index 0299c4aeec..ffd9ed652b 100644
--- a/po/doc/guix-manual.fr.po
+++ b/po/doc/guix-manual.fr.po
@@ -80507,7 +80507,7 @@ msgstr "Ajoutez un canal Nix et mettez-le à jour. Voir"
#. type: itemize
#: guix-git/doc/guix.texi:40641
-msgid "@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
+msgid "@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
msgstr ""
#. type: example
diff --git a/po/doc/guix-manual.pt_BR.po b/po/doc/guix-manual.pt_BR.po
index 58bb796068..1d4d21e877 100644
--- a/po/doc/guix-manual.pt_BR.po
+++ b/po/doc/guix-manual.pt_BR.po
@@ -76851,7 +76851,7 @@ msgstr ""
#. type: itemize
#: guix-git/doc/guix.texi:40824
-msgid "@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
+msgid "@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
msgstr ""
#. type: example
diff --git a/po/doc/guix-manual.ru.po b/po/doc/guix-manual.ru.po
index 7919f8a76c..27f2123ab3 100644
--- a/po/doc/guix-manual.ru.po
+++ b/po/doc/guix-manual.ru.po
@@ -79153,7 +79153,7 @@ msgstr ""
#. type: itemize
#: guix-git/doc/guix.texi:40641
-msgid "@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
+msgid "@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
msgstr ""
#. type: example
diff --git a/po/doc/guix-manual.zh_CN.po b/po/doc/guix-manual.zh_CN.po
index f400491cbf..318b95c095 100644
--- a/po/doc/guix-manual.zh_CN.po
+++ b/po/doc/guix-manual.zh_CN.po
@@ -76489,7 +76489,7 @@ msgstr ""
#. type: itemize
#: guix-git/doc/guix.texi:40641
-msgid "@url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
+msgid "@url{https://wiki.nixos.org/wiki/Nix_channels, Nix channels} for more information about the available channels. If you would like to use the unstable Nix channel you can do this by running:"
msgstr ""
#. type: example

base-commit: 9cf0f714636cb9a21875f15c0172211d7def661e
--
2.41.0
P
P
pelzflorian (Florian Pelz) wrote on 10 May 16:29 +0200
(address . picnoir@alternativebit.fr)
87frupwxis.fsf@pelzflorian.de
Hello Picnoir. The consequences of this change are not clear to me.
Does changing the URL mean taking sides in a dispute which Wiki is the
right one? nixos.org does not link to the wiki and neither does
nixos.wiki.

Regards,
Florian
F
F
Félix Baylac Jacqué wrote on 11 May 21:33 +0200
(name . pelzflorian (Florian Pelz))(address . pelzflorian@pelzflorian.de)
87pltscfeu.fsf@alternativebit.fr
Hi Florian,

Toggle quote (3 lines)
> nixos.org does not link to the wiki and neither does
> nixos.wiki.

https://nixos.org/learn/points to the new wiki link, it was linking to
nixos.wiki before we moved the wiki.
C
C
Christopher Baines wrote on 12 May 20:38 +0200
(address . picnoir@alternativebit.fr)
87a5ku7u4x.fsf@cbaines.net
picnoir@alternativebit.fr writes:

Toggle quote (25 lines)
> From: Picnoir <picnoir@alternativebit.fr>
>
> * doc/guix.texi (Nix service): nixos.wiki was created by a community member a
> long time ago. It turned out to be very useful to the community, it became an
> official service last month hosted on the NixOS.org domain name. To ease the
> long term maintainance among other things.
> See more details at https://github.com/NixOS/foundation/issues/113
> * po/doc/guix-manual.de.po: update NixOS wiki url
> * po/doc/guix-manual.es.po: update NixOS wiki url
> * po/doc/guix-manual.fr.po: update NixOS wiki url
> * po/doc/guix-manual.pt_BR.po: update NixOS wiki url
> * po/doc/guix-manual.ru.po: update NixOS wiki url
> * po/doc/guix-manual.zh_CN.po: update NixOS wiki url
>
> Change-Id: Ia95074fbfad494e8ceb5c2cdb3faab23f3604882
> ---
> doc/guix.texi | 2 +-
> po/doc/guix-manual.de.po | 4 ++--
> po/doc/guix-manual.es.po | 2 +-
> po/doc/guix-manual.fr.po | 2 +-
> po/doc/guix-manual.pt_BR.po | 2 +-
> po/doc/guix-manual.ru.po | 2 +-
> po/doc/guix-manual.zh_CN.po | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)

Thanks for the patch, I've removed the po changes since I think the
translations are updated separately. I've also tweaked the commit
message a bit and pushed this to master as
986ee0c66c470c900db1dccadcaa092a6d0905ca.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZBDK5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xd0Tg/+Lh8t8K6dTO2y7PJnALEDix60dhK9nF7P
uoWTAvvjP3SJ6yMi6uEU4QjlZkxFhD6nrTCn/UzFtqcvX1xvw33ycVwJr+ULtxWl
tsmzkDYG+lI/LEWFlGbMOloyEKifRb8wPOdFrb0cjpSbeLrzLHdTLwJr04/qGukp
SlM/2iqoxKhCTjIr71498mePZDmedWeVDmAziEEtCyIgKjacszpYslVXy+1nO9Mm
1oPH962oVND5W0m0HMF2yDubNUwdL/ACAoBWz55E959ckp4pelfr4XTbH8znBkXj
ipV62cqwBdzoA9mrXWiMWb9aEBIRlQ+t0Ue/CnB0pN60G5EWsm/QrEDMO5Tf0Z7T
YyCrNuLx75ampCvN6PjfmFgKk40zSXGz2EdmPpUaU/ahnZwID//08XGZXicE4aSn
TqEZxOOPsKU2tblUdQH8q8FgAU4clPdUCmBnCTo4gofuiIfQIB/HOY/TImfmlTQF
LaURoe9WYVi7gdfz8zSXGW/joI1EXKYIV7nwS5MOm79vTo/AF0NeuiI0vntS5pxW
ivSNLYBjadfsUCjSxKCQrs8D0hA1D/AQv9ADa3spLffbq5Z+NHdLB12xEd5Eqho6
DBWvJeTOlLv+clElaAZwslXfYiZVnP3aLuxGm2UeIb+wSsrRcZyip94sHC0Pxjhg
W86K9LJ2rdE=
=rK68
-----END PGP SIGNATURE-----

Closed
P
P
pelzflorian (Florian Pelz) wrote on 13 May 14:01 +0200
(name . Christopher Baines)(address . mail@cbaines.net)
87ikzhyl7u.fsf@pelzflorian.de
Christopher Baines <mail@cbaines.net> writes:
Toggle quote (3 lines)
> Thanks for the patch, I've removed the po changes since I think the
> translations are updated separately.

Yes. Commiting PO changes is okay but not worth the breakage risk nor
extra effort.

Toggle quote (3 lines)
> I've also tweaked the commit
> message a bit and pushed this to master

Thank you all involved.

Regards,
Florian
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70844@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70844
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch