6 files changed, 17 insertions, 18 deletions
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index cf6185ec40..5efa562605 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -2,7 +2,7 @@
 @comment %**start of header
 @setfilename gnutls.info
 @include version.texi
-@settitle GNU TLS @value{VERSION}
+@settitle GnuTLS @value{VERSION}
 
 @c don't indent the paragraphs.
 @paragraphindent 0
@@ -15,7 +15,7 @@
 @finalout
 @copying
 This manual is last updated @value{UPDATED} for version
-@value{VERSION} of GNU TLS.
+@value{VERSION} of GnuTLS.
 
 Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
@@ -37,15 +37,15 @@ Documentation License''.
 @dircategory System Administration
 @direntry
 * certtool: (gnutls)Invoking certtool.	Manipulate certificates and keys.
-* gnutls-serv: (gnutls)Invoking gnutls-serv.	GNU TLS test server.
-* gnutls-cli: (gnutls)Invoking gnutls-cli.	GNU TLS test client.
-* gnutls-cli-debug: (gnutls)Invoking gnutls-cli-debug.	GNU TLS debug client.
+* gnutls-serv: (gnutls)Invoking gnutls-serv.	GnuTLS test server.
+* gnutls-cli: (gnutls)Invoking gnutls-cli.	GnuTLS test client.
+* gnutls-cli-debug: (gnutls)Invoking gnutls-cli-debug.	GnuTLS debug client.
 * psktool: (gnutls)Invoking psktool.	Simple TLS-Pre-Shared-Keys manager.
 * srptool: (gnutls)Invoking srptool.	Simple SRP password tool.
 @end direntry
 
 @titlepage
-@title GNU TLS
+@title GnuTLS
 @subtitle Transport Layer Security Library for the GNU system
 @subtitle for version @value{VERSION}, @value{UPDATED}
 @sp 7
@@ -65,7 +65,7 @@ Documentation License''.
 
 @ifnottex
 @node Top
-@top GNU TLS
+@top GnuTLS
 
 @insertcopying
 @end ifnottex
@@ -3153,7 +3153,7 @@ computer.  It sets up a TLS connection and forwards data from the
 standard input to the secured socket and vice versa.
 
 @verbatim
-GNU TLS test client
+GnuTLS test client
 Usage:  gnutls-cli [options] hostname
 
      -d, --debug integer      Enable debugging
@@ -3325,7 +3325,7 @@ Checking for OpenPGP authentication support (TLS extension)... no
 Simple server program that listens to incoming TLS connections.
 
 @verbatim
-GNU TLS test server
+GnuTLS test server
 Usage: gnutls-serv [options]
 
      -d, --debug integer      Enable debugging
diff --git a/doc/manpages/gnutls-cli-debug.1 b/doc/manpages/gnutls-cli-debug.1
index eec3972ae9..bec44cdec5 100644
--- a/doc/manpages/gnutls-cli-debug.1
+++ b/doc/manpages/gnutls-cli-debug.1
@@ -1,6 +1,6 @@
 .TH gnutls\-cli\-debug 1 "December 1st 2003"
 .SH NAME
-gnutls\-cli\-debug \- GNU TLS test client, with verbose output
+gnutls\-cli\-debug \- GnuTLS test client, with verbose output
 .SH SYNOPSIS
 gnutls\-cli\-debug [\fIoptions\fR] \fIhostname\fI
 .SH DESCRIPTION
diff --git a/doc/manpages/gnutls-cli.1 b/doc/manpages/gnutls-cli.1
index 4e1f48372e..61a68926c0 100644
--- a/doc/manpages/gnutls-cli.1
+++ b/doc/manpages/gnutls-cli.1
@@ -1,6 +1,6 @@
 .TH gnutls\-cli 1 "December 1st 2003"
 .SH NAME
-gnutls\-cli \- GNU TLS test client
+gnutls\-cli \- GnuTLS test client
 .SH SYNOPSIS
 gnutls\-cli [\fIoptions\fR] \fIhostname\fI
 .SH DESCRIPTION
diff --git a/doc/manpages/gnutls-serv.1 b/doc/manpages/gnutls-serv.1
index 710dfc3d19..a70b8d53de 100644
--- a/doc/manpages/gnutls-serv.1
+++ b/doc/manpages/gnutls-serv.1
@@ -1,6 +1,6 @@
 .TH gnutls\-serv 1 "December 1st 2003"
 .SH NAME
-gnutls\-serv \- GNU TLS test server
+gnutls\-serv \- GnuTLS test server
 .SH SYNOPSIS
 gnutls\-serv [\fIoptions\fR]
 .SH DESCRIPTION
diff --git a/doc/manpages/srptool.1 b/doc/manpages/srptool.1
index 1ae0b2555b..51c8093f90 100644
--- a/doc/manpages/srptool.1
+++ b/doc/manpages/srptool.1
@@ -5,7 +5,7 @@ srptool \- Simple SRP password tool
 srptool [\fIoptions\fR]
 .SH DESCRIPTION
 Very simple program that emulates the programs in the Stanford SRP
-(Secure Remote Password) libraries using GNU TLS.
+(Secure Remote Password) libraries using GnuTLS.
 It is intended for use in places where you don't expect SRP
 authentication to be the used for system users.
 
diff --git a/doc/reference/gnutls-docs.sgml b/doc/reference/gnutls-docs.sgml
index 07d798a581..f970dcdde3 100644
--- a/doc/reference/gnutls-docs.sgml
+++ b/doc/reference/gnutls-docs.sgml
@@ -3,16 +3,15 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GNU TLS API Reference Manual</title>
+    <title>GnuTLS API Reference Manual</title>
   </bookinfo>
 
   <chapter id="intro">
-    <title>GNU TLS API Reference Manual</title>
+    <title>GnuTLS API Reference Manual</title>
 
     <para>
-      This is the GNU TLS library, a implementation of the TLS
-      (Transport Layer Security) and SSL (Secure Sockets Layer) for
-      the GNU project.
+      GnuTLS is a implementation of the TLS (Transport Layer Security)
+      and SSL (Secure Sockets Layer) protocols for the GNU project.
     </para>
 
     <para>