tor-webwml.git

@@ -11,11 +11,12 @@ TORCVSHEAD = ../tor-head

 #TORCVSHEAD = /home/arma/work/onion/cvs/tor

 WMLBASE = .

-WMLOPT  = \

-          -I include \

-          -D DOCROOT=$(WMLBASE) \

-          -D IMGROOT=$(WMLBASE)/images \

-          -D TORCVSSTABLE=$(TORCVSSTABLE) \

-          -D TORCVSHEAD=$(TORCVSHEAD)

+SUBDIRS=eff

 include $(WMLBASE)/Makefile.common

+all: $(SUBDIRS)

+

+eff:

+	$(MAKE) -C "$@" WMLBASE=../$(WMLBASE)

+

+.PHONY: eff

@@ -1,84 +1,69 @@

+WMLOPT  = \

+          -I $(WMLBASE)/include \

+          -D DOCROOT=$(WMLBASE) \

+          -D IMGROOT=$(WMLBASE)/images \

+          -D TORCVSSTABLE=$(TORCVSSTABLE) \

+          -D TORCVSHEAD=$(TORCVSHEAD)

+

 LANGS=de en it fr se

 WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS)))

 WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi )

-HTMLFILES = $(patsubst de/%.wml, %.html.de,          \

-             $(patsubst en/%.wml, %.html.en,         \

-              $(patsubst it/%.wml, %.html.it,        \

-               $(patsubst fr/%.wml, %.html.fr,       \

-                $(patsubst se/%.wml, %.html.se,      \

-            $(WMLFILES)                              \

-                 )                                   \

-                )                                    \

-               )                                     \

-              )                                      \

-             )

-DEPFILES =  $(patsubst de/%.wml,.deps/%.html.de.d,   \

-             $(patsubst en/%.wml,.deps/%.html.en.d,  \

-              $(patsubst it/%.wml,.deps/%.html.it.d, \

-               $(patsubst fr/%.wml,.deps/%.html.fr.d,\

-                $(patsubst se/%.wml,.deps/%.html.se.d,\

-            $(WMLFILES)                              \

-                 )                                   \

-                )                                    \

-               )                                     \

-              )                                      \

-             )

+HTMLFILES = $(shell perl -le 's,  (.*)/(.*).wml  ,        $$2.html.$$1    ,x, print $$_ for @ARGV' $(WMLFILES))

+DEPFILES  = $(shell perl -le 's,  (.*)/(.*).wml  ,  .deps/$$2.html.$$1.d  ,x, print $$_ for @ARGV' $(WMLFILES))

 all: $(HTMLFILES)

-

-

 %.html.en: en/%.wml

-	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@

+	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@

 %.html.de: de/%.wml en/%.wml

-	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@

+	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@

 %.html.it: it/%.wml en/%.wml

-	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@

+	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@

 %.html.fr: fr/%.wml en/%.wml

-	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@

+	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@

 %.html.se: se/%.wml en/%.wml

-	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@

+	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@

 .deps/%.html.en.d: en/%.wml .deps/.stamp

 	tmpfile=`tempfile` \

 	lang=`dirname $<` && \

 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \

-	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

+	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \

 	rm -f $$tmpfile

 .deps/%.html.de.d: de/%.wml .deps/.stamp

 	tmpfile=`tempfile` \

 	lang=`dirname $<` && \

 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \

-	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

+	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \

 	rm -f $$tmpfile

 .deps/%.html.it.d: it/%.wml .deps/.stamp

 	tmpfile=`tempfile` \

 	lang=`dirname $<` && \

 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \

-	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

+	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \

 	rm -f $$tmpfile

 .deps/%.html.fr.d: fr/%.wml .deps/.stamp

 	tmpfile=`tempfile` \

 	lang=`dirname $<` && \

 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \

-	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

+	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \

 	rm -f $$tmpfile

 .deps/%.html.se.d: se/%.wml .deps/.stamp

 	tmpfile=`tempfile` \

 	lang=`dirname $<` && \

 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \

-	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

+	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \

 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \

 	rm -f $$tmpfile

 .deps/.stamp:

@@ -88,5 +73,8 @@ all: $(HTMLFILES)

 dep: $(DEPFILES)

 clean:

 	rm -f $(HTMLFILES) $(DEPFILES)

+	for sub in $(SUBDIRS); do \

+		$(MAKE) -C "$$sub" WMLBASE=../$(WMLBASE) clean; \

