From 69fd05f439ffeafa022d5152f0c69c0912598a84 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Fri, 22 Jun 2012 13:05:53 -0400
Subject: [PATCH] Remove hard coded man page paths.

Fixes LP Bug #1016656.

Change-Id: I22455d27cb82830dabd4fb0677da26915a60eb85
---
 doc/manpages/swift-account-auditor.1      | 9 ---------
 doc/manpages/swift-account-reaper.1       | 8 --------
 doc/manpages/swift-account-replicator.1   | 8 --------
 doc/manpages/swift-account-server.1       | 7 -------
 doc/manpages/swift-container-auditor.1    | 8 --------
 doc/manpages/swift-container-replicator.1 | 8 --------
 doc/manpages/swift-container-server.1     | 7 -------
 doc/manpages/swift-container-sync.1       | 5 -----
 doc/manpages/swift-container-updater.1    | 8 --------
 doc/manpages/swift-init.1                 | 2 +-
 doc/manpages/swift-object-auditor.1       | 8 --------
 doc/manpages/swift-object-expirer.1       | 7 -------
 doc/manpages/swift-object-replicator.1    | 8 --------
 doc/manpages/swift-object-server.1        | 9 ---------
 doc/manpages/swift-object-updater.1       | 8 --------
 doc/manpages/swift-proxy-server.1         | 8 --------
 16 files changed, 1 insertion(+), 117 deletions(-)

diff --git a/doc/manpages/swift-account-auditor.1 b/doc/manpages/swift-account-auditor.1
index 3e5ae591ff..86e60fbb4c 100644
--- a/doc/manpages/swift-account-auditor.1
+++ b/doc/manpages/swift-account-auditor.1
@@ -58,14 +58,5 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-account/account-server.conf-sample\fR" 0
-Sample configuration file for swift-account services 
-
-.IP "\fI/etc/init.d/swift-account-auditor\fR" 0
-Account auditor init.d script	
-
-
-
 .SH "SEE ALSO"
 .BR account-server.conf(5)
diff --git a/doc/manpages/swift-account-reaper.1 b/doc/manpages/swift-account-reaper.1
index 8daa360b5d..4dc1f72929 100644
--- a/doc/manpages/swift-account-reaper.1
+++ b/doc/manpages/swift-account-reaper.1
@@ -64,14 +64,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-account/account-server.conf-sample\fR" 0
-Sample configuration file for swift-account services 
-
-.IP "\fI/etc/init.d/swift-account-reaper\fR" 0
-Account reaper init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR account-server.conf(5)
diff --git a/doc/manpages/swift-account-replicator.1 b/doc/manpages/swift-account-replicator.1
index 94fa32251a..7df81ed8ff 100644
--- a/doc/manpages/swift-account-replicator.1
+++ b/doc/manpages/swift-account-replicator.1
@@ -66,14 +66,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-account/account-server.conf-sample\fR" 0
-Sample configuration file for swift-account services 
-
-.IP "\fI/etc/init.d/swift-account-replicator\fR" 0
-Account replicator init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR account-server.conf(5)
diff --git a/doc/manpages/swift-account-server.1 b/doc/manpages/swift-account-server.1
index 98b8d51767..21ba86f7a9 100644
--- a/doc/manpages/swift-account-server.1
+++ b/doc/manpages/swift-account-server.1
@@ -42,13 +42,6 @@ and also about Openstack-Swift as a whole can be found at
 and 
 .BI http://docs.openstack.org
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-account/account-server.conf-sample\fR" 0
-Sample configuration file for swift-account server
-.IP "\fI/etc/init.d/swift-account\fR" 0
-Account server init.d script	
- 
-
 
 .SH "SEE ALSO"
 .BR account-server.conf(5)
diff --git a/doc/manpages/swift-container-auditor.1 b/doc/manpages/swift-container-auditor.1
index fa46258712..2718f043d5 100644
--- a/doc/manpages/swift-container-auditor.1
+++ b/doc/manpages/swift-container-auditor.1
@@ -59,14 +59,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-account/container-server.conf-sample\fR" 0
-Sample configuration file for swift-container services 
-
-.IP "\fI/etc/init.d/swift-container-auditor\fR" 0
-Container auditor init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR container-server.conf(5)
diff --git a/doc/manpages/swift-container-replicator.1 b/doc/manpages/swift-container-replicator.1
index 79e12ac33a..0469c78ff2 100644
--- a/doc/manpages/swift-container-replicator.1
+++ b/doc/manpages/swift-container-replicator.1
@@ -66,14 +66,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-container/container-server.conf-sample\fR" 0
-Sample configuration file for swift-container services 
-
-.IP "\fI/etc/init.d/swift-container-replicator\fR" 0
-Container replicator init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR container-server.conf(5)
diff --git a/doc/manpages/swift-container-server.1 b/doc/manpages/swift-container-server.1
index bbbab8230e..20cc5aebe4 100644
--- a/doc/manpages/swift-container-server.1
+++ b/doc/manpages/swift-container-server.1
@@ -44,13 +44,6 @@ and also about Openstack-Swift as a whole can be found at
 and 
 .BI http://docs.openstack.org
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-container/container-server.conf-sample\fR" 0
-Sample configuration file for swift-container server
-.IP "\fI/etc/init.d/swift-container\fR" 0
-Container server init.d script	 
-
-
 .LP 
 
 .SH "SEE ALSO"
