diff --git a/CHANGES b/CHANGES
index 812a88b83d..9d491488ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
Changelog
+Daniel Fandrich (18 Apr 2008)
+- Added test cases 1026 and 1027 to do some rudimentary tests on the --manual
+ and --help options.
+
Michal Marek (14 Apr 2008)
- allow disabling the typechecker by defining CURL_DISABLE_TYPECHECK, as
discussed in http://curl.haxx.se/mail/lib-2008-04/0291.html
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index b3fe735107..f079dc2b53 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -50,7 +50,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test551 test552 test1016 test1017 test1018 test1019 test1020 test553 \
test1021 test1022 test1023 test309 test616 test617 test618 test619 \
test620 test621 test622 test623 test624 test625 test626 test627 test554 \
- test1024 test1025 test555
+ test1024 test1025 test555 test1026 test1027
filecheck:
@mkdir test-place; \
diff --git a/tests/data/test1026 b/tests/data/test1026
new file mode 100644
index 0000000000..7ebb02bcc0
--- /dev/null
+++ b/tests/data/test1026
@@ -0,0 +1,39 @@
+
+
+
+--manual
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+none
+
+
+curl --manual
+
+
+--manual
+
+# Search for these two sentinel lines in the manual output; if they are found,
+# then chances are good the entire manual is there.
+
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*is\s*a\s*tool)|(mailing\s*lists\s*to\s*discuss\s*curl)/, ); exit ($lines != 2);' log/stdout1026
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+2
+
+
+
diff --git a/tests/data/test1027 b/tests/data/test1027
new file mode 100644
index 0000000000..4299d74352
--- /dev/null
+++ b/tests/data/test1027
@@ -0,0 +1,39 @@
+
+
+
+--help
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+none
+
+
+curl --help
+
+
+--help
+
+# Search for these two sentinel lines in the help output; if they are found,
+# then chances are good the entire help is there.
+
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, ); exit ($lines != 2);' log/stdout1027
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+2
+
+
+