[tor-commits] [obfsproxy/master] Move obfproxy manpage to doc subdirectory

[nickm at torproject.org]

commit e907a1fa2450c55920e120eb4f802f1859e4de4f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 14 10:56:12 2012 -0500

    Move obfproxy manpage to doc subdirectory
---
 Makefile.am     |    2 +-
 doc/obfsproxy.1 |   37 +++++++++++++++++++++++++++++++++++++
 obfsproxy.1     |   37 -------------------------------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ab80db8..4d7019d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,4 +73,4 @@ tester.py: src/test/tester.py.in Makefile
 	chmod +x $@
 endif
 
-man_MANS = obfsproxy.1
+man_MANS = doc/obfsproxy.1
diff --git a/doc/obfsproxy.1 b/doc/obfsproxy.1
new file mode 100644
index 0000000..3cc7224
--- /dev/null
+++ b/doc/obfsproxy.1
@@ -0,0 +1,37 @@
+.\" Process this file with
+.\" groff -man -Tascii foo.1
+.\"
+.TH OBFSPROXY 1 "02/12/2012" Linux "User Manuals"
+.SH NAME
+obfsproxy \- a pluggable transports proxy
+.SH SYNOPSIS
+.B obfsproxy [obfsproxy_args] protocol_name [protocol_args] protocol_options protocol_name
+.SH DESCRIPTION
+.B obfsproxy
+is a tool that attempts to circumvent censorship, by transforming the
+Tor traffic between the client and the bridge. This way, censors, who
+usually monitor traffic between the client and the bridge, will see
+innocent-looking transformed traffic instead of the actual Tor traffic.
+
+.B obfsproxy
+supports multiple protocols, called pluggable transports,
+which specify how the traffic is transformed. For example, there might
+be a HTTP transport which transforms Tor traffic to look like regular
+HTTP traffic.
+.SH OPTIONS
+.IP --log-file=<file>
+Set logfile
+.IP --log-min-severity=warn|info|debug|notice
+Set minimum logging severity
+.IP --no-log
+Disable logging
+.SH SEE ALSO
+.B tor(1)
+
+.B https://www.torproject.org
+.SH BUGS
+Plenty, probably.
+.B obfsproxy
+is still in development.  Please report them.
+.SH AUTHOR
+George Kadianakis <asn at torproject.org>.
diff --git a/obfsproxy.1 b/obfsproxy.1
deleted file mode 100644
index 3cc7224..0000000
--- a/obfsproxy.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii foo.1
-.\"
-.TH OBFSPROXY 1 "02/12/2012" Linux "User Manuals"
-.SH NAME
-obfsproxy \- a pluggable transports proxy
-.SH SYNOPSIS
-.B obfsproxy [obfsproxy_args] protocol_name [protocol_args] protocol_options protocol_name
-.SH DESCRIPTION
-.B obfsproxy
-is a tool that attempts to circumvent censorship, by transforming the
-Tor traffic between the client and the bridge. This way, censors, who
-usually monitor traffic between the client and the bridge, will see
-innocent-looking transformed traffic instead of the actual Tor traffic.
-
-.B obfsproxy
-supports multiple protocols, called pluggable transports,
-which specify how the traffic is transformed. For example, there might
-be a HTTP transport which transforms Tor traffic to look like regular
-HTTP traffic.
-.SH OPTIONS
-.IP --log-file=<file>
-Set logfile
-.IP --log-min-severity=warn|info|debug|notice
-Set minimum logging severity
-.IP --no-log
-Disable logging
-.SH SEE ALSO
-.B tor(1)
-
-.B https://www.torproject.org
-.SH BUGS
-Plenty, probably.
-.B obfsproxy
-is still in development.  Please report them.
-.SH AUTHOR
-George Kadianakis <asn at torproject.org>.