3 files changed, 5 insertions, 14 deletions
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index db26f0d6a..9e63bb243 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -13,10 +13,10 @@ man_MANS = \
   gnunet-ecc.1 \
   gnunet-fs.1 \
   gnunet-gns.1 \
-  gnunet-gns-fcfsd.1 \
   gnunet-gns-proxy.1 \
   gnunet-identity.1 \
   gnunet-namestore.1 \
+  gnunet-namestore-fcfsd.1 \
   gnunet-nat-server.1 \
   gnunet-peerinfo.1 \
   gnunet-pseudonym.1 \
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1
index ef5a0f9bc..e5e2240b9 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-gns.1
@@ -1,4 +1,4 @@
-.TH GNUNET\-GNS 1 "Aug 8, 2012" "GNUnet"
+.TH GNUNET\-GNS 1 "Aug 8, 2013" "GNUnet"
 
 .SH NAME
 gnunet\-gns \- Access to GNUnet Name Service
@@ -13,10 +13,6 @@ gnunet\-gns \- Access to GNUnet Name Service
 
 .SH OPTIONS
 .B
-.IP "\-a NAME, \-\-authority=NAME"
-Get the authority of a particular name.
-For example the authority for "www.fcfs.gads" is "fcfs.gads".
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
 .B
@@ -26,11 +22,6 @@ This is a quiet mode where only important information is displayed.
 For example a lookup for an IP address will only yield the IP address, no
 descriptive text.
 .B
-.IP "\-s NAME, \-\-shorten NAME"
-Shorten GNUnet Name Service Name.
-The service will try to shorten the delegation chain of the name if a "closer"
-authority chain exists relative to your local root zone.
-.B
 .IP "\-t RRTYPE, \-\-type=RRTYPE"
 Resource Record Type (RRTYPE) to look for.
 Supported RRTYPE's are: A, AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA, MX, LEHO, VPN, REV, PTR, TXT
diff --git a/doc/man/gnunet-gns-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index fbd45e4a2..42b658018 100644
--- a/doc/man/gnunet-gns-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -1,10 +1,10 @@
-.TH GNUNET\-GNS-FCFSD 1 "Oct 25, 2012" "GNUnet"
+.TH GNUNET\-NAMESTORE-FCFSD 1 "Oct 25, 2012" "GNUnet"
 
 .SH NAME
-gnunet\-gns-fcfsd \- HTTP server for GADS domain registration
+gnunet\-namestore-fcfsd \- HTTP server for GNS domain registration
 
 .SH SYNOPSIS
-.B gnunet\-gns-fcfsd
+.B gnunet\-namestore-fcfsd
 .RI [ options ]
 .br