[or-cvs] r8913: back-pedal a bit (tor/trunk/contrib)

[arma at seul.org]

Author: arma
Date: 2006-11-06 01:48:49 -0500 (Mon, 06 Nov 2006)
New Revision: 8913

Modified:
   tor/trunk/contrib/Makefile.am
   tor/trunk/contrib/tor.nsi.in
Log:
back-pedal a bit


Modified: tor/trunk/contrib/Makefile.am
===================================================================
--- tor/trunk/contrib/Makefile.am	2006-11-06 06:43:21 UTC (rev 8912)
+++ tor/trunk/contrib/Makefile.am	2006-11-06 06:48:49 UTC (rev 8913)
@@ -3,7 +3,7 @@
 
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico
+EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico
 
 conf_DATA = tor-tsocks.conf
 

Modified: tor/trunk/contrib/tor.nsi.in
===================================================================
--- tor/trunk/contrib/tor.nsi.in	2006-11-06 06:43:21 UTC (rev 8912)
+++ tor/trunk/contrib/tor.nsi.in	2006-11-06 06:48:49 UTC (rev 8913)
@@ -2,7 +2,7 @@
 ; Originally written by J Doe.
 ; See LICENSE for licencing information
 ;-----------------------------------------
-; NOTE: This file is obsolete. Look at tor-mingw.nsi.in instead.
+; NOTE: This file might be obsolete. Look at tor-mingw.nsi.in instead.
 ;-----------------------------------------
 ; How to make an installer:
 ;   Step 0. If you are a Tor maintainer, make sure that tor.nsi and
@@ -128,6 +128,7 @@
    File "..\doc\dir-spec.txt"
    File "..\doc\rend-spec.txt"
    File "..\doc\socks-extensions.txt"
+   File "..\doc\tor-spec.txt"
    File "..\doc\version-spec.txt"
    ;
    ; WEBSITE-FILES-HERE
@@ -156,7 +157,7 @@
    CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
    IfFileExists "$INSTDIR\Documents\*.*" "" endifdocs
       CreateDirectory "$SMPROGRAMS\Tor\Documents"
-      CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Documents\tor-doc.html"
+      CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Documents\tor-reference.html"
       CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Documents"
       CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Documents\tor-spec.txt"
    endifdocs: