last step of repo switches

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1716 ce84e21b-d406-0410-9b95-82705330c041

5 files changed, 32 insertions, 33 deletions

diff --git a/man/Bcfg2debug.8 b/man/Bcfg2debug.8
deleted file mode 100644
index 6c4947d2d..000000000
--- a/man/Bcfg2debug.8
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH "Bcfg2debug" 8
-.SH NAME
-Bcfg2debug \- Debugging environment for Bcfg2
-.SH SYNOPSIS
-.B Bcfg2debug
-.SH DESCRIPTION
-.PP
-.B Bcfg2debug
-Instantiate an instance of the Bcfg2 core for data examination and
-debugging purposes.
-.SH "SEE ALSO"
-.BR bcfg(1),
-.BR Bcfg2Server(8)
-.SH "BUGS"
-None currently known
\ No newline at end of file
diff --git a/man/bcfg2-info.8 b/man/bcfg2-info.8
new file mode 100644
index 000000000..a71bc21a4
--- /dev/null
+++ b/man/bcfg2-info.8
@@ -0,0 +1,16 @@
+.TH "bcfg2-info" 8
+.SH NAME
+bcfg2-info \- Creates a local version of the bcfg2 server core for
+state observation
+.SH SYNOPSIS
+.B bcfg2-info
+.SH DESCRIPTION
+.PP
+.B bcfg2-info
+Instantiate an instance of the Bcfg2 core for data examination and
+debugging purposes.
+.SH "SEE ALSO"
+.BR bcfg2(1),
+.BR bcfg2-server(8)
+.SH "BUGS"
+None currently known
diff --git a/man/ValidateBcfg2Repo.8 b/man/bcfg2-repo-validate.8
index fe0551fdd..cebcbd301 100644
--- a/man/ValidateBcfg2Repo.8
+++ b/man/bcfg2-repo-validate.8
@@ -1,12 +1,12 @@
-.TH "ValidateBcfg2Repo" 8
+.TH "bcfg2-repo-validate" 8
 .SH NAME
-ValidateBcfg2Repo \- Check Bcfg2 repository data against data schemas
+bcfg2-repo-validate \- Check Bcfg2 repository data against data schemas
 .SH SYNOPSIS
-.B ValidateBcfg2Repo
+.B bcfg2-repo-validate
 .I [ Repository Location ] [ Schema Location ]
 .SH DESCRIPTION
 .PP
-.B ValidateBcfg2Repo
+.B bcfg2-repo-validate
 This script checks data against schemas, and it quite helpful in
 finding typos or malformed data. 
 .SH ARGUMENTS
@@ -15,7 +15,7 @@ finding typos or malformed data.
 .TP 
 .B Schema Location - where schemas are. (Optional).
 .SH "SEE ALSO"
-.BR bcfg(1),
-.BR Bcfg2Server(8)
+.BR bcfg2(1),
+.BR bcfg2-server(8)
 .SH "BUGS"
-None currently known
\ No newline at end of file
+None currently known
diff --git a/man/Bcfg2Server.8 b/man/bcfg2-server.8
index dc7b80daa..3274638c6 100644
--- a/man/Bcfg2Server.8
+++ b/man/bcfg2-server.8
@@ -1,12 +1,12 @@
-.TH "Bcfg2Server" 8
+.TH "bcfg2-server" 8
 .SH NAME
-Bcfg2Server \- Server for client configuration specifications
+bcfg2-server \- Server for client configuration specifications
 .SH SYNOPSIS
-.B Bcfg2Server
+.B bcfg2-server
 .I [-D <pidfile>] [-d] [-v] [-C <Client>]
 .SH DESCRIPTION
 .PP
-.B Bcfg2Server
+.B bcfg2-server
 This daemon serves configurations to clients based on the data in its 
 repository. 
 .SH OPTIONS
@@ -20,7 +20,7 @@ particular client's configs.
 .TP
 .B \-D Daemonize, placing the program pid in the specified pidfile
 .SH "SEE ALSO"
-.BR bcfg(1),
-.BR ValidateBcfg2Repo(8)
+.BR bcfg2(1),
+.BR bcfg2-repo-validate(8)
 .SH "BUGS"
-None currently known
\ No newline at end of file
+None currently known
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index 41f49663f..f049f6994 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -14,15 +14,13 @@ structures=list of enabled structures
 .TP
 bundles=list of enabled bundles
 .TP
-metadata=/path/to/metadata
-.TP
 .B [communication]
 .TP
 password=communication password
 .TP
 key=/path/to/ssl/key
 .TP
-protocol=(sss|xmlrpc/ssl)
+protocol=xmlrpc/ssl
 .TP
 .B [components]
 list of component urls
@@ -31,4 +29,4 @@ componentname=url
 
 .SH "SEE ALSO"
 .BR bcfg2(1),
-.BR Bcfg2Server(8)
\ No newline at end of file
+.BR bcfg2-server(8)
\ No newline at end of file