Index: conky-1.6.1/doc/conky.1
===================================================================
--- conky-1.6.1.orig/doc/conky.1	2008-08-15 15:11:58.000000000 +0200
+++ conky-1.6.1/doc/conky.1	2008-08-15 15:17:14.000000000 +0200
@@ -44,7 +44,7 @@
 Conky is generally very good on resources. That said, the more you try to make Conky
 do, the more resources it is going to consume.
 .PP
-An easy way to force Conky to reload your ~/.conkyrc: "killall -SIGUSR1 conky".
+An easy way to force Conky to reload your ~/.conkyrc: "killall \-SIGUSR1 conky".
 Saves you the trouble of having to kill and then restart. You can now also do the same with SIGHUP.
 .SH OPTIONS
 Command line options override configurations defined in configuration file.
@@ -86,7 +86,7 @@
 
 .TP 
 \fB\*(T<\fB\-t | \-\-text=\fR\*(T>\fR\*(T<\fBTEXT\fR\*(T>
-Text to render, remember single quotes, like -t ' $uptime '
+Text to render, remember single quotes, like \-t ' $uptime '
 
 .TP 
 \fB\*(T<\fB\-u | \-\-interval=\fR\*(T>\fR\*(T<\fBSECONDS\fR\*(T>
@@ -181,12 +181,12 @@
 
 .TP 
 \fB\*(T<\fBgap_x\fR\*(T>\fR
-Gap, in pixels, between right or left border of screen, same as passing -x at command line,
+Gap, in pixels, between right or left border of screen, same as passing \-x at command line,
 e.g. gap_x 10
 
 .TP 
 \fB\*(T<\fBgap_y\fR\*(T>\fR
-Gap, in pixels, between top or bottom border of screen, same as passing -y at command line,
+Gap, in pixels, between top or bottom border of screen, same as passing \-y at command line,
 e.g. gap_y 10.
 
 .TP 
@@ -195,7 +195,7 @@
 
 .TP 
 \fB\*(T<\fBimap\fR\*(T>\fR
-Default global IMAP server. Arguments are: "host user pass [-i interval] [-f folder] [-p port] [-e command] [-r retries]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+Default global IMAP server. Arguments are: "host user pass [\-i interval] [\-f folder] [\-p port] [\-e command] [\-r retries]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
 \fB\*(T<\fBmail_spool\fR\*(T>\fR
@@ -298,7 +298,7 @@
 
 .TP 
 \fB\*(T<\fBpop3\fR\*(T>\fR
-Default global POP3 server. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+Default global POP3 server. Arguments are: "host user pass [\-i interval] [\-p port] [\-e command] [\-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
 \fB\*(T<\fBshort_units\fR\*(T>\fR
@@ -805,11 +805,11 @@
 
 .TP 
 \fB\*(T<\fBimap_messages\fR\*(T>\fR \*(T<\fB(args)\fR\*(T> 
-Displays the number of messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 143, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+Displays the number of messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [\-i interval] [\-p port] [\-e command] [\-r retries]". Default port is 143, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
 \fB\*(T<\fBimap_unseen\fR\*(T>\fR \*(T<\fB(args)\fR\*(T> 
-Displays the number of unseen messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 143, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+Displays the number of unseen messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [\-i interval] [\-p port] [\-e command] [\-r retries]". Default port is 143, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
 \fB\*(T<\fBioscheduler\fR\*(T>\fR \*(T<\fBdisk\fR\*(T> 
@@ -848,7 +848,7 @@
 
 .TP 
 \fB\*(T<\fBmboxscan\fR\*(T>\fR \*(T<\fB(\-n number of messages to print) (\-fw from width) (\-sw subject width) mbox\fR\*(T> 
-Print a summary of recent messages in an mbox format mailbox. mbox parameter is the filename of the mailbox (can be encapsulated using '"', ie. ${mboxscan -n 10 "/home/brenden/some box"}
+Print a summary of recent messages in an mbox format mailbox. mbox parameter is the filename of the mailbox (can be encapsulated using '"', ie. ${mboxscan \-n 10 "/home/brenden/some box"}
 
 .TP 
 \fB\*(T<\fBmem\fR\*(T>\fR 
@@ -1018,11 +1018,11 @@
 
 .TP 
 \fB\*(T<\fBpop3_unseen\fR\*(T>\fR \*(T<\fB(args)\fR\*(T> 
-Displays the number of unseen messages in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+Displays the number of unseen messages in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [\-i interval] [\-p port] [\-e command] [\-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
 \fB\*(T<\fBpop3_used\fR\*(T>\fR \*(T<\fB(args)\fR\*(T> 
-Displays the amount of space (in MiB, 2^20) used in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+Displays the amount of space (in MiB, 2^20) used in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [\-i interval] [\-p port] [\-e command] [\-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
 \fB\*(T<\fBpre_exec\fR\*(T>\fR \*(T<\fBshell command\fR\*(T> 
@@ -1038,7 +1038,7 @@
 
 .TP 
 \fB\*(T<\fBscroll\fR\*(T>\fR \*(T<\fBlength text\fR\*(T> 
-Scroll 'text' showing 'length' number of characters at the same time. The text may also contain variables. If a var creates output on multiple lines then the lines are placed behind each other separated with a '|'-sign. Do NOT use vars that change colors or otherwise affect the design inside a scrolling text. If you want spaces between the start and the end of 'text', place them at the end of 'text' not at the front ("foobar" and " foobar" can both generate "barfoo" but "foobar " will keep the spaces like this "bar foo").
+Scroll 'text' showing 'length' number of characters at the same time. The text may also contain variables. If a var creates output on multiple lines then the lines are placed behind each other separated with a '|'\(hysign. Do NOT use vars that change colors or otherwise affect the design inside a scrolling text. If you want spaces between the start and the end of 'text', place them at the end of 'text' not at the front ("foobar" and " foobar" can both generate "barfoo" but "foobar " will keep the spaces like this "bar foo").
 
 .TP 
 \fB\*(T<\fBshadecolor\fR\*(T>\fR \*(T<\fB(color)\fR\*(T> 
@@ -1110,26 +1110,26 @@
 .br
 \fBlservice\fR - local service name from /etc/services
 
-The connection index provides you with access to each connection in the port monitor. The monitor will return information for index values from 0 to n-1 connections. Values higher than n-1 are simply ignored. For the "count" item, the connection index must be omitted. It is required for all other items.
+The connection index provides you with access to each connection in the port monitor. The monitor will return information for index values from 0 to n\-1 connections. Values higher than n\-1 are simply ignored. For the "count" item, the connection index must be omitted. It is required for all other items.
 
 Examples:
 .br
-\fB${tcp_portmon 6881 6999 count}\fR -
+\fB${tcp_portmon 6881 6999 count}\fR \(hy
 displays the number of connections in the bittorrent port range
 .br
-\fB${tcp_portmon 22 22 rip 0}\fR -
+\fB${tcp_portmon 22 22 rip 0}\fR \(hy
 displays the remote host ip of the first sshd connection
 .br
-\fB${tcp_portmon 22 22 rip 9}\fR -
+\fB${tcp_portmon 22 22 rip 9}\fR \(hy
 displays the remote host ip of the tenth sshd connection
 .br
-\fB${tcp_portmon 1 1024 rhost 0}\fR -
+\fB${tcp_portmon 1 1024 rhost 0}\fR \(hy
 displays the remote host name of the first connection on a privileged port
 .br
-\fB${tcp_portmon 1 1024 rport 4}\fR -
+\fB${tcp_portmon 1 1024 rport 4}\fR \(hy
 displays the remote host port of the fifth connection on a privileged port
 .br
-\fB${tcp_portmon 1 65535 lservice 14}\fR -
+\fB${tcp_portmon 1 65535 lservice 14}\fR \(hy
 displays the local service name of the fifteenth connection in the range of all ports
 
 Note that port monitor variables which share the same port range actually refer to the same monitor, so many references to a single port range for different items and different indexes all use the same monitor internally. In other words, the program avoids creating redundant monitors.
@@ -1363,9 +1363,9 @@
 all window managers. Especially doesn't work well with Gnome and it has
 been reported that it doesn't work with KDE either. Nautilus can be
 disabled from drawing to desktop with program gconf-editor. Uncheck
-show_desktop in /apps/nautilus/preferences/. There is -w switch in Conky
-to set some specific window id. You might find xwininfo -tree useful to
-find the window to draw to. You can also use -o argument which makes
+show_desktop in /apps/nautilus/preferences/. There is \-w switch in Conky
+to set some specific window id. You might find xwininfo \-tree useful to
+find the window to draw to. You can also use \-o argument which makes
 Conky to create its own window. If you do try running Conky in its own
 window, be sure to read up on the own_window_type settings and experiment.
 .SH "SEE ALSO"
@@ -1377,7 +1377,7 @@
 .SH COMPILING
 For users compiling from source on a binary distro, make sure you have the X development
 libraries installed. This should be a package along the lines of "libx11-dev" or
-"xorg-x11-dev" for X11 libs, and similar "-dev" format for the other libs required (depending
+"xorg-x11-dev" for X11 libs, and similar "\-dev" format for the other libs required (depending
 on your configure options).
 .PP
 Conky has (for some time) been available in the repositories of most popular distributions.
