diff options
| author | Rob Austein <sra@hactrn.net> | 2014-10-11 19:44:12 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-10-11 19:44:12 +0000 |
| commit | 73abb473442dd47dcd7b8627a13429e85c26d1e5 (patch) | |
| tree | b909526ef1d0918f5e4088de6f0cafba2a3e3a0a /doc | |
| parent | be075cd718e9780e02fc37fae2c56f3f99bcaa50 (diff) | |
Pull from trunk.
svn path=/branches/tk705/; revision=5998
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.RPKI.Installation | 4 | ||||
| -rw-r--r-- | doc/doc.RPKI.Installation.DebianPackages | 13 | ||||
| -rw-r--r-- | doc/manual.pdf | bin | 757928 -> 758008 bytes |
3 files changed, 11 insertions, 6 deletions
diff --git a/doc/doc.RPKI.Installation b/doc/doc.RPKI.Installation index 1c8047c4..67746d55 100644 --- a/doc/doc.RPKI.Installation +++ b/doc/doc.RPKI.Installation @@ -3,8 +3,8 @@ There are a few different ways to install the RPKI code, depending on what the platform on which you're trying to install. -* On Ubuntu 12.04 LTS ("Precise Pangolin") or Debian 7 ("Wheezy"), you can use - Debian binary packages. +* On Ubuntu 12.04 LTS ("Precise Pangolin"), Ubuntu 14.04 ("Trusty Tahir"), or + Debian 7 ("Wheezy"), you can use Debian binary packages. At present we only generate binary packages for Precise Pangolin and Wheezy. This may change in the future. diff --git a/doc/doc.RPKI.Installation.DebianPackages b/doc/doc.RPKI.Installation.DebianPackages index fe5ab7d8..5a7ce180 100644 --- a/doc/doc.RPKI.Installation.DebianPackages +++ b/doc/doc.RPKI.Installation.DebianPackages @@ -17,15 +17,20 @@ You should only need to perform these steps once for any particular machine. wget -q -O - http://download.rpki.net/APT/apt-gpg-key.asc | sudo apt-key add - -* Configure APT to use this repository (for Ubuntu systems): +* Configure APT to use this repository (for Ubuntu Trusty systems): sudo wget -q -O /etc/apt/sources.list.d/rpki.list http://download.rpki.net/ - APT/rpki.ubuntu.list + APT/rpki.trusty.list -* Configure APT to use this repository (for Debian systems): +* Configure APT to use this repository (for Ubuntu Precise systems): sudo wget -q -O /etc/apt/sources.list.d/rpki.list http://download.rpki.net/ - APT/rpki.debian.list + APT/rpki.precise.list + +* Configure APT to use this repository (for Debian Wheezy systems): + + sudo wget -q -O /etc/apt/sources.list.d/rpki.list http://download.rpki.net/ + APT/rpki.wheezy.list ***** Installation Using APT Tools ***** diff --git a/doc/manual.pdf b/doc/manual.pdf Binary files differindex 656f1223..2cc41a1b 100644 --- a/doc/manual.pdf +++ b/doc/manual.pdf |