Merge pull request #839 from sfalexrog/fixes

(Hopefully) fix issue #645

configure.ac

@@ -86,11 +86,11 @@ AC_ARG_WITH(man,
 AS_IF([test "x$with_man" != "xno"], [
 	build_man=yes
 	AS_IF([test -z "$DOCBOOK2MAN"], [
-		AC_PATH_PROG(DOCBOOK2MAN,[docbook-to-man])
+		AC_PATH_PROG(DOCBOOK2MAN,[docbook2x-man])
 		AS_IF([test -z "$DOCBOOK2MAN"], [
 			AC_PATH_PROG(DOCBOOK2MAN,[docbook2man.pl])
 			AS_IF([test -z "$DOCBOOK2MAN"], [
-				AC_MSG_ERROR([docbook-to-man is missing. Install docbook2X package.])
+				AC_MSG_ERROR([docbook2x-man is missing. Install docbook2X package.])
 			])
 		])
 	])

docs/openxcom.6.xml

@@ -63,15 +63,15 @@
 				<term><option>-data</option> <replaceable>PATH</replaceable></term>
 				<listitem>
 				<para>
-					use <replaceable>PATH</replaceable> as the default User Folder instead of auto-detecting
+					use <replaceable>PATH</replaceable> as the default Data Folder instead of auto-detecting
 				</para>
 				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term><option>-user</option> <replaceable>PATH</replaceable></term>
 				<listitem>
 				<para>
-					use <replaceable>PATH</replaceable> as the default Data Folder instead of auto-detecting
+					use <replaceable>PATH</replaceable> as the default User Folder instead of auto-detecting
 				</para>
 				</listitem>
 			</varlistentry>
@@ -108,4 +108,4 @@
 			<ulink url="http://ufopaedia.org/index.php?title=OpenXcom" />
 		</para>
 	</refsect1>
-</refentry>
+</refentry>