Update Ubuntu install instructions

diff --git a/installation/ubuntu.md b/installation/ubuntu.md
index 2c9542c8ee96130e7f25e2aaae9f6fd014f2cf3c..5d6ffe57be21a646c1a5fcec1d67c67d19aa2f26 100644 (file)
--- a/installation/ubuntu.md
+++ b/installation/ubuntu.md
@@ -3,40 +3,13 @@ title: Installation on Ubuntu
 layout: default
 ---
 
-## Ubuntu wily and newer
+`dspdfviewer` is **included in the main repositories** since wily (2015/10).
 
-`dspdfviewer` is included in wily and newer. Simply call <span class="root">
-`apt-get install dspdfviewer`</span>.
+Simply call <span class="root">`apt-get install dspdfviewer`</span> or
+use your favorite GUI to install the `dspdfviewer` package.
 
-## Ubuntu Precise LTS and Trusty LTS
+## Older versions
 
-Add the repository `ppa:dannyedel/dspdfviewer` to your system source list
-and install from it.
+* There is a [PPA hosting 1.15 for trusty and precise][ppa].
 
-You can do this by running
-
-{% highlight bash %}
-sudo add-apt-repository ppa:dannyedel/dspdfviewer
-# the system will ask for your password and confirmation
-sudo apt-get update
-sudo apt-get install dspdfviewer
-{% endhighlight %}
-
-## Versions overview
-
-To see which version of `dspdfviewer` is included in which Ubuntu release, check out
-https://launchpad.net/ubuntu/+source/dspdfviewer
-
-## Advanced users: Follow the development version
-
-If you want to help development by testing new features, please
-use the `ppa:dannyedel/dspdfviewer-daily` package source.
-
-You can do this by running
-
-{% highlight bash %}
-sudo add-apt-repository ppa:dannyedel/dspdfviewer-daily
-# the system will ask for your password and confirmation
-sudo apt-get update
-sudo apt-get install dspdfviewer
-{% endhighlight %}
+[ppa]: /installation/ubuntu/ppa

diff --git a/installation/ubuntu/ppa.md b/installation/ubuntu/ppa.md
new file mode 100644 (file)
index 0000000..5b93b52
--- /dev/null
+++ b/installation/ubuntu/ppa.md
@@ -0,0 +1,31 @@
+---
+title: Installation on Trusty and Precise via PPA
+---
+
+[Back to Ubuntu installation](/installation/ubuntu.html)
+
+Add the repository `ppa:dannyedel/dspdfviewer` to your system source list
+and install from it.
+
+You can do this by running
+
+{% highlight bash %}
+sudo add-apt-repository ppa:dannyedel/dspdfviewer
+# the system will ask for your password and confirmation
+sudo apt-get update
+sudo apt-get install dspdfviewer
+{% endhighlight %}
+
+## Versions overview
+
+To see which version of `dspdfviewer` is included in which Ubuntu release,
+check out the following pages:
+
+* [Ubuntu official distributions][launchpad]
+* PPAs for...
+  * [precise][precise]
+  * [trusty][trusty]
+
+[launchpad]: https://launchpad.net/ubuntu/+source/dspdfviewer
+[precise]: https://launchpad.net/~dannyedel/+archive/ubuntu/dspdfviewer?field.series_filter=precise
+[trusty]: https://launchpad.net/~dannyedel/+archive/ubuntu/dspdfviewer?field.series_filter=trusty