fixed

diff --git a/src/psensor/index.adoc b/src/psensor/index.adoc
index e5fcf86..5aaf8b9 100644 (file)
--- a/src/psensor/index.adoc
+++ b/src/psensor/index.adoc
@@ -9,7 +9,7 @@ It can monitor:
 - the temperature of the motherboard and CPU sensors (using http://www.lm-sensors.org/[lm-sensors]).
 - the temperature of the NVidia GPUs (using XNVCtrl).
 - the temperature of ATI/AMD GPUs (not enabled in Ubuntu PPAs or official
-  distribution repositories, see the http://wpitchoune.net/psensor/doc/README.html#_ati_amd_gpu_support[instructions for enabling its support]).
+  distribution repositories, see the link:README.html#_ati_amd_gpu_support[instructions for enabling its support]).
 - the temperature of the Hard Disk Drives (using hddtemp or libatasmart).
 - the rotation speed of the fans (using lm-sensors).
 - the CPU usage (since 0.6.2.10 and using Gtop2).
@@ -65,7 +65,7 @@ Then you can proceed to the installation of `psensor`. For Ubuntu and derivative
 
 And finally launch the `psensor` executable.
 
-More information are available in the Psensor FAQ.
+More information are available in the link:faq.html[Psensor FAQ].
 
 == Source Code
 
@@ -80,23 +80,23 @@ git clone http://git.wpitchoune.net/psensor.git
 
 `psensor` should compile on any modern distribution including `GTK+`` v3 and
 `lm-sensors` which are quite common. For Linux Distribution still stuck on
- `GTK+`` v2, the old 0.6.x releases of `psensor` can be used.
+ `GTK+` v2, the old 0.6.x releases of `psensor` can be used.
 
 If you have trouble compiling `psensor` on a specific Linux distribution,
 don’t hesitate to report it.
 
 Binary packages of `psensor` are available for few Linux distributions:
 
-* Psensor is in the official universe repository of Ubuntu since version 11.10 (Oneiric)
-* Psensor packages for Debian, Psensor is in the standard repository of Debian since 7.0.
-* link:https://launchpad.net/~jfi/+archive/ubuntu/ppa[PPA for Ubuntu]
-* link:http://software.opensuse.org/package/psensor[package for OpenSuse]
-* link:https://aur.archlinux.org/packages/psensor/[Package for ArchLinux]
+* package for Ubuntu is in the official universe repository since version 11.10 (Oneiric)
+* http://packages.qa.debian.org/p/psensor.html[package for Debian] is in the standard repository since 7.0
+* https://launchpad.net/~jfi/+archive/ubuntu/ppa[PPA for Ubuntu]
+* http://software.opensuse.org/package/psensor[package for OpenSuse]
+* https://aur.archlinux.org/packages/psensor/[package for ArchLinux].
 
 == Contact
 
-The Google Group psensor-users can be used for discussion, questions and bug report.
+The Google Group https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users[psensor-users] can be used for discussion, questions and bug report.
 
-For announces or general information subscribe to Psensor Google+ page.
+For announces or general information subscribe to Psensor https://plus.google.com/100166747457211594542[Google+ page].
 
 Alternatively, you can contact me by e-mail: jeanfi@gmail.com.

diff --git a/www/psensor/index.html b/www/psensor/index.html
index 079052e..84c3149 100644 (file)
--- a/www/psensor/index.html
+++ b/www/psensor/index.html
@@ -33,7 +33,7 @@
 </li>
 <li>
 <p>the temperature of ATI/AMD GPUs (not enabled in Ubuntu PPAs or official
-distribution repositories, see the <a href="http://wpitchoune.net/psensor/doc/README.html#_ati_amd_gpu_support">instructions for enabling its support</a>).</p>
+distribution repositories, see the <a href="README.html#_ati_amd_gpu_support">instructions for enabling its support</a>).</p>
 </li>
 <li>
 <p>the temperature of the Hard Disk Drives (using hddtemp or libatasmart).</p>
@@ -118,7 +118,7 @@ Core 1:      +44.0C  (high = +76.0C, crit = +100.0C)
 <p>And finally launch the <code>psensor</code> executable.</p>
 </div>
 <div class="paragraph">
-<p>More information are available in the Psensor FAQ.</p>
+<p>More information are available in the <a href="faq.html">Psensor FAQ</a>.</p>
 </div>
 </div>
 </div>
@@ -153,9 +153,9 @@ Core 1:      +44.0C  (high = +76.0C, crit = +100.0C)
 <h2 id="_linux_distribution_support">Linux Distribution Support</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p><code>psensor</code> should compile on any modern distribution including <code>GTK+<code> v3 and
-`lm-sensors</code> which are quite common. For Linux Distribution still stuck on
- <code>GTK+</code> v2, the old 0.6.x releases of `psensor</code> can be used.</p>
+<p><code>psensor</code> should compile on any modern distribution including <code>GTK+`</code> v3 and
+<code>lm-sensors</code> which are quite common. For Linux Distribution still stuck on
+ <code>GTK+</code> v2, the old 0.6.x releases of <code>psensor</code> can be used.</p>
 </div>
 <div class="paragraph">
 <p>If you have trouble compiling <code>psensor</code> on a specific Linux distribution,
@@ -167,10 +167,10 @@ don’t hesitate to report it.</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Psensor is in the official universe repository of Ubuntu since version 11.10 (Oneiric)</p>
+<p>package for Ubuntu is in the official universe repository since version 11.10 (Oneiric)</p>
 </li>
 <li>
-<p>Psensor packages for Debian, Psensor is in the standard repository of Debian since 7.0.</p>
+<p><a href="http://packages.qa.debian.org/p/psensor.html">package for Debian</a> is in the standard repository since 7.0</p>
 </li>
 <li>
 <p><a href="https://launchpad.net/~jfi/+archive/ubuntu/ppa">PPA for Ubuntu</a></p>
@@ -179,7 +179,7 @@ don’t hesitate to report it.</p>
 <p><a href="http://software.opensuse.org/package/psensor">package for OpenSuse</a></p>
 </li>
 <li>
-<p><a href="https://aur.archlinux.org/packages/psensor/">Package for ArchLinux</a></p>
+<p><a href="https://aur.archlinux.org/packages/psensor/">package for ArchLinux</a>.</p>
 </li>
 </ul>
 </div>
@@ -189,10 +189,10 @@ don’t hesitate to report it.</p>
 <h2 id="_contact">Contact</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The Google Group psensor-users can be used for discussion, questions and bug report.</p>
+<p>The Google Group <a href="https://groups.google.com/forum/?fromgroups&amp;hl=en#!forum/psensor-users">psensor-users</a> can be used for discussion, questions and bug report.</p>
 </div>
 <div class="paragraph">
-<p>For announces or general information subscribe to Psensor Google+ page.</p>
+<p>For announces or general information subscribe to Psensor <a href="https://plus.google.com/100166747457211594542">Google+ page</a>.</p>
 </div>
 <div class="paragraph">
 <p>Alternatively, you can contact me by e-mail: <a href="mailto:jeanfi@gmail.com">jeanfi@gmail.com</a>.</p>
@@ -202,7 +202,7 @@ don’t hesitate to report it.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-06-11 13:11:47 CEST
+Last updated 2016-06-13 12:22:44 CEST
 </div>
 </div>
 </body>