Remove man page for wrapper and use the same

page as for rabbitmqctl_real.
Update debina and rpm packaging to reflect
this change.

6 files changed, 11 insertions, 47 deletions

diff --git a/docs/rabbitmq-multi.pod b/docs/rabbitmq-multi.pod
index 0f7aec52..2e3f28c8 100644
--- a/docs/rabbitmq-multi.pod
+++ b/docs/rabbitmq-multi.pod
@@ -34,7 +34,7 @@ Start 3 local RabbitMQ nodes with unique, sequential port numbers:
 
 =head1 SEE ALSO
 
-rabbitmq-server(1), rabbitmqctl(1), rabbitmqctl_real(1)
+rabbitmq-server(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
diff --git a/docs/rabbitmq-server.pod b/docs/rabbitmq-server.pod
index bf411bc2..1eaf2dfd 100644
--- a/docs/rabbitmq-server.pod
+++ b/docs/rabbitmq-server.pod
@@ -62,7 +62,7 @@ Run RabbitMQ AMQP server in the background:
 
 =head1 SEE ALSO
 
-rabbitmq-multi(1), rabbitmqctl(1), rabbitmqctl_real(1)
+rabbitmq-multi(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
diff --git a/docs/rabbitmqctl.pod b/docs/rabbitmqctl.pod
deleted file mode 100644
index 602cf751..00000000
--- a/docs/rabbitmqctl.pod
+++ /dev/null
@@ -1,37 +0,0 @@
-=head1 NAME
-
-rabbitmqctl - wrapper for the command line tool for managing a RabbitMQ broker
-
-=head1 SYNOPSIS
-
-rabbitmqctl I<command> [command options]
-
-=head1 DESCRIPTION
-
-RabbitMQ is an implementation of AMQP, the emerging standard for high
-performance enterprise messaging. The RabbitMQ server is a robust and
-scalable implementation of an AMQP broker.
-
-rabbitmqctl is a wrapper around rabbitmqctl_real(1) tool and performs
-all commands properly with I<rabbitmq> user permissions.
-
-See rabbitmqctl_real(1) for the list of available commands.
-
-=head1 SEE ALSO
-
-rabbitmq-server(1), rabbitmqctl_real(1), rabbitmq-multi(1) 
-
-=head1 AUTHOR
-
-Originally written by The RabbitMQ Team <info@lshift.net>
-
-=head1 COPYRIGHT
-
-This package, the RabbitMQ server is licensed under the MPL.
-
-If you have any questions regarding licensing, please contact us at 
-info@rabbitmq.com.
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: http://www.rabbitmq.com
diff --git a/docs/rabbitmqctl_real.pod b/docs/rabbitmqctl_real.pod
index f52eb394..db31b621 100644
--- a/docs/rabbitmqctl_real.pod
+++ b/docs/rabbitmqctl_real.pod
@@ -1,10 +1,10 @@
 =head1 NAME
 
-rabbitmqctl_real - command line tool for managing a RabbitMQ broker
+rabbitmqctl - command line tool for managing a RabbitMQ broker
 
 =head1 SYNOPSIS
 
-rabbitmqctl_real [-n I<node>] I<<command>> [command options]
+rabbitmqctl [-n I<node>] I<<command>> [command options]
 
 =head1 DESCRIPTION
 
@@ -12,10 +12,8 @@ RabbitMQ is an implementation of AMQP, the emerging standard for high
 performance enterprise messaging. The RabbitMQ server is a robust and
 scalable implementation of an AMQP broker.
 
-rabbitmqctl_real is a command line tool for managing a RabbitMQ broker.
-It performs all actions by connecting to one of the broker's node.
-rabbitmqctl_real is called by the rabbitmqctl(1) wrapper to be
-correctly executed with I<rabbitmq> user permissions.
+rabbitmqctl is a command line tool for managing a RabbitMQ broker.
+It performs all actions by connecting to one of the broker's nodes.
 
 
 =head1 OPTIONS
@@ -59,7 +57,7 @@ force
     return a RabbitMQ node to its virgin state.
     Removes the node from any cluster it belongs to, removes all data
     from the management database, such as configured users, vhosts and
-    realms, and deletes all persistent messages.
+    deletes all persistent messages.
     
 force_reset
     the same as I<force> command, but resets the node unconditionally,
@@ -123,7 +121,7 @@ default Erlang node:
 
 =head1 SEE ALSO
 
-rabbitmq-server(1), rabbitmqctl(1), rabbitmqctl_real(1)
+rabbitmq-multi(1), rabbitmq-server(1)
 
 =head1 AUTHOR
 
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 038f6d2d..25213816 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -68,6 +68,8 @@ mv $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl_rea
 cp ../rabbitmqctl_wrapper $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl
 
+cp %{buildroot}%{_mandir}/man1/rabbitmqctl.1.gz %{buildroot}%{_mandir}/man1/rabbitmqctl_real.1.gz
+
 %post
 # create rabbitmq group
 if ! getent group rabbitmq >/dev/null; then
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 3e05863a..e230aec5 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -14,5 +14,6 @@ install/rabbitmq-server::
 	rm $(RABBIT_LIB)/LICENSE*
 	mv $(DEB_DESTDIR)usr/sbin/rabbitmqctl $(DEB_DESTDIR)usr/sbin/rabbitmqctl_real
 	cp debian/rabbitmqctl_wrapper $(DEB_DESTDIR)usr/sbin/rabbitmqctl
+	cp $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl.1.gz $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl_real.1.gz
 	chmod a+x $(DEB_DESTDIR)usr/sbin/rabbitmqctl
 	echo "Tag: usr-lib-in-arch-all" > $(DEB_DESTDIR)usr/share/linda/overrides/rabbitmq-server