diff --git a/doc/manpages/swift-container-sync.1 b/doc/manpages/swift-container-sync.1
index 6f393e0237..11669ec1b3 100644
--- a/doc/manpages/swift-container-sync.1
+++ b/doc/manpages/swift-container-sync.1
@@ -49,11 +49,6 @@ and also about Openstack-Swift as a whole can be found at
 and 
 .BI http://docs.openstack.org
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-container/container-server.conf-sample\fR" 0
-Sample configuration file for swift-container server
-
-
 .LP 
 
 .SH "SEE ALSO"
diff --git a/doc/manpages/swift-container-updater.1 b/doc/manpages/swift-container-updater.1
index 8cfc8ee205..9ec709ce70 100644
--- a/doc/manpages/swift-container-updater.1
+++ b/doc/manpages/swift-container-updater.1
@@ -67,14 +67,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-container/container-server.conf-sample\fR" 0
-Sample configuration file for swift-container services 
-
-.IP "\fI/etc/init.d/swift-container-updater\fR" 0
-Container updater init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR container-server.conf(5)
diff --git a/doc/manpages/swift-init.1 b/doc/manpages/swift-init.1
index 4dac048b2e..0d5431bfa0 100644
--- a/doc/manpages/swift-init.1
+++ b/doc/manpages/swift-init.1
@@ -30,7 +30,7 @@
 .SH DESCRIPTION 
 .PP
 The swift-init tool can be used to initialize all swift daemons available as part of
-openstack-swift. Instead of calling individual init.d scripts for each 
+openstack-swift. Instead of calling individual init scripts for each 
 swift daemon, one can just use swift-init. With swift-init you can initialize 
 just one swift service, such as the "proxy", or a combination of them. The tool also 
 allows one to use the keywords such as "all", "main" and "rest" for the <server> argument.
diff --git a/doc/manpages/swift-object-auditor.1 b/doc/manpages/swift-object-auditor.1
index 2ce94f21c3..5be922676c 100644
--- a/doc/manpages/swift-object-auditor.1
+++ b/doc/manpages/swift-object-auditor.1
@@ -65,14 +65,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-object/object-server.conf-sample\fR" 0
-Sample configuration file for swift-object services 
-
-.IP "\fI/etc/init.d/swift-object-auditor\fR" 0
-Object auditor init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR object-server.conf(5)
diff --git a/doc/manpages/swift-object-expirer.1 b/doc/manpages/swift-object-expirer.1
index 3ee677c050..24e1cbb05c 100644
--- a/doc/manpages/swift-object-expirer.1
+++ b/doc/manpages/swift-object-expirer.1
@@ -68,13 +68,6 @@ can be foud at
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift/object-expirer.conf-sample\fR" 0
-Sample configuration file for swift-object-expirer service 
-
-.IP "\fI/etc/init.d/swift-object-expirer\fR" 0
-Object expirer init.d script	
-
 
 .SH "SEE ALSO"
 .BR object-expirer.conf(5)
diff --git a/doc/manpages/swift-object-replicator.1 b/doc/manpages/swift-object-replicator.1
index e80f59a050..71c0383aa2 100644
--- a/doc/manpages/swift-object-replicator.1
+++ b/doc/manpages/swift-object-replicator.1
@@ -66,14 +66,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-object/object-server.conf-sample\fR" 0
-Sample configuration file for swift-object services 
-
-.IP "\fI/etc/init.d/swift-object-replicator\fR" 0
-Object replicator init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR object-server.conf(5)
diff --git a/doc/manpages/swift-object-server.1 b/doc/manpages/swift-object-server.1
index 5d720156b5..e3d0d34693 100644
--- a/doc/manpages/swift-object-server.1
+++ b/doc/manpages/swift-object-server.1
@@ -49,15 +49,6 @@ and also about Openstack-Swift as a whole can be found at
 and 
 .BI http://docs.openstack.org
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-object/object-server.conf-sample\fR" 0
-Sample configuration file for swift-object server
-.IP "\fI/usr/share/doc/swift-object/rsyncd.conf-sample\fR" 0
-Sample rsyncd configuration file for usage with swift-object
-.IP "\fI/etc/init.d/swift-object\fR" 0
-Object server init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR object-server.conf(5)
diff --git a/doc/manpages/swift-object-updater.1 b/doc/manpages/swift-object-updater.1
index 1992043aa6..254b3499ba 100644
--- a/doc/manpages/swift-object-updater.1
+++ b/doc/manpages/swift-object-updater.1
@@ -73,14 +73,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.SH FILES
-.IP "\fI/usr/share/doc/swift-object/object-server.conf-sample\fR" 0
-Sample configuration file for swift-object services 
-
-.IP "\fI/etc/init.d/swift-object-updater\fR" 0
-Object updater init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR object-server.conf(5)
diff --git a/doc/manpages/swift-proxy-server.1 b/doc/manpages/swift-proxy-server.1
index 5533e7b532..2a4b6c36f4 100644
--- a/doc/manpages/swift-proxy-server.1
+++ b/doc/manpages/swift-proxy-server.1
@@ -45,14 +45,6 @@ More in depth documentation in regards to
 and also about Openstack-Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
-.\" One may need to change the path below if  
-.SH FILES
-.IP "\fI/usr/share/doc/swift-proxy/proxy-server.conf-sample\fR" 0
-Sample configuration file for swift-proxy services
-.IP "\fI/etc/init.d/swift-proxy\fR" 0
-Proxy server init.d script	
-
-
 
 .SH "SEE ALSO"
 .BR proxy-server.conf(5)