os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move most of the PGP keys out of the Handbook into a separate article.

Browse source 
The new article is in articles/pgpkeys.

Approved by:	so, accounts, core, re, portmgr@ (implicit, no objections)
This commit is contained in:
Warren Block 2014-03-15 15:58:58 +00:00
parent 3961a43659
commit c848af5260
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=44243
6 changed files with 100 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
en_US.ISO8859-1/articles/Makefile
View file

@ -34,6 +34,7 @@ SUBDIR+= nanobsd
SUBDIR+= new-users
SUBDIR+= p4-primer
SUBDIR+= pam
SUBDIR+= pgpkeys
SUBDIR+= port-mentor-guidelines
SUBDIR+= portbuild
SUBDIR+= pr-guidelines

21
en_US.ISO8859-1/articles/pgpkeys/Makefile Normal file
View file

@ -0,0 +1,21 @@
#
# $FreeBSD$
#
# Article: PGP Keys
DOC?= article
FORMATS?= html
WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
SRCS= article.xml
# To build with just key fingerprints, set FINGERPRINTS_ONLY.
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"

58
en_US.ISO8859-1/articles/pgpkeys/article.xml Normal file
View file

@ -0,0 +1,58 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
"http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
]>
<!--
The FreeBSD Documentation Project
$FreeBSD$
-->
<!--
Do not edit this file except as instructed by the addkey.sh script.
See the README file in head/share/pgpkeys for instructions.
This article contains all the keys. The officer keys are also
shown in the Handbook PGP keys chapter.
-->
<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="pgpkeys">
<info>
<title>Open<acronym>PGP</acronym> Keys</title>
<pubdate>$FreeBSD$</pubdate>
<releaseinfo>$FreeBSD$</releaseinfo>
</info>
<para>These Open<acronym>PGP</acronym> keys can be used to verify a
signature or send encrypted email to
<systemitem class="fqdomainname">FreeBSD.org</systemitem> officers
or developers. The complete keyring can be downloaded at <link
xlink:href="&url.base;/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</link>.</para>
<sect1 xml:id="pgpkeys-officers">
<title>Officers</title>
&section.pgpkeys-officers;
</sect1>
<sect1 xml:id="pgpkeys-core">
<title>Core Team Members</title>
&section.pgpkeys-core;
</sect1>
<sect1 xml:id="pgpkeys-developers">
<title>Developers</title>
&section.pgpkeys-developers;
</sect1>
<sect1 xml:id="pgpkeys-other">
<title>Other Cluster Account Holders</title>
&section.pgpkeys-other;
</sect1>
</article>

37
en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
View file

@ -10,37 +10,28 @@
See the README file in head/share/pgpkeys for instructions.
Note that only officer keys are shown here now. All of the keys are
shown in en_US.ISO8859-1/articles/pgpkeys/article.xml.
-->
<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="pgpkeys">
<title>PGP Keys</title>
<title>Open<acronym>PGP</acronym> Keys</title>
<indexterm><primary>pgp keys</primary></indexterm>
<para>In case you need to verify a signature or send encrypted email
to one of the officers or developers a number of keys are provided
here for your convenience. A complete keyring of <systemitem class="fqdomainname">FreeBSD.org</systemitem>
users is available for download from <link xlink:href="&url.base;/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</link>.</para>
<para>The Open<acronym>PGP</acronym> keys of the
<systemitem class="fqdomainname">FreeBSD.org</systemitem> 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 &os;
Open<acronym>PGP</acronym> keys is available in the
<link xlink:href="&url.articles.pgpkeys;"><acronym>PGP</acronym>
Keys</link> article. The complete keyring can be downloaded
at <link
xlink:href="&url.base;/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</link>.</para>
<sect1 xml:id="pgpkeys-officers">
<title>Officers</title>
&section.pgpkeys-officers;
</sect1>
<sect1 xml:id="pgpkeys-core">
<title>Core Team Members</title>
&section.pgpkeys-core;
</sect1>
<sect1 xml:id="pgpkeys-developers">
<title>Developers</title>
&section.pgpkeys-developers;
</sect1>
<sect1 xml:id="pgpkeys-other">
<title>Other Cluster Account Holders</title>
&section.pgpkeys-other;
</sect1>
</appendix>

4
en_US.ISO8859-1/htdocs/docs/books.xml
View file

@ -256,6 +256,10 @@
Authentication Modules</a> (pam)<br/>
A guide to the PAM system and modules under FreeBSD.</p>
<p><a href="&url.articles;/pgpkeys/index.html">OpenPGP Keys</a>
(pgpkeys)<br/>
All of the OpenPGP keys for &os;.</p>
<p><a href="&url.articles;/port-mentor-guidelines/index.html">Port
Mentor Guidelines</a> (port-mentor-guidelines)<br/>
Guidelines for new and/or potential port mentors and

2
share/xml/urls.ent
View file

@ -110,6 +110,8 @@
<!ENTITY url.articles.p4-primer.en "&url.doc.langbase.en;/articles/p4-primer">
<!ENTITY url.articles.pam "&url.doc.langbase;/articles/pam">
<!ENTITY url.articles.pam.en "&url.doc.langbase.en;/articles/pam">
<!ENTITY url.articles.pgpkeys "&url.doc.langbase;/articles/pgpkeys">
<!ENTITY url.articles.pgpkeys.en "&url.doc.langbase.en;/articles/pgpkeys">
<!ENTITY url.articles.portbuild "&url.doc.langbase;/articles/portbuild">
<!ENTITY url.articles.portbuild.en "&url.doc.langbase.en;/articles/portbuild">
<!ENTITY url.articles.pr-guidelines "&url.doc.langbase;/articles/pr-guidelines">