@@ -30,14 +30,14 @@

  	    my ($page, $lang) = @_;

 	    my ($dir, $base) = $page =~ m,^(?:(.*)/)?(.*?)$,;

 	    $dir = '.' unless defined $dir;

-	    if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {

+	    if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {

 	    	return stripDotSlashs("$(DOCROOT)/$dir/$base.html.$lang");

 	    } elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {

 	    	return stripDotSlashs("$(DOCROOT)/$dir/$base.html.en");

-        } elsif ($page =~ /^http/) {

-          return $page;

+	    } elsif ($page =~ /^http/) {

+	    	return $page;

 	    } else {

-	    	warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";

+	    	warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";

 	    }; 

     }

 :>

@@ -50,10 +50,10 @@

 	$dir = '.' unless defined $dir;

 	if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {

 		print stripDotSlashs("$(DOCROOT)/$dir/$base.html.$lang");

-	} elsif (-e "$(DOCROOT)/en/$dir/$base.wml") {

+	} elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {

 		print stripDotSlashs("$(DOCROOT)/$dir/$base.html");

 	} else {

-		warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";

+		warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";

 	};

 }:>

 </define-tag>