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

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

[picnoir]

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(-)

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

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

[pelzflorian (Florian Pelz)]

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

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

[Félix Baylac Jacqué]

Hi Florian,

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

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

[Christopher Baines]

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

picnoir@alternativebit.fr writes:

> 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

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

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

[pelzflorian (Florian Pelz)]

Christopher Baines <mail@cbaines.net> writes:
> 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.

> I've also tweaked the commit
> message a bit and pushed this to master

Thank you all involved.

Regards,
Florian