Prefer --no-iri over --iri=no.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 898e3c6e5822d689c4067c824428e8cb968774a0..9deb3882e63bacc14cad5351d5daba35d19ba2a7 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-03  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi (Download Options): --iri=no --> --no-iri
+
 2009-06-20  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Contributors): Added Jay Krell.

diff --git a/doc/wget.texi b/doc/wget.texi
index 252548f8094d54276bf62c6e407165a6ac0e0760..07182d28219ed9b07e87d68ab4a9dfb2dcc17c82 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -679,7 +679,7 @@ servers that support the @code{Range} header.
 @cindex idn support
 @item --iri
 
-Turn on internationalized URI (IRI) support. Use @samp{--iri=no} to
+Turn on internationalized URI (IRI) support. Use @samp{--no-iri} to
 turn it off. IRI support is activated by default.
 
 You can set the default state of IRI support using @code{iri} command in

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8e2092514789e46874e2a7d96f2d092939ef1ede..3e233e058165e580a90b4a8b88fcbab8e0abbb89 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-03  Micah Cowan  <micah@cowan.name>
+
+       * Test-ftp-iri-disabled.px, Test-iri-disabled.px:
+       --iri=no --> --no-iri
+
 2009-07-01  Micah Cowan  <micah@cowan.name>
 
        * HTTPServer.pm (send_response): Invocation of

diff --git a/tests/Test-ftp-iri-disabled.px b/tests/Test-ftp-iri-disabled.px
index 96122867ee4695c0941be9fd206b3a55f68859ea..76330b1a9e2015370e8baa59782e5e77c4c3300b 100755 (executable)
--- a/tests/Test-ftp-iri-disabled.px
+++ b/tests/Test-ftp-iri-disabled.px
@@ -28,7 +28,7 @@ my %urls = (
     },
 );
 
-my $cmdline = $WgetTest::WGETPATH . " --iri=no --locale=iso-8859-1 -S ftp://localhost:{{port}}/fran${ccedilla_l1}ais.txt";
+my $cmdline = $WgetTest::WGETPATH . " --no-iri --locale=iso-8859-1 -S ftp://localhost:{{port}}/fran${ccedilla_l1}ais.txt";
 
 my $expected_error_code = 0;
 

diff --git a/tests/Test-iri-disabled.px b/tests/Test-iri-disabled.px
index 02fc4d3a1f96538a549e88809dcbfe382ff43bd0..01231a4413750521139c7e1214fb86836e22d38f 100755 (executable)
--- a/tests/Test-iri-disabled.px
+++ b/tests/Test-iri-disabled.px
@@ -162,7 +162,7 @@ my %urls = (
     },
 );
 
-my $cmdline = $WgetTest::WGETPATH . " --iri=no -nH -r http://localhost:{{port}}/";
+my $cmdline = $WgetTest::WGETPATH . " --no-iri -nH -r http://localhost:{{port}}/";
 
 my $expected_error_code = 0;