merge with master (new api)

doc/toxic.1

@@ -2,12 +2,12 @@
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2014-09-19
+.\"      Date: 2014-12-27
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2014\-09\-19" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2014\-12\-27" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,11 +115,6 @@ Force TCP connection (use this with proxies)
 .RS 4
 Unencrypt a data file\&. A warning will appear if this option is used with a data file that is already unencrypted\&.
 .RE
-.PP
-\-x, \-\-nodata
-.RS 4
-Ignore data file
-.RE
 .SH "FILES"
 .PP
 __DATADIR__/DHTnodes

doc/toxic.1.asc

@@ -31,7 +31,7 @@ OPTIONS
     Use default locale
 
 -e, --encrypt-data::
-    Encrypt an unencrypted data file. An error will occur if this option 
+    Encrypt an unencrypted data file. An error will occur if this option
     is used with an encrypted data file.
 
 -f, --file data-file::
@@ -60,12 +60,9 @@ OPTIONS
     Force TCP connection (use this with proxies)
 
 -u, --unencrypt-data::
-    Unencrypt a data file. A warning will appear if this option is used 
+    Unencrypt a data file. A warning will appear if this option is used
     with a data file that is already unencrypted.
 
--x, --nodata::
-    Ignore data file
-
 FILES
 -----
 {datadir}/DHTnodes::

doc/toxic.conf.5

@@ -202,7 +202,7 @@ Configuration related to notification sounds\&. Special value "silent" can be us
 
 Each value is a string which corresponds to the absolute path of a wav sound file\&.
 .PP
-\fBerror\fR
+\fBnotif_error\fR
 .RS 4
 Sound to play when an error occurs\&.
 .RE

doc/toxic.conf.5.asc

@@ -132,7 +132,7 @@ OPTIONS
     Each value is a string which corresponds to the absolute path of a wav
     sound file.
 
-    *error*;;
+    *notif_error*;;
         Sound to play when an error occurs.
 
     *self_log_in*;;