[or-cvs] r22891: {website} make the stable manpage use git too (website/branches/web20/docs/en)

Thu Aug 12 20:23:39 UTC 2010

Author: phobos
Date: 2010-08-12 20:23:39 +0000 (Thu, 12 Aug 2010)
New Revision: 22891

Modified:
   website/branches/web20/docs/en/tor-manual.wml
Log:
make the stable manpage use git too


Modified: website/branches/web20/docs/en/tor-manual.wml
===================================================================

--- website/branches/web20/docs/en/tor-manual.wml	2010-08-12 20:18:41 UTC (rev 22890)
+++ website/branches/web20/docs/en/tor-manual.wml	2010-08-12 20:23:39 UTC (rev 22891)
@@ -1,28 +1,21 @@
 ## translation metadata
-# Revision: $Revision: 13768 $
+# Revision: $Revision: 21567 $
 
 #include "head.wmi" TITLE="Tor Project: manual"
 
 # Translators shouldn't translate this file, unless they want
 # to translate the whole man page too.
-
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
     <a href="<page docs/documentation>">Documentation &raquo; </a>
-    <a href="<page docs/tor-doc-osx>">Tor Manual</a>
-  </div> 
-  <div id="maincol"> 
+    <a href="<page docs/tor-doc-osx>">Tor Dev Manual</a>
+  </div>
+  <div id="maincol">  
     <:
-    	#die "Missing manpage" unless -f "$(TORSVNSTABLE)/doc/tor.1.txt";
-    	die "Missing manpage" unless -f "$(TORSVNSTABLE)/doc/tor.1.in";
-    	my $man = `man2html -M '' $(TORSVNSTABLE)/doc/tor.1.in`;
-    	#my $man = `man2html -M '' $(TORSVNSTABLE)/doc/tor.1.txt`;
-    	die "No manpage" unless $man;
-    
-    	$man =~ s,.*<body>,,is;
-    	$man =~ s,</body>.*,,is;
-    
+    	die "Missing git clone at $(TORGIT)" unless -d "$(TORGIT)";
+    	my $man = `GIT_DIR=$(TORGIT) git show $(DEVTAG):doc/tor.1.txt | asciidoc -d manpage -s -o - -`;
+    	die "No manpage because of asciidoc error or file not available from git" unless $man;
     	print $man;
     :>
   </div>

