validator/httpd/cgi-bin check,1.305.2.134,1.305.2.135

Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv5899/httpd/cgi-bin

Modified Files:
      Tag: validator-0_6_0-branch
	check 
Log Message:
s/URI/URL/g; # Or at least everywhere it's possible/makes sense. :-)


Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.305.2.134
retrieving revision 1.305.2.135
diff -u -d -r1.305.2.134 -r1.305.2.135
--- check	18 May 2004 02:04:06 -0000	1.305.2.134
+++ check	18 May 2004 03:41:19 -0000	1.305.2.135
@@ -352,12 +352,12 @@
              . '" value="' . &ent($File->{Opt}->{URI}) . '" />']);
   } else {
     my $furi = &ent($File->{URI});
-    &add_table($File, qq(<label title="Address of Page to Validate (accesskey: 1)" for="uri">URI</label>),
+    &add_table($File, qq(<label title="Address of Page to Validate (accesskey: 1)" for="uri">URL</label>),
                '<input accesskey="1" type="text" id="uri" name="uri" size="' . $size
              . '" value="' . $furi . '" />');
     &add_warning($File, 'note', 'Note:',
       sprintf(
-        'The URI you gave me, &lt;%s&gt;, returned a redirect to &lt;%s&gt;.',
+        'The URL you gave me, &lt;%s&gt;, returned a redirect to &lt;%s&gt;.',
           &ent($File->{Opt}->{URI}), $furi
       )
     );
@@ -1223,9 +1223,9 @@
   <head><title>401 Authorization Required</title></head>
   <body>
     <h1>Authorization Required</h1>
-    <p>Sorry, I am not authorized to access the specified URI.</p>
+    <p>Sorry, I am not authorized to access the specified URL.</p>
     <p>
-      The URI you specified, &lt;<a href="$resource">$resource</a>&gt;,
+      The URL you specified, &lt;<a href="$resource">$resource</a>&gt;,
       returned a 401 "authorization required" response when I tried
       to download it.
     </p>
@@ -1289,7 +1289,7 @@
   </blockquote>
 
   <p>
-    Please make sure you have entered the URI correctly.
+    Please make sure you have entered the URL correctly.
   </p>
 
 EOF
@@ -1329,7 +1329,7 @@
 
 
 #
-# Fetch an URI and return the content and selected meta-info.
+# Fetch an URL and return the content and selected meta-info.
 sub handle_uri {
   my $q    = shift; # The CGI object.
   my $File = shift; # The master datastructure.
@@ -2104,7 +2104,7 @@
   <p>
     If you would like to create a link to <em>this</em> page (i.e., this
     validation result) to make it easier to validate this page in the
-    future or to allow others to validate your page, the URI is
+    future or to allow others to validate your page, the URL is
     &lt;<a href="$thispage">$display</a>&gt; (or you can just add the
     current page to your bookmarks or hotlist).</p>
 EOHD
@@ -2423,7 +2423,7 @@
     }
   }
 
-  # Futz the URI so "/referer" works.
+  # Futz the URL so "/referer" works.
   if ($q->path_info) {
     if ($q->path_info eq '/referer' or $q->path_info eq '/referrer') {
       if ($q->referer) {
@@ -2445,7 +2445,7 @@
     $q->param('uri', $q->param('url'));
   }
 
-  # Munge the URI to include commonly omitted prefix.
+  # Munge the URL to include commonly omitted prefix.
   my $u = $q->param('uri');
   $q->param('uri', "http://$u") if $u && $u =~ m(^www)i;
 
@@ -2476,20 +2476,20 @@
           Please use the form interface on the
           <a href="$CFG->{'Home Page'}">Validator Home Page</a> (or the
           <a href="detailed.html">Extended Interface</a>) to check the
-          page by URI.
+          page by URL.
         </p>
       </div>
 .EOF.
     }
   }
 
-  # Supersede URI with an uploaded file.
+  # Supersede URL with an uploaded file.
   if ($q->param('uploaded_file')) {
     $q->param('uri', 'upload://' . $q->param('uploaded_file'));
     $File->{'Is Upload'} = TRUE; # Tag it for later use.
   }
 
-  # Supersede URI with an uploaded fragment.
+  # Supersede URL with an uploaded fragment.
   if ($q->param('fragment')) {
     $q->param('uri', 'upload://Form Submission');
     $File->{'Is Upload'} = TRUE; # Tag it for later use.
@@ -2557,7 +2557,7 @@
 
 
 #
-# Output errors for a rejected URI.
+# Output errors for a rejected URL.
 sub uri_rejected {
   my $scheme = shift || 'undefined';
 
@@ -2565,18 +2565,18 @@
     <div class="error">
       <p>
         Sorry, this type of
-        <a href="http://www.w3.org/Addressing/#terms">URI</a>
+        <a href="http://www.w3.org/Addressing/#terms">URL</a>
         <a href="http://www.iana.org/assignments/uri-schemes">scheme</a>
         (<q>%s</q>) is not supported by this service. Please check
-        that you entered the URI correctly.
+        that you entered the URL correctly.
       </p>
-      <p>URIs should be in the form: <code>http://validator.w3.org/</code></p>
+      <p>URLs should be in the form: <code>http://validator.w3.org/</code></p>
       <p>
-        If you entered a valid URI using a scheme that we should support,
+        If you entered a valid URL using a scheme that we should support,
         please let us know as outlined on our
         <a href="feedback.html">Feedback page</a>. Make sure to include the
-        specific URI you would like us to support, and if possible provide a
-        reference to the relevant standards document describing the URI scheme
+        specific URL you would like us to support, and if possible provide a
+        reference to the relevant standards document describing the URL scheme
         in question.
       </p>
       <p class="tip">

Received on Monday, 17 May 2004 23:43:16 UTC