[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [vidalia/alpha] Change the helpful links and the remaining headers
commit 5f3183a13906b53713cdc365e08a08743d0c0952
Author: Tomas Touceda <chiiph@xxxxxxxxxx>
Date: Tue May 3 18:55:58 2011 -0300
Change the helpful links and the remaining headers
---
CMakeLists.txt | 6 ++--
cmake/FindBreakpad.cmake | 6 ++--
cmake/FindGeoIP.cmake | 6 ++--
cmake/FindMarble.cmake | 6 ++--
cmake/FindOpenSSL.cmake | 6 ++--
cmake/FindWiX.cmake | 6 ++--
cmake/VidaliaMacros.cmake | 6 ++--
config.h.in | 6 ++--
contrib/geoip.py | 6 ++--
doc/CMakeLists.txt | 6 ++--
pkg/CMakeLists.txt | 6 ++--
pkg/build-geoip-cache.sh | 6 ++--
pkg/osx/CMakeLists.txt | 6 ++--
pkg/osx/InstallTorbutton.scpt.in | 6 ++--
pkg/package.sh | 6 ++--
pkg/rpm/CMakeLists.txt | 6 ++--
pkg/win32/CMakeLists.txt | 6 ++--
pkg/win32/bridge-bundle.nsi.in | 6 ++--
pkg/win32/vidalia-bundle.nsi.in | 6 ++--
src/CMakeLists.txt | 6 ++--
src/common/CMakeLists.txt | 6 ++--
src/crashreporter/CMakeLists.txt | 6 ++--
src/crashreporter/res/CrashReporter.rc.in | 6 ++--
src/miniupnpc/CMakeLists.txt | 6 ++--
src/tools/CMakeLists.txt | 6 ++--
src/tools/nostdset/nostdset.sh | 6 ++--
src/tools/nsh2po/CMakeLists.txt | 6 ++--
src/tools/nsh2po/nsh2po_config.h.in | 6 ++--
src/tools/po2nsh/CMakeLists.txt | 6 ++--
src/tools/po2ts/CMakeLists.txt | 6 ++--
src/tools/po2wxl/CMakeLists.txt | 6 ++--
src/tools/ts2po/CMakeLists.txt | 6 ++--
src/tools/ts2po/ts2po_config.h.in | 6 ++--
src/torcontrol/CMakeLists.txt | 6 ++--
src/vidalia/CMakeLists.txt | 6 ++--
src/vidalia/help/content/en/contents.xml | 6 ++--
src/vidalia/help/content/en/links.html | 32 +++++++---------------------
src/vidalia/i18n/CMakeLists.txt | 6 ++--
src/vidalia/res/vidalia_win.rc.in | 6 ++--
39 files changed, 122 insertions(+), 138 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b580959..e5bb9f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/cmake/FindBreakpad.cmake b/cmake/FindBreakpad.cmake
index 607d054..d4119b5 100644
--- a/cmake/FindBreakpad.cmake
+++ b/cmake/FindBreakpad.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## Tries to find the required Google Breakpad libraries. Once done this will
diff --git a/cmake/FindGeoIP.cmake b/cmake/FindGeoIP.cmake
index 15227d8..76986bf 100644
--- a/cmake/FindGeoIP.cmake
+++ b/cmake/FindGeoIP.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## Tries to find the required MaxMind GeoIPlibraries. Once done this will
diff --git a/cmake/FindMarble.cmake b/cmake/FindMarble.cmake
index 4986fc1..12382b8 100644
--- a/cmake/FindMarble.cmake
+++ b/cmake/FindMarble.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## This file incorporates work from the KDE Marble project, and is covered by
## the following copyright and permission notice:
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index ec7b91d..0f931b0 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## This file incorporates work covered by the following copyright and
## permission notice:
diff --git a/cmake/FindWiX.cmake b/cmake/FindWiX.cmake
index 2a49d61..590889b 100644
--- a/cmake/FindWiX.cmake
+++ b/cmake/FindWiX.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
message(STATUS "Looking for WiX")
diff --git a/cmake/VidaliaMacros.cmake b/cmake/VidaliaMacros.cmake
index 306feca..7e468b2 100644
--- a/cmake/VidaliaMacros.cmake
+++ b/cmake/VidaliaMacros.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/config.h.in b/config.h.in
index c55b7a7..0b5ede1 100644
--- a/config.h.in
+++ b/config.h.in
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
**
*/
diff --git a/contrib/geoip.py b/contrib/geoip.py
index 92de9ca..23f3540 100755
--- a/contrib/geoip.py
+++ b/contrib/geoip.py
@@ -6,9 +6,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
from mod_python import apache
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 323bacc..c708c9a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt
index dbf1067..bafa506 100644
--- a/pkg/CMakeLists.txt
+++ b/pkg/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
if (APPLE)
diff --git a/pkg/build-geoip-cache.sh b/pkg/build-geoip-cache.sh
index f19de99..31696b6 100755
--- a/pkg/build-geoip-cache.sh
+++ b/pkg/build-geoip-cache.sh
@@ -6,9 +6,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt
index 2d06895..e757864 100644
--- a/pkg/osx/CMakeLists.txt
+++ b/pkg/osx/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/pkg/osx/InstallTorbutton.scpt.in b/pkg/osx/InstallTorbutton.scpt.in
index c8f28dc..3e487ef 100644
--- a/pkg/osx/InstallTorbutton.scpt.in
+++ b/pkg/osx/InstallTorbutton.scpt.in
@@ -5,9 +5,9 @@
-- LICENSE file, found in the top level directory of this distribution. If
-- you did not receive the LICENSE file with this file, you may obtain it
-- from the Vidalia source package distributed by the Vidalia Project at
--- http://www.vidalia-project.net/. No part of Vidalia, including this file,
--- may be copied, modified, propagated, or distributed except according to
--- the terms described in the LICENSE file.
+-- http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+-- including this file, may be copied, modified, propagated, or distributed
+-- except according to the terms described in the LICENSE file.
--
try
diff --git a/pkg/package.sh b/pkg/package.sh
index d85fb5e..b5e628d 100755
--- a/pkg/package.sh
+++ b/pkg/package.sh
@@ -6,9 +6,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
# Builds distribution packages for various platforms.
diff --git a/pkg/rpm/CMakeLists.txt b/pkg/rpm/CMakeLists.txt
index 9a928bc..8269ee0 100644
--- a/pkg/rpm/CMakeLists.txt
+++ b/pkg/rpm/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## RPM Spec File
diff --git a/pkg/win32/CMakeLists.txt b/pkg/win32/CMakeLists.txt
index e03973f..13306e7 100644
--- a/pkg/win32/CMakeLists.txt
+++ b/pkg/win32/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
if (MINGW)
diff --git a/pkg/win32/bridge-bundle.nsi.in b/pkg/win32/bridge-bundle.nsi.in
index 649cd24..37eb4a8 100644
--- a/pkg/win32/bridge-bundle.nsi.in
+++ b/pkg/win32/bridge-bundle.nsi.in
@@ -5,9 +5,9 @@
;; LICENSE file, found in the top level directory of this distribution. If
;; you did not receive the LICENSE file with this file, you may obtain it
;; from the Vidalia source package distributed by the Vidalia Project at
-;; http://www.vidalia-project.net/. No part of Vidalia, including this file,
-;; may be copied, modified, propagated, or distributed except according to
-;; the terms described in the LICENSE file.
+;; http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+;; including this file, may be copied, modified, propagated, or distributed
+;; except according to the terms described in the LICENSE file.
;;
!include "MUI.nsh"
diff --git a/pkg/win32/vidalia-bundle.nsi.in b/pkg/win32/vidalia-bundle.nsi.in
index 0b7a595..fc9b30e 100644
--- a/pkg/win32/vidalia-bundle.nsi.in
+++ b/pkg/win32/vidalia-bundle.nsi.in
@@ -5,9 +5,9 @@
;; LICENSE file, found in the top level directory of this distribution. If
;; you did not receive the LICENSE file with this file, you may obtain it
;; from the Vidalia source package distributed by the Vidalia Project at
-;; http://www.vidalia-project.net/. No part of Vidalia, including this file,
-;; may be copied, modified, propagated, or distributed except according to
-;; the terms described in the LICENSE file.
+;; http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+;; including this file, may be copied, modified, propagated, or distributed
+;; except according to the terms described in the LICENSE file.
;;
!include "MUI.nsh"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 580c194..4a25aac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index dae0eb3..92ec489 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
index f396d9a..672e763 100644
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
include_directories(
diff --git a/src/crashreporter/res/CrashReporter.rc.in b/src/crashreporter/res/CrashReporter.rc.in
index d3e5951..a1f98a2 100644
--- a/src/crashreporter/res/CrashReporter.rc.in
+++ b/src/crashreporter/res/CrashReporter.rc.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/miniupnpc/CMakeLists.txt b/src/miniupnpc/CMakeLists.txt
index 28e18c5..53e2340 100644
--- a/src/miniupnpc/CMakeLists.txt
+++ b/src/miniupnpc/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
add_definitions(-DSTATICLIB -DNDEBUG)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 40af38a..08501ca 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
add_subdirectory(ts2po)
diff --git a/src/tools/nostdset/nostdset.sh b/src/tools/nostdset/nostdset.sh
index 9558526..5a41062 100644
--- a/src/tools/nostdset/nostdset.sh
+++ b/src/tools/nostdset/nostdset.sh
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
find -name *.ui | xargs sed "s/sizeHint\" stdset=\"0\" /sizeHint\"/" -i
diff --git a/src/tools/nsh2po/CMakeLists.txt b/src/tools/nsh2po/CMakeLists.txt
index f438f7b..8011ed3 100644
--- a/src/tools/nsh2po/CMakeLists.txt
+++ b/src/tools/nsh2po/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## Define this version of nsh2po
diff --git a/src/tools/nsh2po/nsh2po_config.h.in b/src/tools/nsh2po/nsh2po_config.h.in
index 2e3e68b..e9d9c85 100644
--- a/src/tools/nsh2po/nsh2po_config.h.in
+++ b/src/tools/nsh2po/nsh2po_config.h.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
#ifndef _NSH2PO_CONFIG_H
diff --git a/src/tools/po2nsh/CMakeLists.txt b/src/tools/po2nsh/CMakeLists.txt
index 68de001..45b291f 100644
--- a/src/tools/po2nsh/CMakeLists.txt
+++ b/src/tools/po2nsh/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## po2nsh source files
diff --git a/src/tools/po2ts/CMakeLists.txt b/src/tools/po2ts/CMakeLists.txt
index a6f38a4..fff76bc 100644
--- a/src/tools/po2ts/CMakeLists.txt
+++ b/src/tools/po2ts/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## po2ts source files
diff --git a/src/tools/po2wxl/CMakeLists.txt b/src/tools/po2wxl/CMakeLists.txt
index 0e4c7c1..5e8e547 100644
--- a/src/tools/po2wxl/CMakeLists.txt
+++ b/src/tools/po2wxl/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## po2wxl source files
diff --git a/src/tools/ts2po/CMakeLists.txt b/src/tools/ts2po/CMakeLists.txt
index af6915e..b98725c 100644
--- a/src/tools/ts2po/CMakeLists.txt
+++ b/src/tools/ts2po/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
## Define this version of ts2po
diff --git a/src/tools/ts2po/ts2po_config.h.in b/src/tools/ts2po/ts2po_config.h.in
index 55f8828..50f69fc 100644
--- a/src/tools/ts2po/ts2po_config.h.in
+++ b/src/tools/ts2po/ts2po_config.h.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
#ifndef _TS2PO_CONFIG_H
diff --git a/src/torcontrol/CMakeLists.txt b/src/torcontrol/CMakeLists.txt
index 5f3b325..735cc70 100644
--- a/src/torcontrol/CMakeLists.txt
+++ b/src/torcontrol/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt
index 15eac34..91036b9 100644
--- a/src/vidalia/CMakeLists.txt
+++ b/src/vidalia/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/vidalia/help/content/en/contents.xml b/src/vidalia/help/content/en/contents.xml
index ba6ba31..ae42116 100644
--- a/src/vidalia/help/content/en/contents.xml
+++ b/src/vidalia/help/content/en/contents.xml
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<Contents name="Vidalia Help" html="index.html">
diff --git a/src/vidalia/help/content/en/links.html b/src/vidalia/help/content/en/links.html
index 479dd4e..1326f44 100644
--- a/src/vidalia/help/content/en/links.html
+++ b/src/vidalia/help/content/en/links.html
@@ -28,18 +28,10 @@
</tr>
<tr>
<td> </td>
- <td>Wiki</td>
+ <td>Wiki and Bugtracker</td>
<td>
- <a href="http://trac.vidalia-project.net/wiki";>
- http://trac.vidalia-project.net/wiki</a>
- </td>
-</tr>
-<tr>
- <td> </td>
- <td>Bugtracker</td>
- <td>
- <a href="http://trac.vidalia-project.net/report";>
- http://trac.vidalia-project.net/report</a>
+ <a href="http://trac.torproject.org/";>
+ http://trac.torproject.org/</a>
</td>
</tr>
</table>
@@ -57,24 +49,16 @@
<td> </td>
<td>FAQ</td>
<td>
- <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>
- https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
- </td>
-</tr>
-<tr>
- <td> </td>
- <td>Wiki</td>
- <td>
- <a href="https://wiki.torproject.org/noreply/TheOnionRouter";>
- https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ <a href="https://www.torproject.org/docs/faq.html";>
+ https://www.torproject.org/docs/faq.html</a>
</td>
</tr>
<tr>
<td> </td>
- <td>Bugtracker</td>
+ <td>Wiki and Bugtracker</td>
<td>
- <a href="https://bugs.torproject.org/flyspray/";>
- https://bugs.torproject.org/flyspray</a>
+ <a href="https://trac.torproject.org/";>
+ https://trac.torproject.org/</a>
</td>
</tr>
</table>
diff --git a/src/vidalia/i18n/CMakeLists.txt b/src/vidalia/i18n/CMakeLists.txt
index e0e1647..7ec3bda 100644
--- a/src/vidalia/i18n/CMakeLists.txt
+++ b/src/vidalia/i18n/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/vidalia/res/vidalia_win.rc.in b/src/vidalia/res/vidalia_win.rc.in
index ef22bdc..188b798 100644
--- a/src/vidalia/res/vidalia_win.rc.in
+++ b/src/vidalia/res/vidalia_win.rc.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits