updated doc with libatasmart information

renamed option use_libatasmart to use-libatasmart
removed information about .deb on the website (which are not more updated)

diff --git a/NEWS b/NEWS
index 4cc37b4..79c01dc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@
             with the ATI/AMD GPU support.
 ** psensor: fixed compilation error on 64bits with ATI/AMD GPU support.
 ** psensor: added capability to use libatasmart for sata disk monitoring.
-** psensor: added option --use_libatasmart
+** psensor: added option --use-libatasmart
 ** changed copyright dates to 2012.
 
 * v0.6.2.17

diff --git a/README b/README
index cc25948..474b831 100644 (file)
--- a/README
+++ b/README
@@ -55,7 +55,7 @@ Compilation requires the following packages:
 
 gettext libgtk-3-dev libgconf2-dev libnotify-dev libsensors4-dev
 help2man libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev
-libgtop2-dev
+libgtop2-dev libatasmart-dev
 
 Debian kfreebsd
 ---------------
@@ -63,6 +63,7 @@ Debian kfreebsd
 Compilation requires the following packages:
 gcc libgtk2.0-dev libsensors4-dev libgconf2-dev help2man
 libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev
+libatasmart-dev
 
 Ubuntu
 ------
@@ -87,12 +88,6 @@ sudo apt-get update
 sudo apt-get install psensor
 sudo apt-get install psensor-server
 
-Alternatively, you can download Ubuntu binary packages from:
-http://wpitchoune.net/psensor/files/ubuntu/
-The manual installation of the psensor and psensor-server packages
-requires also the installation of psensor-common which contains
-the multiple languages support.
-
 Centos 6
 --------
 
@@ -143,6 +138,7 @@ Psensor compilation requires:
  * library json0 and curl (optional, required for remote monitoring)
  * library unity (>=v3.4.2, optional)
  * library gtop2 (optional, required for CPU usage)
+ * library atasmart (optional, for disk monitoring)
 
 Psensor-server compilation requires:
  * make/gcc    
@@ -152,6 +148,7 @@ Psensor-server compilation requires:
  * library libmicrohttpd 
  * library json0
  * library gtop2 (optional, required for CPU usage)
+ * library atasmart (optional, for disk monitoring)
 
 Compilation and Installation Steps
 ----------------------------------

diff --git a/src/description.txt b/src/description.txt
index f85c2ca..02b6021 100644 (file)
--- a/src/description.txt
+++ b/src/description.txt
@@ -11,7 +11,8 @@ It can monitor:
   * the temperature of the motherboard and CPU sensors (using lm\-sensors).
   * the temperature of the NVidia GPUs (using XNVCtrl).
   * the temperature and fan rotation speed of the ATI GPUs.
-  * the temperature of the Hard Disk Drives (using hddtemp).
+  * the temperature of the Hard Disk Drives (using hddtemp or atasmart
+    library).
   * the rotation speed of the fans (using lm\-sensors).
   * the sensors of a remote computer (using psensor\-server).
 

diff --git a/src/graph.c b/src/graph.c
index de23bb8..26a84d3 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -318,7 +318,6 @@ graph_update(struct psensor **sensors,
 
                cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
                cairo_set_line_width(cr, 1);
-
                while (*sensor_cur) {
                        struct psensor *s = *sensor_cur;
 

diff --git a/src/main.c b/src/main.c
index 71bb1e8..9d89c01 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -99,7 +99,9 @@ static void print_help()
 
        puts(_("  -u, --url=URL       "
               "the URL of the psensor-server, example: http://hostname:3131"));
-
+       puts(_("  --use-libatasmart   "
+              "use atasmart library for disk monitoring "
+              "instead of hddtemp daemon"));
        puts("");
 
        puts(_("  -d, --debug=LEVEL   "
@@ -347,7 +349,7 @@ static void log_init()
 }
 
 static struct option long_options[] = {
-       {"use_libatasmart", no_argument, 0, 0},
+       {"use-libatasmart", no_argument, 0, 0},
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
        {"url", required_argument, 0, 'u'},
@@ -414,7 +416,7 @@ int main(int argc, char **argv)
                                   &opti)) != -1) {
                switch (optc) {
                case 0:
-                       if (!strcmp(long_options[opti].name, "use_libatasmart"))
+                       if (!strcmp(long_options[opti].name, "use-libatasmart"))
                                use_libatasmart = 1;
                        break;
                case 'u':