+	done

 include $(DEPFILES)

@@ -311,7 +311,7 @@ wir sind nicht die richtigen Ansprechpartner bei rechtlichen Fragen und

 Bedenken.</p>

 <p>Wenn du rechtliche Fragen hast, schaue auf die <a

-href="eff/tor-legal-faq.html">h�ufigen rechtlichen Fragen zu Tor</a>, oder wende

+href="<page eff/tor-legal-faq>">h�ufigen rechtlichen Fragen zu Tor</a>, oder wende

 dich direkt an die EFF.</p>

 </div><!-- #main -->

@@ -19,7 +19,7 @@ Inhalt verantwortlich.

 </p>

 <p>

-Die <a href="eff/tor-legal-faq.html">Tor Legal FAQ (engl.)</a> ist durch die

+Die <a href="<page eff/tor-legal-faq>">Tor Legal FAQ (engl.)</a> ist durch die

 Anw�lte der EFF verfasst. Es zielt darauf ab, dir einen �berblick �ber einige

 rechtliche Fragen, die mit dem Torprojekt entstehen, zu geben.

 </p>

@@ -0,0 +1,3 @@

+.deps

+tor-dmca-response.html.en

+tor-legal-faq.html.en

@@ -0,0 +1 @@

+include $(WMLBASE)/Makefile.common

@@ -1,40 +1,8 @@

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

-

-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">

-<head>

- <title>Response template for Tor server operator to ISP</title>

- <meta name="Author" content="EFF" />

- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />

- <link rel="stylesheet" type="text/css" href="../stylesheet.css" />

- <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />

-</head>

-<body>

-

-<!-- TITLE BAR & NAVIGATION -->

-

-<table class="banner" border="0" cellpadding="0" cellspacing="0">

-    <tr>

-        <td class="banner-left"></td>

-        <td class="banner-middle">

-            <a href="../index.html">Home</a>

-          | <a href="../howitworks.html">How It Works</a>

-          | <a href="../download.html">Download</a>

-          | <a href="../documentation.html">Docs</a>

-          | <a href="../users.html">Users</a>

-          | <a href="../faq.html">FAQs</a>

-          | <a href="../volunteer.html">Contribute</a>

-          | <a href="../developers.html">Developers</a>

-          | <a href="../research.html">Research</a>

-          | <a href="../people.html">People</a>

-        </td>

-        <td class="banner-right"></td>

-    </tr>

-</table>

-

-<!-- END TITLE BAR & NAVIGATION -->

-

-<div class="center"> 

+## translation metadata

+# Revision: $Revision$

+

+#include "head.wmi" TITLE="Response template for Tor server operator to ISP"

+

 <div class="main-column">

 <!-- PUT CONTENT AFTER THIS TAG -->

@@ -157,6 +125,5 @@ Your customer, [User]

 </p>

 </div><!-- #main -->

-</div>

-</body>

-</html>

+

+#include <foot.wmi>

@@ -1,40 +1,8 @@

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

-

-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">

-<head>

- <title>Legal FAQ for Tor Server Operators</title>

- <meta name="Author" content="EFF" />

- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />

- <link rel="stylesheet" type="text/css" href="../stylesheet.css" />

- <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />

-</head>

-<body>

-

-<!-- TITLE BAR & NAVIGATION -->

-

-<table class="banner" border="0" cellpadding="0" cellspacing="0">

-    <tr>

-        <td class="banner-left"></td>

-        <td class="banner-middle">

-            <a href="../index.html">Home</a>

-          | <a href="../howitworks.html">How It Works</a>

-          | <a href="../download.html">Download</a>

-          | <a href="../documentation.html">Docs</a>

-          | <a href="../users.html">Users</a>

-          | <a href="../faq.html">FAQs</a>

-          | <a href="../volunteer.html">Contribute</a>

-          | <a href="../developers.html">Developers</a>

-          | <a href="../research.html">Research</a>

-          | <a href="../people.html">People</a>

-        </td>

-        <td class="banner-right"></td>

-    </tr>

-</table>

-

-<!-- END TITLE BAR & NAVIGATION -->

-

-<div class="center"> 

+## translation metadata

+# Revision: $Revision$

+

+#include "head.wmi" TITLE="Legal FAQ for Tor Server Operators"

+

 <div class="main-column">

 <!-- PUT CONTENT AFTER THIS TAG -->

