bump version; doc fixes

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1094 7f574dfc-610e-0410-a909-a81674777703

README

@@ -76,12 +76,13 @@ OPTIONS
        Command line options override configurations defined  in	 configuration
        file.
 
-       -v | -V | --verbose
+       -v | -V | --version
 	      Prints version and exits
 
 
        -a | --alignment=ALIGNMENT
-	      Text alignment on screen, {top,bottom}_{left,right} or none
+	      Text  alignment  on screen, {top,bottom,middle}_{left,right,mid-
+	      dle} or none
 
 
        -b | --double-buffer
@@ -128,6 +129,10 @@ OPTIONS
 	      Y position
 
 
+       -i COUNT
+	      Number of times to update Conky (and quit)
+
+
 CONFIGURATION SETTINGS
        Default	 configuration	 file	location    is	  $HOME/.conkyrc    or
        ${sysconfdir}/conky/conky.conf.	On  most  systems, sysconfdir is /etc,

configure.ac.in

@@ -3,8 +3,8 @@ dnl $Id$
 dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [5])
-m4_define([conky_version_micro], [1])
+m4_define([conky_version_micro], [2])
-m4_define([conky_version_tag])dnl, [pre]) dnl [] for releases
+m4_define([conky_version_tag], [pre]) dnl [] for releases
 m4_define([conky_version_revision],[_pre@REVISION@])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(

doc/command_options.xml

@@ -1,6 +1,6 @@
 <variablelist>
 	<varlistentry>
-    <term><command><option>-v | -V | --verbose</option></command></term>
+		<term><command><option>-v | -V | --version</option></command></term>
 		<listitem>
 			Prints version and exits
 			<para></para></listitem>
@@ -9,7 +9,7 @@
 	<varlistentry>
 		<term><command><option>-a | --alignment=</option></command><option>ALIGNMENT</option></term>
 		<listitem>
-      Text alignment on screen, {top,bottom}_{left,right} or none
+			Text alignment on screen, {top,bottom,middle}_{left,right,middle} or none
 			<para></para></listitem>
 	</varlistentry>
 
@@ -90,4 +90,11 @@
 			<para></para></listitem>
 	</varlistentry>
 
+	<varlistentry>
+		<term><command><option>-i </option></command><option>COUNT</option></term>
+		<listitem>
+			Number of times to update Conky (and quit)
+			<para></para></listitem>
+	</varlistentry>
+
 </variablelist>

doc/conky.1

@@ -69,12 +69,12 @@ Saves you the trouble of having to kill and then restart. You can now also do th
 .SH OPTIONS
 Command line options override configurations defined in configuration file.
 .TP 
-\fB\*(T<\fB\-v | \-V | \-\-verbose\fR\*(T>\fR
+\fB\*(T<\fB\-v | \-V | \-\-version\fR\*(T>\fR
 Prints version and exits
 
 .TP 
 \fB\*(T<\fB\-a | \-\-alignment=\fR\*(T>\fR\*(T<\fBALIGNMENT\fR\*(T>
-Text alignment on screen, {top,bottom}_{left,right} or none
+Text alignment on screen, {top,bottom,middle}_{left,right,middle} or none
 
 .TP 
 \fB\*(T<\fB\-b | \-\-double\-buffer\fR\*(T>\fR
@@ -120,6 +120,10 @@ X position
 \fB\*(T<\fB\-y \fR\*(T>\fR\*(T<\fBY_COORDINATE\fR\*(T>
 Y position
 
+.TP 
+\fB\*(T<\fB\-i \fR\*(T>\fR\*(T<\fBCOUNT\fR\*(T>
+Number of times to update Conky (and quit)
+
 .SH "CONFIGURATION SETTINGS"
 Default configuration file location is $HOME/.conkyrc or 
 ${sysconfdir}/conky/conky.conf. On most systems, sysconfdir is /etc,

src/conky.c

@@ -8533,12 +8533,12 @@ int main(int argc, char **argv)
 					   "Conky is a system monitor that renders text on desktop or to own transparent\n"
 					   "window. Command line options will override configurations defined in config\n"
 					   "file.\n"
-					   "   -V, --version             version\n"
+					   "   -v, --version             version\n"
 					   "   -c, --config=FILE         config file to load\n"
 					   "   -d, --daemonize           daemonize, fork to background\n"
 					   "   -h, --help                help\n"
 #ifdef X11
-					   "   -a, --alignment=ALIGNMENT text alignment on screen, {top,bottom}_{left,right}\n"
+					   "   -a, --alignment=ALIGNMENT text alignment on screen, {top,bottom,middle}_{left,right,middle}\n"
 					   "   -f, --font=FONT           font to use\n"
 #ifdef OWN_WINDOW
 					   "   -o, --own-window          create own window to draw\n"
@@ -8552,7 +8552,7 @@ int main(int argc, char **argv)
 #endif /* X11 */
 					   "   -t, --text=TEXT           text to render, remember single quotes, like -t '$uptime'\n"
 					   "   -u, --interval=SECS       update interval\n"
-					   "   -i NUM                    number of times to update Conky\n",
+					   "   -i COUNT                  number of times to update Conky (and quit)\n",
 					   argv[0]
 				);
 				return 0;