[flashproxy/master] More pyobfsproxy → obfsproxy.

[dcf at torproject.org]

commit cf5c0836c319767d5427e8da9e8e68063f4b4e77
Author: David Fifield <david at bamsoftware.com>
Date:   Thu May 30 09:41:30 2013 -0700

    More pyobfsproxy → obfsproxy.
---
 doc/Makefile            |   12 ++++++------
 doc/bundle-gnulinux.txt |    4 ++--
 doc/bundle-macosx.txt   |    4 ++--
 doc/bundle-windows.txt  |    8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index df62882..9a6cee9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -86,8 +86,8 @@ $(PT_BUNDLE_WINDOWS):
 	mkdir -p "$(TBBDIR)"/Docs/FlashProxy
 	cp "$(FLASHPROXY_DIST_WIN32)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy
 	cp -nr "$(OBFSPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App
-	mkdir -p "$(TBBDIR)"/Docs/PyObfsproxy
-	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy
+	mkdir -p "$(TBBDIR)"/Docs/Obfsproxy
+	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy
 
 	cat bundle-torrc-windows >> "$(TBBDIR)"/Data/Tor/torrc
 
@@ -114,8 +114,8 @@ $(PT_BUNDLE_MACOSX_I686):
 	cp -r "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/Contents/MacOs/obfsproxy.bin
 	cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/{Crypto,pyptlib} "$(TBBDIR)"/Contents/MacOS
 	cp "$(MACOSX_BUNDLE_ROOT)"/argparse-1.2.1/argparse.py "$(TBBDIR)"/Contents/MacOS
-	mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy
-	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy
+	mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy
+	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy
 	find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' | xargs rm -f
 
 	cat bundle-torrc-macosx >> "$(TBBDIR)"/Library/Vidalia/torrc
@@ -144,8 +144,8 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64):
 	cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} "$(TBBDIR)"/App
 	cp -rL /usr/lib/pymodules/python2.6/argparse.py "$(TBBDIR)"/App
 	cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib "$(TBBDIR)"/App
-	mkdir -p "$(TBBDIR)"/Docs/PyObfsproxy
-	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy
+	mkdir -p "$(TBBDIR)"/Docs/Obfsproxy
+	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy
 	find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f
 
 	cat bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc
diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt
index 84520be..818e7aa 100644
--- a/doc/bundle-gnulinux.txt
+++ b/doc/bundle-gnulinux.txt
@@ -81,9 +81,9 @@ Clone and build the flashproxy source.
 	$ cd flashproxy
 	$ make dist
 
-Clone pyobfsproxy.
+Clone obfsproxy.
 
-	$ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git
+	$ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git
 
 Update your Debian.
 
diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt
index 943b2ad..0051542 100644
--- a/doc/bundle-macosx.txt
+++ b/doc/bundle-macosx.txt
@@ -71,9 +71,9 @@ Clone and build the flashproxy source.
 	$ cd flashproxy
 	$ make dist
 
-Clone pyobfsproxy.
+Clone obfsproxy.
 
-	$ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git
+	$ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git
 
 Enter the doc directory and edit the top of Makefile to set the version
 numbers you want to use.
diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt
index f05c05b..4859769 100644
--- a/doc/bundle-windows.txt
+++ b/doc/bundle-windows.txt
@@ -117,7 +117,7 @@ fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi
 
 === PyCrypto
 
-This is a dependency of pyobfsproxy and Twisted.
+This is a dependency of obfsproxy and Twisted.
 
 https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz
 https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc
@@ -174,10 +174,10 @@ Clone and build the flashproxy source.
 	$ cd flashproxy
 	$ make dist-exe PYTHON=/cygdrive/c/Python27/python
 
-Clone pyobfsproxy and run py2exe on it.
+Clone obfsproxy and run py2exe on it.
 
-	$ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git
-	$ cd pyobfsproxy
+	$ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git
+	$ cd obfsproxy
 	$ /cygdrive/c/Python27/python.exe setup_py2exe.py py2exe
 
 Enter the doc directory and edit the top of Makefile to set the version