Author: jross
Date: Wed Nov 25 20:49:04 2015
New Revision: 1716541
URL: http://svn.apache.org/viewvc?rev=1716541&view=rev
Log:
QPID-6773: Host and link to the Copr Qpid GPG key; bring the Debian text in
line with Fedora
Added:
qpid/site/docs/copr-qpid-pubkey.gpg (with props)
qpid/site/input/copr-qpid-pubkey.gpg (with props)
Modified:
qpid/site/docs/packages.html
qpid/site/input/packages.md
Added: qpid/site/docs/copr-qpid-pubkey.gpg
URL:
http://svn.apache.org/viewvc/qpid/site/docs/copr-qpid-pubkey.gpg?rev=1716541&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/site/docs/copr-qpid-pubkey.gpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: qpid/site/docs/copr-qpid-pubkey.gpg
------------------------------------------------------------------------------
svn:mime-type = application/pgp-keys
Modified: qpid/site/docs/packages.html
URL:
http://svn.apache.org/viewvc/qpid/site/docs/packages.html?rev=1716541&r1=1716540&r2=1716541&view=diff
==============================================================================
--- qpid/site/docs/packages.html (original)
+++ qpid/site/docs/packages.html Wed Nov 25 20:49:04 2015
@@ -120,14 +120,18 @@ https://github.com/alanconway/proton-go/
<p>Use <code>apt-get</code> to install Qpid and its dependencies.</p>
-<p>To install the C++ broker and management tools:</p>
+<p>To install the C++ and Python
+<a href="/components/messaging-api/index.html">Messaging</a> APIs:</p>
-<pre><code>% apt-get install qpidd qpid-tools
+<pre><code>% apt-get install libqpidmessaging2-dev
+% apt-get install python-qpid
</code></pre>
-<p>To install the C++ and Python Messaging APIs:</p>
+<p>To install the
+<a href="/components/cpp-broker/index.html">C++ broker</a> and
+tools::</p>
-<pre><code>% apt-get install libqpidmessaging2-dev python-qpid
+<pre><code>% apt-get install qpidd qpid-tools
</code></pre>
<h2 id="fedora">Fedora</h2>
@@ -170,8 +174,8 @@ Install the EPEL release RPM to add the
<pre><code>% rpm -i
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
</code></pre>
-<p>Once installed, you can use the Fedora instructions above to install
-the packages.</p>
+<p>Once installed, you can use the <a href="#fedora">Fedora instructions</a>
above
+to install the packages.</p>
<p>Due to an existing set of deprecated Qpid packages in RHEL 6 and
CentOS 6, we cannot at present provide updated Qpid packages directly
@@ -181,6 +185,7 @@ in EPEL 6. We offer an alternative repo
<ul>
<li><a href="https://copr.fedoraproject.org/coprs/irina/qpid/";>Qpid at
Copr</a></li>
<li><a
href="https://copr.fedoraproject.org/coprs/irina/qpid/repo/epel-6/irina-qpid-epel-6.repo";>Copr
repo file for RHEL 6 and CentOS 6</a></li>
+<li><a href="/copr-qpid-pubkey.gpg">Copr Qpid GPG public key</a></li>
</ul>
<p>Use the <code>yum copr</code> or <code>dnf copr</code> command to add the
repository to your
Added: qpid/site/input/copr-qpid-pubkey.gpg
URL:
http://svn.apache.org/viewvc/qpid/site/input/copr-qpid-pubkey.gpg?rev=1716541&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/site/input/copr-qpid-pubkey.gpg
------------------------------------------------------------------------------
svn:mime-type = application/pgp-keys
Modified: qpid/site/input/packages.md
URL:
http://svn.apache.org/viewvc/qpid/site/input/packages.md?rev=1716541&r1=1716540&r2=1716541&view=diff
==============================================================================
--- qpid/site/input/packages.md (original)
+++ qpid/site/input/packages.md Wed Nov 25 20:49:04 2015
@@ -23,13 +23,17 @@
Use `apt-get` to install Qpid and its dependencies.
-To install the C++ broker and management tools:
+To install the C++ and Python
+[Messaging]({{site_url}}/components/messaging-api/index.html) APIs:
- % apt-get install qpidd qpid-tools
+ % apt-get install libqpidmessaging2-dev
+ % apt-get install python-qpid
-To install the C++ and Python Messaging APIs:
+To install the
+[C++ broker]({{site_url}}/components/cpp-broker/index.html) and
+tools::
- % apt-get install libqpidmessaging2-dev python-qpid
+ % apt-get install qpidd qpid-tools
## Fedora
@@ -66,8 +70,8 @@ Install the EPEL release RPM to add the
% rpm -i
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-Once installed, you can use the Fedora instructions above to install
-the packages.
+Once installed, you can use the [Fedora instructions](#fedora) above
+to install the packages.
Due to an existing set of deprecated Qpid packages in RHEL 6 and
CentOS 6, we cannot at present provide updated Qpid packages directly
@@ -76,6 +80,7 @@ in EPEL 6. We offer an alternative repo
- [Qpid at Copr](https://copr.fedoraproject.org/coprs/irina/qpid/)
- [Copr repo file for RHEL 6 and CentOS
6](https://copr.fedoraproject.org/coprs/irina/qpid/repo/epel-6/irina-qpid-epel-6.repo)
+ - [Copr Qpid GPG public key]({{site_url}}/copr-qpid-pubkey.gpg)
Use the `yum copr` or `dnf copr` command to add the repository to your
system.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