@@ -251,7 +219,5 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>

 </div><!-- #main -->

-</div>

-</body>

-</html>

+#include <foot.wmi>

@@ -131,7 +131,7 @@ himself. Your ISP gets polite mail about how your computer has been

 compromised; and/or your computer gets DDoSed. [Port 6667]</li>

 <li>Somebody uses Tor to download a Vin Diesel movie, and

 your ISP gets a DMCA takedown notice. See EFF's

-<a href="eff/tor-dmca-response.html">Tor DMCA Response

+<a href="<page eff/tor-dmca-response>">Tor DMCA Response

 Template</a>, which explains to your ISP why it can probably ignore

 the notice without any liability. [Arbitrary ports]</li>

 </ul>

@@ -303,7 +303,7 @@ analysis, sting operations, and other physical investigations.

 we're not the ones to talk to about legal questions or concerns. </p>

 <p>Please take a look at the

-<a href="eff/tor-legal-faq.html">Tor Legal FAQ</a>,

+<a href="<page eff/tor-legal-faq>">Tor Legal FAQ</a>,

 and contact EFF directly if you have any further legal questions. </p>

   </div><!-- #main -->

@@ -18,7 +18,7 @@ for the content.

 </p>

 <p>

-The <a href="eff/tor-legal-faq.html">Tor Legal FAQ</a> is written by

+The <a href="<page eff/tor-legal-faq>">Tor Legal FAQ</a> is written by

 EFF lawyers. It aims to give you an overview of some of the legal issues

 that arise from the Tor project.

 </p>

@@ -12,9 +12,9 @@

   <title>Tor: $(TITLE)</title>

   <meta name="Author" content="Roger Dingledine" />

   <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />

-  <link rel="stylesheet" type="text/css" href="stylesheet.css" />

+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/stylesheet.css" />

   <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />

-  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT).html" />">

+  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT).html" />">

 </head>

 <body>

@@ -39,10 +39,10 @@

 	      $page =~ s/\.wml//;

 	      if ($page ne $key) {

 	        if (-e "$(LANG)/$key.wml") {

-	          printf '<a href="%s.html.$(LANG)">%s</a>'."\n",

+	          printf '<a href="$(DOCROOT)/%s.html.$(LANG)">%s</a>'."\n",

 	                 $key, $navigation{$key};

 	        } else {

-	          printf '<a href="%s.html">%s</a>'."\n",

+	          printf '<a href="$(DOCROOT)/%s.html">%s</a>'."\n",

 	                 $key, $navigation{$key};

 	        }

 	      } else {

@@ -61,7 +61,7 @@

 	      if ($dir eq '$(LANG)') {

 	        printf('<img src="$(IMGROOT)/%s.png" alt="%s" /> ', $dir, $LANGUAGES{$dir});

 	      } else {

-	        printf('<a href="%s.html.%s"><img src="$(IMGROOT)/%s.png" alt="%s" /></a> ', $page, $dir, $dir, $LANGUAGES{$dir});

+	        printf('<a href="$(DOCROOT)/%s.html.%s"><img src="$(IMGROOT)/%s.png" alt="%s" /></a> ', $page, $dir, $dir, $LANGUAGES{$dir});

 	      };

 	    } else {

 	      printf('<img src="$(IMGROOT)/green-flagspace.png"/> ');

@@ -72,4 +72,4 @@

     </tr>

 </table>

-<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(REDIRECT).html">$(REDIRECT).html</a>.">

+<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT).html">$(DOCROOT)/$(REDIRECT).html</a>.">

@@ -9,11 +9,13 @@

 <define-tag page whitespace=delete><:{

 	my $page="%0";

 	my $lang="$(LANG)";

-	if (-e "$lang/$page.wml") {

-		print "%0.html.$lang";

-	} elsif (-e "en/$page.wml") {

-		print "%0.html";

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

+	$dir = '.' unless defined $dir;

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

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

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

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

 	} else {

-		warn "$WML_SRC_FILENAME has a [page $page], 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>

@@ -19,7 +19,7 @@ per i contenuti.

 </p>

 <p>

-Le <a href="eff/tor-legal-faq.html">FAQ Legali</a> sono state scritte da

+Le <a href="<page eff/tor-legal-faq>">FAQ Legali</a> sono state scritte da

 avvocati di EFF. Questo documento presenta alcuni risvolti legali che sono 

 nati con il progetto Tor.

 </p>