Date: Sun, 23 May 2021 19:34:52 GMT From: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: adda9a6066 - main - Link to the new pgpkeys.txt file in articles and books Message-ID: <202105231934.14NJYq7W016191@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=adda9a606635e898972fe88170ae51c76b02fc02 commit adda9a606635e898972fe88170ae51c76b02fc02 Author: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> AuthorDate: 2021-05-23 19:33:46 +0000 Commit: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> CommitDate: 2021-05-23 19:33:46 +0000 Link to the new pgpkeys.txt file in articles and books Link in articles and books to the new pgpkeys.txt file Remove all AsciiDoc syntax in pgpkeys.txt PR: 254636 Submitted by: dinoex@ --- documentation/content/de/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/el/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/en/articles/pgpkeys/_index.adoc | 2 +- documentation/content/en/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/fr/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/hu/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/it/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/ja/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/mn/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/nl/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/pl/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/ru/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/zh-cn/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/content/zh-tw/books/handbook/pgpkeys/_index.adoc | 2 +- documentation/tools/global-pgpkeys-creator.rb | 5 ++++- 15 files changed, 18 insertions(+), 15 deletions(-) diff --git a/documentation/content/de/books/handbook/pgpkeys/_index.adoc b/documentation/content/de/books/handbook/pgpkeys/_index.adoc index 3dd74c2628..0be2e24e81 100644 --- a/documentation/content/de/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/de/books/handbook/pgpkeys/_index.adoc @@ -31,7 +31,7 @@ include::shared/de/urls.adoc[] :pgpkeys-path: -Verwenden Sie die nachstehenden Schlüssel, wenn Sie eine Signatur überprüfen oder eine verschlüsselte E-Mail an einen Ansprechpartner oder einen Entwickler schicken wollen. Eine vollständige Liste der FreeBSD OpenPGP-Schlüssel finden Sie im Artikel {pgpkeys}[PGP Keys]. Den vollständigen Schlüsselring der Entwickler von FreeBSD finden Sie unter https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +Verwenden Sie die nachstehenden Schlüssel, wenn Sie eine Signatur überprüfen oder eine verschlüsselte E-Mail an einen Ansprechpartner oder einen Entwickler schicken wollen. Eine vollständige Liste der FreeBSD OpenPGP-Schlüssel finden Sie im Artikel {pgpkeys}[PGP Keys]. Den vollständigen Schlüsselring der Entwickler von FreeBSD finden Sie unter link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Ansprechpartner diff --git a/documentation/content/el/books/handbook/pgpkeys/_index.adoc b/documentation/content/el/books/handbook/pgpkeys/_index.adoc index 2515d26995..7ed4bf4060 100644 --- a/documentation/content/el/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/el/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/el/urls.adoc[] :pgpkeys-path: -Στο παράρτημα αυτό, θα βρείτε τα δημόσια PGP κλειδιά των officers και των μελών της ομάδας ανάπτυξης του FreeBSD. Μπορείτε να τα χρησιμοποιήσετε για να ελέγξετε μια ψηφιακή υπογραφή ή για να στείλετε κρυπτογραφημένο email σε κάποιο μέλος της ομάδας. Μπορείτε να κατεβάσετε την πλήρη λίστα από κλειδιά χρηστών του `FreeBSD.org`, από την τοποθεσία link:https://www.FreeBSD.org/doc/pgpkeyring.txt[http://www.FreeBSD.org/doc/pgpkeyring.txt]. +Στο παράρτημα αυτό, θα βρείτε τα δημόσια PGP κλειδιά των officers και των μελών της ομάδας ανάπτυξης του FreeBSD. Μπορείτε να τα χρησιμοποιήσετε για να ελέγξετε μια ψηφιακή υπογραφή ή για να στείλετε κρυπτογραφημένο email σε κάποιο μέλος της ομάδας. Μπορείτε να κατεβάσετε την πλήρη λίστα από κλειδιά χρηστών του `FreeBSD.org`, από την τοποθεσία link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Officers diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc index f0737ef992..4efcf5152b 100644 --- a/documentation/content/en/articles/pgpkeys/_index.adoc +++ b/documentation/content/en/articles/pgpkeys/_index.adoc @@ -37,7 +37,7 @@ endif::[] toc::[] These OpenPGP keys can be used to verify a signature or send encrypted email to `FreeBSD.org` officers or developers. -The complete keyring can be downloaded at link:https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +The complete keyring can be downloaded at link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. //// Do not edit this file except as instructed by the addkey.sh script. diff --git a/documentation/content/en/books/handbook/pgpkeys/_index.adoc b/documentation/content/en/books/handbook/pgpkeys/_index.adoc index 0c481c80c6..ff7404be9a 100644 --- a/documentation/content/en/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/en/books/handbook/pgpkeys/_index.adoc @@ -30,7 +30,7 @@ include::shared/en/urls.adoc[] :pgpkeys-path: -The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Officers diff --git a/documentation/content/fr/books/handbook/pgpkeys/_index.adoc b/documentation/content/fr/books/handbook/pgpkeys/_index.adoc index 66c7310c69..febab06565 100644 --- a/documentation/content/fr/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/fr/books/handbook/pgpkeys/_index.adoc @@ -31,7 +31,7 @@ include::shared/fr/urls.adoc[] :pgpkeys-path: -Les clés OpenPGP des officiers `FreeBSD.org` sont données ici. Ces clés peuvent être utilisées pour vérifier une signature ou pour envoyer un courrier électronique chiffré à un des officiers. Une liste complète des clés OpenPGP FreeBSD est disponible dans l'article link:{pgpkeys}[Clés PGP]. Le trouseau complet peut être télécharger depuis https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +Les clés OpenPGP des officiers `FreeBSD.org` sont données ici. Ces clés peuvent être utilisées pour vérifier une signature ou pour envoyer un courrier électronique chiffré à un des officiers. Une liste complète des clés OpenPGP FreeBSD est disponible dans l'article link:{pgpkeys}[Clés PGP]. Le trouseau complet peut être télécharger depuis link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Officers diff --git a/documentation/content/hu/books/handbook/pgpkeys/_index.adoc b/documentation/content/hu/books/handbook/pgpkeys/_index.adoc index 26f9a79cf7..95794e5c26 100644 --- a/documentation/content/hu/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/hu/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/hu/urls.adoc[] :pgpkeys-path: -The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Tisztségviselők diff --git a/documentation/content/it/books/handbook/pgpkeys/_index.adoc b/documentation/content/it/books/handbook/pgpkeys/_index.adoc index 77cbb87bb9..9bfaf76a71 100644 --- a/documentation/content/it/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/it/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/it/teams.adoc[] :pgpkeys-path: -Nel caso tu debba verificare una firma o inviare un messaggio cifrato a una delle cariche ufficiali o a uno degli sviluppatori, qui puoi trovare per tua comodità una serie di chiavi. Un portachiavi completo degli utenti `FreeBSD.org` è disponibile per il download da https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +Nel caso tu debba verificare una firma o inviare un messaggio cifrato a una delle cariche ufficiali o a uno degli sviluppatori, qui puoi trovare per tua comodità una serie di chiavi. Un portachiavi completo degli utenti `FreeBSD.org` è disponibile per il download da link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Cariche Ufficiali diff --git a/documentation/content/ja/books/handbook/pgpkeys/_index.adoc b/documentation/content/ja/books/handbook/pgpkeys/_index.adoc index e7ef770d0c..025a56812b 100644 --- a/documentation/content/ja/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/ja/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/ja/urls.adoc[] :pgpkeys-path: -`FreeBSD.org` オフィサの PGP 公開鍵を以下に示します。 これらの公開鍵は、署名を検証したり、 オフィサに暗号メールを送る必要がある場合に使用できます。 すべての FreeBSD 公開鍵の一覧は、 link:{pgpkeys}[PGP Keys] にあります。 また、完全なキーリングは https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt] からダウンロードできます。 +`FreeBSD.org` オフィサの PGP 公開鍵を以下に示します。 これらの公開鍵は、署名を検証したり、 オフィサに暗号メールを送る必要がある場合に使用できます。 すべての FreeBSD 公開鍵の一覧は、 link:{pgpkeys}[PGP Keys] にあります。 また、完全なキーリングは link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt] からダウンロードできます。 [[pgpkeys-officers]] == オフィサ diff --git a/documentation/content/mn/books/handbook/pgpkeys/_index.adoc b/documentation/content/mn/books/handbook/pgpkeys/_index.adoc index e1d9aa6198..1f862eb598 100644 --- a/documentation/content/mn/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/mn/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/mn/urls.adoc[] :pgpkeys-path: -The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Officers diff --git a/documentation/content/nl/books/handbook/pgpkeys/_index.adoc b/documentation/content/nl/books/handbook/pgpkeys/_index.adoc index 846ecf8a4f..35f8740cff 100644 --- a/documentation/content/nl/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/nl/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/nl/urls.adoc[] :pgpkeys-path: -In het geval een handtekening van een van de beambten of ontwikkelaars gecontroleerd moet worden of er een versleutelde e-mail aan ze gezonden moet worden, worden hier voor het gemak een aantal sleutels weergegeven. Een complete sleutelring van `FreeBSD.org` gebruikers kan op de volgende link gedownload worden: https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +In het geval een handtekening van een van de beambten of ontwikkelaars gecontroleerd moet worden of er een versleutelde e-mail aan ze gezonden moet worden, worden hier voor het gemak een aantal sleutels weergegeven. Een complete sleutelring van `FreeBSD.org` gebruikers kan op de volgende link gedownload worden: link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Beambten diff --git a/documentation/content/pl/books/handbook/pgpkeys/_index.adoc b/documentation/content/pl/books/handbook/pgpkeys/_index.adoc index 44c60009d6..71891b0a9c 100644 --- a/documentation/content/pl/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/pl/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/pl/teams.adoc[] :pgpkeys-path: -W tym rozdziale zostało zebranych, dla naszej wygody, wiele kluczy oficerów czy twórców FreeBSD, gdybyśmy musieli zweryfikować podpis bądź wysłać do jednego z nich zaszyfrowaną wiadomość. Kompletna baza kluczy użytkowników `FreeBSD.org` dostępna jest pod adresem https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +W tym rozdziale zostało zebranych, dla naszej wygody, wiele kluczy oficerów czy twórców FreeBSD, gdybyśmy musieli zweryfikować podpis bądź wysłać do jednego z nich zaszyfrowaną wiadomość. Kompletna baza kluczy użytkowników `FreeBSD.org` dostępna jest pod adresem link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Oficerowie diff --git a/documentation/content/ru/books/handbook/pgpkeys/_index.adoc b/documentation/content/ru/books/handbook/pgpkeys/_index.adoc index 809e8fb031..9b85e25682 100644 --- a/documentation/content/ru/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/ru/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/ru/urls.adoc[] :pgpkeys-path: -В случае, если вам нужно проверить подпись или послать зашифрованное электронное письмо одному из офицеров или разработчиков, то для вашего удобства здесь представлено некоторое количество ключей. Полный список ключей пользователей `FreeBSD.org` доступен для скачивания с http://www.FreeBSD.org/doc/pgpkeyring.txt. +В случае, если вам нужно проверить подпись или послать зашифрованное электронное письмо одному из офицеров или разработчиков, то для вашего удобства здесь представлено некоторое количество ключей. Полный список ключей пользователей `FreeBSD.org` доступен для скачивания с link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Офицеры diff --git a/documentation/content/zh-cn/books/handbook/pgpkeys/_index.adoc b/documentation/content/zh-cn/books/handbook/pgpkeys/_index.adoc index b74d12071a..568193758e 100644 --- a/documentation/content/zh-cn/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/zh-cn/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/zh-cn/urls.adoc[] :pgpkeys-path: -有些时候，您可能需要校验签名或者发送加密的邮件给官员或者开发者， 这里为了方便您而提供了一些密钥。完整的 FreeBSD.org 用户密钥可以在 http://www.FreeBSD.org/doc/pgpkeyring.txt 下载。 +有些时候，您可能需要校验签名或者发送加密的邮件给官员或者开发者， 这里为了方便您而提供了一些密钥。完整的 FreeBSD.org 用户密钥可以在 link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt] 下载。 [[pgpkeys-officers]] == Officers diff --git a/documentation/content/zh-tw/books/handbook/pgpkeys/_index.adoc b/documentation/content/zh-tw/books/handbook/pgpkeys/_index.adoc index eb46d2da5e..5758a5cfa9 100644 --- a/documentation/content/zh-tw/books/handbook/pgpkeys/_index.adoc +++ b/documentation/content/zh-tw/books/handbook/pgpkeys/_index.adoc @@ -32,7 +32,7 @@ include::shared/zh-tw/teams.adoc[] :pgpkeys-path: -The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at https://www.FreeBSD.org/doc/pgpkeyring.txt[https://www.FreeBSD.org/doc/pgpkeyring.txt]. +The OpenPGP keys of the `FreeBSD.org` officers are shown here. These keys can be used to verify a signature or send encrypted email to one of the officers. A full list of FreeBSD OpenPGP keys is available in the link:{pgpkeys}[PGP Keys] article. The complete keyring can be downloaded at link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt]. [[pgpkeys-officers]] == Officers diff --git a/documentation/tools/global-pgpkeys-creator.rb b/documentation/tools/global-pgpkeys-creator.rb index 72825f613e..6f9dd3d08e 100644 --- a/documentation/tools/global-pgpkeys-creator.rb +++ b/documentation/tools/global-pgpkeys-creator.rb @@ -22,7 +22,10 @@ end def processPGPKey(keyFile, pgpKeysFile) File.readlines(keyFile).each do |line| - if not line.include? "// sh addkey.sh" and not line.include? "[.literal-block-margin]" + if # remove script comment and AsciiDoc syntax + not line.include? "// sh addkey.sh" and + not line.include? "[.literal-block-margin]" and + not line.include? "...." pgpKeysFile.puts(line) end end
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105231934.14NJYq7W016191>