[gtk-web: 2/3] Drop the "plus"



commit 7d311d6823b90171ddc1e016722661254464a81c
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Feb 8 16:33:10 2019 +0000

    Drop the "plus"
    
    We're now "GTK".
    
    We only change the project name on resources on this website; talks,
    articles, tutorial, and books using the "plus" won't be changed.

 commerce.php           | 24 ++++++-------
 development.php        | 26 +++++++-------
 documentation-old.php  | 20 +++++------
 documentation.php      | 16 ++++-----
 download/index.php     |  6 ++--
 download/linux.php     | 16 ++++-----
 download/macos.php     | 30 ++++++++--------
 download/windows.php   | 40 ++++++++++-----------
 features.php           | 18 +++++-----
 gtk-doc/index.php      |  6 ++--
 gtk-doc/news.php       |  4 +--
 gtk-web.doap           |  4 +--
 index-fails.php        | 18 +++++-----
 index.php              | 18 +++++-----
 language-bindings.php  | 98 +++++++++++++++++++++++++-------------------------
 mailing-lists.php      | 18 +++++-----
 overview.php           | 22 ++++++------
 screenshots/index.php  |  6 ++--
 screenshots/museum.php |  8 ++---
 support.php            | 20 +++++------
 template.php           | 26 +++++++-------
 21 files changed, 222 insertions(+), 222 deletions(-)
---
diff --git a/commerce.php b/commerce.php
index 8604252..7fc6783 100644
--- a/commerce.php
+++ b/commerce.php
@@ -1,10 +1,10 @@
 <?php
 $nav = "about";
-$title = "GTK+ Success Stories";
+$title = "GTK Success Stories";
 ob_start();
 ?>
 <h2>Developers</h2>
-<p>GTK+, the development toolkit for the GNOME desktop and the GIMP image editor, is the choice of thousands 
of developers worldwide. Developers choose GTK+ for a variety of reasons, from the community that surrounds 
it to the free-of-charge LGPL licensing it offers. For many, the internationalization support is essential; 
for others, performance is the most important factor. Some prefer it because they program in C, and others 
because they program in C++, or Python, or C#. Regardless of the reasons, GTK+ is the finest development 
toolkit worldwide. This page presents some of the developers who use GTK+ and the reasons they like it.</p>
+<p>GTK, the development toolkit for the GNOME desktop and the GIMP image editor, is the choice of thousands 
of developers worldwide. Developers choose GTK for a variety of reasons, from the community that surrounds it 
to the free-of-charge LGPL licensing it offers. For many, the internationalization support is essential; for 
others, performance is the most important factor. Some prefer it because they program in C, and others 
because they program in C++, or Python, or C#. Regardless of the reasons, GTK is the finest development 
toolkit worldwide. This page presents some of the developers who use GTK and the reasons they like it.</p>
 
 <h2>Platforms</h2>
 
@@ -15,7 +15,7 @@ ob_start();
        </div>
        <div class="right">
                <h3><a href="http://www.gnome.org"; class="external"><img 
src="images/commerce/platforms/gnome.png" alt="GNOME" /></a></h3>
-               <p>The GNOME platform has been developed since 1997 and is used by many people expecting the 
high grade, clean look and feel for their every day desktop. GNOME delivers that with the power of GTK+ 
sitting underneath the software stack written on top of it.</p>
+               <p>The GNOME platform has been developed since 1997 and is used by many people expecting the 
high grade, clean look and feel for their every day desktop. GNOME delivers that with the power of GTK 
sitting underneath the software stack written on top of it.</p>
 </div>
 </div>
 
@@ -27,27 +27,27 @@ ob_start();
 
                <div class="bubble"><!-- div -->
                        <h3>TouchTunes Music</h3>
-                       <p><a href="http://touchtunes.com/"; class="external">TouchTunes Music</a> Corporation 
sells over a thousand digital jukeboxes a year, each with a GTK+ interface and glib-driven internals. 
Developer Tristan Van Berkom writes that he prefers GTK+ because <q>I consider myself a perfectionist</q> and 
that, examining the source, he often says <q>I couldn't have done it better myself</q>.</p>
+                       <p><a href="http://touchtunes.com/"; class="external">TouchTunes Music</a> Corporation 
sells over a thousand digital jukeboxes a year, each with a GTK interface and glib-driven internals. 
Developer Tristan Van Berkom writes that he prefers GTK because <q>I consider myself a perfectionist</q> and 
that, examining the source, he often says <q>I couldn't have done it better myself</q>.</p>
                </div>
 
                <div class="bubble"><!-- div -->
                        <h3>Solvo Ltd</h3>
-                       <p>Andrew Makeev, from Solvo, Ltd. of St. Petersburg, Russia, develops warehouse 
management systems using C++ and gtkmm. He cites several factors in his company's choice of GTK+ as a 
development toolkit, especially performance and internationalization. He appreciates the extensive 
documentation, direct access to the development community, and the straightforward object model.</p>
+                       <p>Andrew Makeev, from Solvo, Ltd. of St. Petersburg, Russia, develops warehouse 
management systems using C++ and gtkmm. He cites several factors in his company's choice of GTK as a 
development toolkit, especially performance and internationalization. He appreciates the extensive 
documentation, direct access to the development community, and the straightforward object model.</p>
                </div>
 
                <div class="bubble"><!-- div -->
                        <h3>NorayBio</h3>
-                       <p>Miguel Pignatelli, a senior scientist at the Bilbao, Spain bioinformatics company 
<a href="http://www.noraybio.com/"; class="external">NorayBio</a>, uses GTK+ in the development of software 
that predicts protein folding patterns. Although they initially selected GTK+ because they were writing in C, 
the NorayBio developers have grown to appreciate the way that provides access to both high and low levels of 
graphical programming and inter-process communications.</p>
+                       <p>Miguel Pignatelli, a senior scientist at the Bilbao, Spain bioinformatics company 
<a href="http://www.noraybio.com/"; class="external">NorayBio</a>, uses GTK in the development of software 
that predicts protein folding patterns. Although they initially selected GTK because they were writing in C, 
the NorayBio developers have grown to appreciate the way that provides access to both high and low levels of 
graphical programming and inter-process communications.</p>
                </div>
 
                <div class="bubble"><!-- div -->
                        <h3>London National Gallery</h3>
-                       <p>The <a href="http://www.nationalgallery.org.uk/"; class="external">London National 
Gallery</a> uses GTK+ for its image-processing system, <a href="http://www.vips.ecs.soton.ac.uk/"; 
class="external">VIPS</a>. VIPS is in use on Windows and Linux systems as part of the <a 
href="http://www.ecs.soton.ac.uk/~km/projs/vasari/"; class="external">Vasari</a> image archiving project, 
cataloging and storing extremely high resolution digital images of art work for museums worldwide. Developer 
John Cupitt says that the Gallery's reasons for choosing GTK+ were portability, support, and appearance.</p>
+                       <p>The <a href="http://www.nationalgallery.org.uk/"; class="external">London National 
Gallery</a> uses GTK for its image-processing system, <a href="http://www.vips.ecs.soton.ac.uk/"; 
class="external">VIPS</a>. VIPS is in use on Windows and Linux systems as part of the <a 
href="http://www.ecs.soton.ac.uk/~km/projs/vasari/"; class="external">Vasari</a> image archiving project, 
cataloging and storing extremely high resolution digital images of art work for museums worldwide. Developer 
John Cupitt says that the Gallery's reasons for choosing GTK were portability, support, and appearance.</p>
                </div>
 
                <div class="bubble"><!-- div -->
                        <h3>University of Ljubljana</h3>
-                       <p>Andrej Prsa, research scientist in the Physics department at the University of 
Ljubljana, is using GTK+ in his work on <a href="http://www.fiz.uni-lj.si/phoebe"; class="external">eclipse 
patterns in binary star systems</a>. He chose GTK+ for its licensing and because of the ubiquity of Linux 
software in astrophysics.</p>
+                       <p>Andrej Prsa, research scientist in the Physics department at the University of 
Ljubljana, is using GTK in his work on <a href="http://www.fiz.uni-lj.si/phoebe"; class="external">eclipse 
patterns in binary star systems</a>. He chose GTK for its licensing and because of the ubiquity of Linux 
software in astrophysics.</p>
                </div>
 
        </div>
@@ -55,23 +55,23 @@ ob_start();
 
                <div class="bubble"><!-- div -->
                        <h3>SendOutCards</h3>
-                       <p>Developers at <a href="http://sendoutcards.com/"; 
class="external">sendoutcards.com</a> use GTK+ and gtkmm to develop internal applications that allow end 
users to perform specialized technical tasks easily. Developer Adam Olsen says he selected GTK+ for its 
licensing and its cross-platform portability. Additional features he appreciates are the ease of development: 
with libglade, he says, <q>I really like that I can tweak the interface without having to recompile</q>.</p>
+                       <p>Developers at <a href="http://sendoutcards.com/"; 
class="external">sendoutcards.com</a> use GTK and gtkmm to develop internal applications that allow end users 
to perform specialized technical tasks easily. Developer Adam Olsen says he selected GTK for its licensing 
and its cross-platform portability. Additional features he appreciates are the ease of development: with 
libglade, he says, <q>I really like that I can tweak the interface without having to recompile</q>.</p>
                </div>
 
                <div class="bubble"><!-- div -->
                        <h3>Linux Audio Systems</h3>
-                       <p><a href="http://linuxaudiosystems.com/"; class="external">Linux Audio Systems</a>, 
a small music and pro-audio software company, uses GTK+ for all of its GUI-based software. Linux Audio 
Systems programs in C++, and was attracted by the way that the gtkmm wrappers use standard C++ and the 
Standard Template Library. They also appreciate the availability of a model/view/controller structure in 
GTK+. The canvas, in particular, has been crucial in their work, and has been extended for the main GUI 
object in the Ardour digital audio workstation. Developer Paul Davis says <q>the ease of new widget creation 
with gtkmm and the simplicity of creating new Canvas items have been highlights for us</q>. In addition, 
<q>the presence of a very helpful and knowledgeable user community on the GTK+ mailing lists has been another 
very useful feature of the toolkit for us</q>. Finally, GTK+ offered a better cost structure: the choice of 
the LGPL means that Linux Audio Systems has no licensi
 ng fees 
 to pay for the toolkit.</p>
+                       <p><a href="http://linuxaudiosystems.com/"; class="external">Linux Audio Systems</a>, 
a small music and pro-audio software company, uses GTK for all of its GUI-based software. Linux Audio Systems 
programs in C++, and was attracted by the way that the gtkmm wrappers use standard C++ and the Standard 
Template Library. They also appreciate the availability of a model/view/controller structure in GTK. The 
canvas, in particular, has been crucial in their work, and has been extended for the main GUI object in the 
Ardour digital audio workstation. Developer Paul Davis says <q>the ease of new widget creation with gtkmm and 
the simplicity of creating new Canvas items have been highlights for us</q>. In addition, <q>the presence of 
a very helpful and knowledgeable user community on the GTK mailing lists has been another very useful feature 
of the toolkit for us</q>. Finally, GTK offered a better cost structure: the choice of the LGPL means that 
Linux Audio Systems has no licensing f
 ees to p
 ay for the toolkit.</p>
                </div>
 
                <div class="bubble"><!-- div -->
                        <h3>BMA Coal, Australia</h3>
-                       <p>Kim Adil, at BMA Coal in Australia, used GTK+ to build a cross-platform mining 
process visualization tool for the mine control room. Developed on Linux and deployed on Windows 2000, the 
application displays near-real-time equipment location and status for the mine's heavy equipment. It has been 
so successful that it runs not only in the control room, but on a plasma display at the entrance to the BMA 
office. BMA Coal selected GTK+ for its licensing, cross-platform ability, and range of features. Adil, a 
mechanical engineer by with little previous software development experience, says <q>cross platform stability 
has been quite astounding,</q> and that the GTK+ community and mailing lists were significant factors in the 
project's success.</p>
+                       <p>Kim Adil, at BMA Coal in Australia, used GTK to build a cross-platform mining 
process visualization tool for the mine control room. Developed on Linux and deployed on Windows 2000, the 
application displays near-real-time equipment location and status for the mine's heavy equipment. It has been 
so successful that it runs not only in the control room, but on a plasma display at the entrance to the BMA 
office. BMA Coal selected GTK for its licensing, cross-platform ability, and range of features. Adil, a 
mechanical engineer by with little previous software development experience, says <q>cross platform stability 
has been quite astounding,</q> and that the GTK community and mailing lists were significant factors in the 
project's success.</p>
                </div>
 
        </div>
 </div>
 
 <h2>Community Applications</h2>
-<p>For some time now, free applications which use GTK+ have been listed on the <a 
href="http://www.gtk-apps.org/"; class="external">gtk-apps.org</a> website. This is great for finding out 
about new releases and searching for applications by category which use the same desktop environment (i.e. 
GTK+ and GNOME).</p>
+<p>For some time now, free applications which use GTK have been listed on the <a 
href="http://www.gtk-apps.org/"; class="external">gtk-apps.org</a> website. This is great for finding out 
about new releases and searching for applications by category which use the same desktop environment (i.e. 
GTK and GNOME).</p>
 
 <?php require 'template.php';
diff --git a/development.php b/development.php
index 462fa8d..44a9dfd 100644
--- a/development.php
+++ b/development.php
@@ -1,6 +1,6 @@
 <?php
 $nav = "development";
-$title = "GTK+ Development";
+$title = "GTK Development";
 ob_start();
 ?>
 <div class="sidebar">
@@ -13,31 +13,31 @@ ob_start();
        <p>For archives and information on how to subscribe, see the list of <a 
href="mailing-lists.php">mailing lists</a> available.</p>
 
        <h2><a name="IRC">IRC</a></h2>
-       <p>The <a href="irc://irc.gnome.org/%23gtk%2B" class="irc">#gtk+</a> IRC channel on irc.gnome.org is 
used for general discussions and questions about GLib and GTK+.</p>
+       <p>The <a href="irc://irc.gnome.org/%23gtk" class="irc">#gtk</a> IRC channel on irc.gnome.org is used 
for general discussions and questions about GLib and GTK.</p>
 
        <h2><a name="Wiki">Wiki</a></h2>
-       <p>We have <a href="https://wiki.gnome.org/Projects/GTK+"; class="external">wiki pages</a> for 
drafting, designing and proposing GTK+ development.</p>
+       <p>We have <a href="https://wiki.gnome.org/Projects/GTK"; class="external">wiki pages</a> for 
drafting, designing and proposing GTK development.</p>
 
        <h2><a name="Meetings">Meetings</a></h2>
-       <p>As regularly as possible, GTK+ team meetings take place at conferences and <a 
href="https://wiki.gnome.org/Hackfests"; class="external">hackfests</a> to discuss the future of GTK+ and 
define a <a href="https://wiki.gnome.org/Projects/GTK+/Roadmap"; class="external">roadmap</a>.</p>
+       <p>As regularly as possible, GTK team meetings take place at conferences and <a 
href="https://wiki.gnome.org/Hackfests"; class="external">hackfests</a> to discuss the future of GTK and 
define a <a href="https://wiki.gnome.org/Projects/GTK/Roadmap"; class="external">roadmap</a>.</p>
 </div>
 
 <h2><a name="WheresTheSource">Where's the Source?</a></h2>
-<p>You can clone the source code repository using <a href="http://git-scm.com/"; class="external">git</a>. 
Instructions on how to use bleeding edge versions of GTK+ are available on the <a 
href="/download/#BleedingEdge">download</a> page.</p>
+<p>You can clone the source code repository using <a href="http://git-scm.com/"; class="external">git</a>. 
Instructions on how to use bleeding edge versions of GTK are available on the <a 
href="/download/#BleedingEdge">download</a> page.</p>
 
 <h2><a name="Contributing">Contributing</a></h2>
-<p>GTK+ is a large project and relies on voluntary contributions. Everyone is invited to help project 
development. Starting points for contributors are:</p>
+<p>GTK is a large project and relies on voluntary contributions. Everyone is invited to help project 
development. Starting points for contributors are:</p>
 
 <ul class="tasks">
        <li>Hack away on existing <a href="https://gitlab.gnome.org/GNOME/gtk/issues/"; class="external">bug 
reports and feature requests</a>.</li>
-       <li>Contact us on the GTK+ development <a href="mailing-lists.php">mailing list</a>.</li>
+       <li>Contact us on the GTK development <a href="mailing-lists.php">mailing list</a>.</li>
 </ul>
 
 <h2><a name="BestPractices">Best Practices</a></h2>
-<p>When working on GTK+/GLib, there are several points one should consider, to keep the code in shape. See 
the <a href="https://wiki.gnome.org/Projects/GTK+/BestPractices"; class="external">GTK+ Best Practices</a>.</p>
+<p>When working on GTK/GLib, there are several points one should consider, to keep the code in shape. See 
the <a href="https://wiki.gnome.org/Projects/GTK/BestPractices"; class="external">GTK Best Practices</a>.</p>
 
 <h2><a name="Team">Team</a></h2>
-<p>Current core maintainers of GTK+ are:</p>
+<p>Current core maintainers of GTK are:</p>
 
 <?php
 // How about we have PHP automatically generate odd rows for us?
@@ -71,13 +71,13 @@ $maintainers = array(
 </table>
 
 <h2><a name="LanguageBindings">Language Bindings</a></h2>
-<p>For information about programming languages other than C which support GTK+, see the <a 
href="language-bindings.php">language bindings</a> available.</p>
+<p>For information about programming languages other than C which support GTK, see the <a 
href="language-bindings.php">language bindings</a> available.</p>
 
 <h2><a name="Support">Donations</a></h2>
-<p>If you want to help the GTK+ project by donating money OR perhaps your company wants to pay someone to 
develop GTK+, you can email the
-<a href="http://www.gnome.org/foundation/"; class="external">GNOME Foundation</a>. Any donations to GNOME for 
GTK+ will ONLY be spent on GTK+.</p>
+<p>If you want to help the GTK project by donating money OR perhaps your company wants to pay someone to 
develop GTK, you can email the
+<a href="http://www.gnome.org/foundation/"; class="external">GNOME Foundation</a>. Any donations to GNOME for 
GTK will ONLY be spent on GTK.</p>
 <ul class="tasks">
-       <li>Contact the <a href="mailto:foundation-list gnome org?subject=Supporting%20GTK+" 
class="email">GNOME Foundation</a>.</li>
+       <li>Contact the <a href="mailto:foundation-list gnome org?subject=Supporting%20GTK" 
class="email">GNOME Foundation</a>.</li>
 </ul>
 
 <?php require 'template.php';
diff --git a/documentation-old.php b/documentation-old.php
index b8deb6d..99408df 100644
--- a/documentation-old.php
+++ b/documentation-old.php
@@ -1,36 +1,36 @@
 <?php
 $nav = "documentation";
-$title = "GTK+ Documentation (Old)";
+$title = "GTK Documentation (Old)";
 ob_start();
 ?>
 
 <h2><a name="OlderDocumentation">Older Documentation</a></h2>
-<p>We recommend the GTK+ 3.x libraries and documentation instead because older versions are no longer 
supported, this documentation is available for those that need it.</p>
+<p>We recommend the GTK 3.x libraries and documentation instead because older versions are no longer 
supported, this documentation is available for those that need it.</p>
 
 <h2><a name="API">API Documentation</a></h2>
 
-<p>The API documentation for GTK+ 2.x is still <a 
href="https://developer.gnome.org/gtk2/stable/";>available</a>.</p>
+<p>The API documentation for GTK 2.x is still <a 
href="https://developer.gnome.org/gtk2/stable/";>available</a>.</p>
 
 <h2><a name="Books">Books</a></h2>
 <ul>
        <li>
-               <a href="http://www.amazon.com/Gnome-Application-Development-Havoc-Pennington/dp/0735700788/"; 
class="external">GTK+/Gnome Application Development</a>
+               <a href="http://www.amazon.com/Gnome-Application-Development-Havoc-Pennington/dp/0735700788/"; 
class="external">GTK/Gnome Application Development</a>
                <br />This book was written by Havoc Pennington
        </li>
        <li>
-               <a href="http://www.amazon.com/Gtk%2B-Programming-C-Syd-Logan/dp/0130142646/"; 
class="external">GTK+ Programming in C</a>
+               <a href="http://www.amazon.com/Gtk%2B-Programming-C-Syd-Logan/dp/0130142646/"; 
class="external">GTK Programming in C</a>
                <br />This book was written by Syd Logan
        </li>
        <li>
-               <a href="http://www.amazon.com/Developing-Linux-Applications-GTK%2B-GDK/dp/0735700214/"; 
class="external">Developing Linux Applications with GTK+ and GDK</a>
+               <a href="http://www.amazon.com/Developing-Linux-Applications-GTK%2B-GDK/dp/0735700214/"; 
class="external">Developing Linux Applications with GTK and GDK</a>
                <br />This book was written by Eric Harlow
        </li>
        <li>
-               <a href="http://www.amazon.com/Sams-Teach-Yourself-GTK%2B-Programming/dp/0672318296/"; 
class="external">Sams Teach Yourself GTK+ Programming in 21 Days</a>
+               <a href="http://www.amazon.com/Sams-Teach-Yourself-GTK%2B-Programming/dp/0672318296/"; 
class="external">Sams Teach Yourself GTK Programming in 21 Days</a>
                <br />This book was written by Donna Martin
        </li>
        <li>
-               <a href="http://www.amazon.com/Gnome-Gtk%2B-Programming-Bible-Wiley/dp/0764546406/"; 
class="external">GNOME/GTK+ Programming Bible</a>
+               <a href="http://www.amazon.com/Gnome-Gtk%2B-Programming-Bible-Wiley/dp/0764546406/"; 
class="external">GNOME/GTK Programming Bible</a>
                <br />This book was written by Arthur Griffith
        </li>
 </ul>
@@ -38,8 +38,8 @@ ob_start();
 <h2><a name="Tutorials">Tutorials</a></h2>
 <ul>
         <li>
-                <a href="https://developer.gnome.org/gtk-tutorial/stable/"; class="external">GTK+ 2.x</a>
-                <br />The GTK+ 2.x Tutorial.
+                <a href="https://developer.gnome.org/gtk-tutorial/stable/"; class="external">GTK 2.x</a>
+                <br />The GTK 2.x Tutorial.
         </li>
 </ul>
 
diff --git a/documentation.php b/documentation.php
index 3f2c068..1239c48 100644
--- a/documentation.php
+++ b/documentation.php
@@ -1,6 +1,6 @@
 <?php
 $nav = "documentation";
-$title = "GTK+ Documentation";
+$title = "GTK Documentation";
 ob_start();
 ?>
 <div class="sidebar">
@@ -8,10 +8,10 @@ ob_start();
        <p>For information about frequently asked questions, please <a 
href="https://developer.gnome.org/gtk3/stable/gtk-question-index.html"; class="external">visit the FAQ</a>.</p>
 
        <h2><a name="GTK-Doc">GTK-Doc</a></h2>
-       <p>All documentation for the GTK+ project uses GTK-Doc to generate the HTML pages from comments in 
the C code. To find out more about GTK-Doc <a href="gtk-doc/" class="external">visit the project page</a>.</p>
+       <p>All documentation for the GTK project uses GTK-Doc to generate the HTML pages from comments in the 
C code. To find out more about GTK-Doc <a href="gtk-doc/" class="external">visit the project page</a>.</p>
 
        <h2><a name="OlderDocumentation">Older Documentation</a></h2>
-       <p>Although we recommend the GTK+ 3 platform, we keep <a 
href="documentation-old.php">documentation</a> for older versions of GTK+ around for those who need it.</p>
+       <p>Although we recommend the GTK 3 platform, we keep <a 
href="documentation-old.php">documentation</a> for older versions of GTK around for those who need it.</p>
 </div>
 
 
@@ -79,7 +79,7 @@ ob_start();
 <h2><a name="Books">Books</a></h2>
 <ul>
        <li>
-               <a href="http://de.wikibooks.org/wiki/GTK_mit_Builder"; class="external">GTK+ 3 with 
Builder</a>
+               <a href="http://de.wikibooks.org/wiki/GTK_mit_Builder"; class="external">GTK 3 with Builder</a>
                <br />This book was written by Eike Lange (it's in German).
        </li>
        <li>
@@ -95,16 +95,16 @@ ob_start();
 <h2><a name="Tutorials">Tutorials</a></h2>
 <ul>
         <li>
-               <a href="https://developer.gnome.org/gtk3/stable/gtk-getting-started.html"; 
class="external">Getting Started with GTK+</a>
-               <br />The GTK+ reference documentation includes a tutorial chapter.
+               <a href="https://developer.gnome.org/gtk3/stable/gtk-getting-started.html"; 
class="external">Getting Started with GTK</a>
+               <br />The GTK reference documentation includes a tutorial chapter.
         </li>
        <li>
                <a href="http://scentric.net/tutorial/treeview-tutorial.html"; class="external">GTK+ Tree 
View</a> (<a href="http://scentric.net/tutorial/treeview-tutorial.pdf"; class="pdf">pdf</a>)
-               <br />This tutorial covers the GtkTreeView and was written by Tim-Philipp Müller. It was 
written for GTK+ 2.x, but most of the information applies to GTK+ 3 as well.
+               <br />This tutorial covers the GtkTreeView and was written by Tim-Philipp Müller. It was 
written for GTK 2.x, but most of the information applies to GTK 3 as well.
        </li>
        <li>
                <a href="http://www.bravegnu.org/gtktext/"; class="external">GTK+ Text View</a>
-               <br />This tutorial covers the GtkTextView and was written by Vijay Kumar B. It was written 
for GTK+ 2.x, but most of the information applies to GTK+ 3 as well.
+               <br />This tutorial covers the GtkTextView and was written by Vijay Kumar B. It was written 
for GTK 2.x, but most of the information applies to GTK 3 as well.
        </li>
        <li>
                <a href="http://zetcode.com/tutorials/gtktutorial/"; class="external">GTK+ 2.x Tutorial for 
Beginners</a>
diff --git a/download/index.php b/download/index.php
index 8c283ff..3ac282d 100644
--- a/download/index.php
+++ b/download/index.php
@@ -1,6 +1,6 @@
 <?php
 $nav = "download";
-$title = "Download GTK+";
+$title = "Download GTK";
 ob_start();
 ?>
 
@@ -8,7 +8,7 @@ ob_start();
 
        <div class="left">
                <h2 id="StableRelease">Stable releases</h2>
-               <p>GTK+ is available on:</p>
+               <p>GTK is available on:</p>
                <ul class="platform_list">
                        <li class="linux"><a href="linux.php">GNU/Linux and Unix</a></li>
                        <li class="windows"><a href="windows.php">Windows</a></li>
@@ -24,7 +24,7 @@ ob_start();
 </div>
 
 <h2 id="BleedingEdge">Bleeding edge</h2>
-<p>Alternatively, you can check out the latest unstable release of GTK+ using <a href="http://git-scm.com/"; 
class="external">git</a>.</p>
+<p>Alternatively, you can check out the latest unstable release of GTK using <a href="http://git-scm.com/"; 
class="external">git</a>.</p>
 <pre>
 git clone https://gitlab.gnome.org/GNOME/gtk.git
 </pre>
diff --git a/download/linux.php b/download/linux.php
index b6428b3..376d28d 100644
--- a/download/linux.php
+++ b/download/linux.php
@@ -1,9 +1,9 @@
 <?php
 $nav = "download";
-$title = "GTK+ Download: GNU/Linux";
+$title = "GTK Download: GNU/Linux";
 ob_start();
 
-// Set the current stable version numbers of GTK+, GLib, and Pango to automatically include it in the page.
+// Set the current stable version numbers of GTK, GLib, and Pango to automatically include it in the page.
 $versions = array(
        'gobject-introspection' => '1.54',
        'gtk' => '3.22',
@@ -13,20 +13,20 @@ $versions = array(
        'atk' => '2.26'
 );
 
-// Versions of GTK+ that are older, but still included on the page in the "Older Versions" section
+// Versions of GTK that are older, but still included on the page in the "Older Versions" section
 $oldgtk = array( '3.20', '3.18', '3.16', '3.14', '3.12', '3.10', '3.8', '3.6', '3.4', '3.2', '3.0',
                 '2.24', '1.2' );
 
 ?>
 <h2><a name="Download">Download for GNU/Linux and Unix</a></h2>
 <h3><a name="Requirements">Requirements</a></h3>
-<p>You will need to get the GLib, GObject-Introspection, Pango, Gdk-Pixbuf, ATK and GTK+ packages to build 
GTK+.<br/>You may also need some of the external dependencies that are also linked for each version listed 
below.</p>
+<p>You will need to get the GLib, GObject-Introspection, Pango, Gdk-Pixbuf, ATK and GTK packages to build 
GTK.<br/>You may also need some of the external dependencies that are also linked for each version listed 
below.</p>
 
 <h3><a name="StableRelease">Stable Release</a></h3>
-<p>To build GTK+ <?php echo $versions['gtk']; ?>, see the <a 
href="https://developer.gnome.org/gtk3/stable/gtk-building.html"; class="external">installation guide</a>. For 
additional help, the <a href="https://developer.gnome.org/gtk3/stable/gtk-question-index.html"; 
class="external">FAQ</a> is a good starting point.</p>
+<p>To build GTK <?php echo $versions['gtk']; ?>, see the <a 
href="https://developer.gnome.org/gtk3/stable/gtk-building.html"; class="external">installation guide</a>. For 
additional help, the <a href="https://developer.gnome.org/gtk3/stable/gtk-question-index.html"; 
class="external">FAQ</a> is a good starting point.</p>
 
 <ul>
-       <li><a href="http://ftp.gnome.org/pub/gnome/sources/gtk+/<?php echo $versions['gtk']; ?>/" 
class="download">GTK+ <?php echo $versions['gtk']; ?></a></li>
+       <li><a href="http://ftp.gnome.org/pub/gnome/sources/gtk+/<?php echo $versions['gtk']; ?>/" 
class="download">GTK <?php echo $versions['gtk']; ?></a></li>
        <li><a href="http://ftp.gnome.org/pub/gnome/sources/glib/<?php echo $versions['glib']; ?>/" 
class="download">GLib <?php echo $versions['glib']; ?></a></li>
        <li><a href="http://ftp.gnome.org/pub/gnome/sources/pango/<?php echo $versions['pango']; ?>/" 
class="download">Pango <?php echo $versions['pango']; ?></a></li>
        <li><a href="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/<?php echo $versions['gdk-pixbuf']; 
?>/" class="download">Gdk-Pixbuf <?php echo $versions['gdk-pixbuf']; ?></a></li>
@@ -40,14 +40,14 @@ $oldgtk = array( '3.20', '3.18', '3.16', '3.14', '3.12', '3.10', '3.8', '3.6', '
 -->
 
 <h3><a name="OlderVersions">Older Versions</a></h3>
-<p>Some applications still require GTK+ 2, an older stable version of GTK+. You can have the run-time and 
development environments for GTK+ 3.x, GTK+ 2.x and GTK+ 1.2 installed simultaneously on your computer.</p>
+<p>Some applications still require GTK 2, an older stable version of GTK. You can have the run-time and 
development environments for GTK 3.x, GTK 2.x and GTK 1.2 installed simultaneously on your computer.</p>
 <table>
        <tr>
                <th>Version</th>
                <th>Packages</th>
        </tr><?php foreach( $oldgtk as $index => $version ) { ?> 
        <tr<?php echo $index % 2 != 0 ? ' class="odd"': ' class="even"'; ?>>
-               <td>GTK+ <?php echo $version; ?></td>
+               <td>GTK <?php echo $version; ?></td>
                <td><a href="http://ftp.gnome.org/pub/gnome/sources/gtk+/<?php echo $version; ?>/" 
class="download">Sources</a></td>
        </tr><?php } ?> 
 </table>
diff --git a/download/macos.php b/download/macos.php
index f30a394..14ac4fd 100644
--- a/download/macos.php
+++ b/download/macos.php
@@ -1,24 +1,24 @@
 <?php
 $nav = "download";
-$title = "GTK+ Download: Mac OS X";
+$title = "GTK Download: Mac OS X";
 ob_start();
 ?>
 
 <h2><a name="Download">Download for Mac OS X</a></h2>
 
 <h3>About</h3>
-<p>Do you have a favorite GTK+ application that you'd like to
+<p>Do you have a favorite GTK application that you'd like to
 run on your Mac with a more Mac-like look and feel, with the
 menus up on the menu bar and standard Mac keyboard shortcuts like
-Command-Q? Perhaps you maintain a GTK+ application and want to
+Command-Q? Perhaps you maintain a GTK application and want to
 expand your user base to Mac users who want a Mac experience, not a
 transplanted Unix experience?
 </p>
 
 <h3>Features</h3>
-<p>Linking with GTK+'s <a
-href="https://wiki.gnome.org/Projects/GTK+/OSX";>Quartz backend</a> connects your application to the Mac's 
native display manager, keyboard, and pointing device. With a little extra code and <a
-href="https://wiki.gnome.org/Projects/GTK+/OSX/Integration";>gtk-mac-integration</a> you can:
+<p>Linking with GTK's <a
+href="https://wiki.gnome.org/Projects/GTK/OSX";>Quartz backend</a> connects your application to the Mac's 
native display manager, keyboard, and pointing device. With a little extra code and <a
+href="https://wiki.gnome.org/Projects/GTK/OSX/Integration";>gtk-mac-integration</a> you can:
 <ul>
 
 <li>Integrate the Application's menus with the Mac Menubar</li>
@@ -32,20 +32,20 @@ href="https://wiki.gnome.org/Projects/GTK+/OSX/Integration";>gtk-mac-integration<
 <p>There are a number of requirements that need to be met by your
 system before you can build for OSX. These are updated from time to
 time and kept on the  <a
-href="https://wiki.gnome.org/Projects/GTK+/OSX/Building#Prerequisites";>live wiki</a>.</p>
+href="https://wiki.gnome.org/Projects/GTK/OSX/Building#Prerequisites";>live wiki</a>.</p>
 
 <h3>Building</h3>
-<p><a href="https://wiki.gnome.org/Projects/GTK+/OSX/Building";>Building</a> with <a
+<p><a href="https://wiki.gnome.org/Projects/GTK/OSX/Building";>Building</a> with <a
 href="https://wiki.gnome.org/Projects/Jhbuild";>jhbuild</a> and the GTK-OSX
 modulesets, you can build your application and all of its dependent
 libraries with a single command.</p>
 
 <h3>All-in-one bundles</h3>
-<p><a href="https://wiki.gnome.org/Projects/GTK+/OSX/Bundling";>Bundling</a>
+<p><a href="https://wiki.gnome.org/Projects/GTK/OSX/Bundling";>Bundling</a>
 with the <strong>gtk-mac-bundler</strong>, an easily configured python
 program which creates an application bundle for you and populates it
 with your application executable and all of the dependent libraries
-from your GTK+ build, changing the installed names as needed to point
+from your GTK build, changing the installed names as needed to point
 inside the bundle.</p>
 
 <h3>Getting Started</h3>
@@ -55,12 +55,12 @@ href="http://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh";>
 installation script</a> (gtk-osx-build-setup.sh). If your application
 already has a module, everything you need to build your application is
 handled by jhbuild. The <a
-href="https://wiki.gnome.org/Projects/GTK+/OSX/Building";>build</a> page has
+href="https://wiki.gnome.org/Projects/GTK/OSX/Building";>build</a> page has
 detailed instructions.</p>
 
 <h3>Success Stories</h3>
-<p>Some of the projects which have used GTK+ on Mac OS X have <a
-href="https://wiki.gnome.org/Projects/GTK+/OSX/PortedApps";>shared their
+<p>Some of the projects which have used GTK on Mac OS X have <a
+href="https://wiki.gnome.org/Projects/GTK/OSX/PortedApps";>shared their
 experiences</a> for all to see. If you have any feedback you would
 like to give about your experiences here, please contact us on the
 the users mailing list as mentioned below.</p>
@@ -78,8 +78,8 @@ mailing list</a> as well.</p>
 <h3>Contributing</h3>
 <p>Bugs, patches and enhancements for building,
 integration, or bundling may be submitted to <a 
href="https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-mac-integration";>Bugzilla, with 
Product=gtk-mac-integration</a>.
-Bug reports on any other package, including GTK+ itself, should be submitted
-against that package, not gtk-mac-integration; the GTK+ component for the
+Bug reports on any other package, including GTK itself, should be submitted
+against that package, not gtk-mac-integration; the GTK component for the
 Quartz backend is "Backend: Quartz".</p>
 
 <?php require '../template.php';
diff --git a/download/windows.php b/download/windows.php
index 07d0865..71cc66d 100644
--- a/download/windows.php
+++ b/download/windows.php
@@ -1,22 +1,22 @@
 <?php
 $nav = "download";
-$title = "GTK+ Download: Windows";
+$title = "GTK Download: Windows";
 ob_start();
 ?>
 <h2><a name="Download">Download for Windows</a></h2>
 
-<p>Note: These instructions are intended for developers wanting to develop applications based on GTK+, not 
for end-users.</p>
+<p>Note: These instructions are intended for developers wanting to develop applications based on GTK, not 
for end-users.</p>
 
 <h3><a name="Requirements">Requirements</a></h3>
  
 <h4>Windows version</h4>
-<p>GTK+ requires Windows 7 or later.</p>
+<p>GTK requires Windows 7 or later.</p>
 
-<p>For older versions of Windows, you should do a custom build of older versions of GLib and GTK+.</p>
+<p>For older versions of Windows, you should do a custom build of older versions of GLib and GTK.</p>
 
-<h3>Installing GTK+ and its dependencies</h3>
+<h3>Installing GTK and its dependencies</h3>
 
-<p>The easiest way to install GTK+ and its dependencies in binary form is through the <a class="external" 
href="https://msys2.github.io/";>MSYS2</a> project. MSYS2 provides a UNIX-like development environment for 
Windows. It provides packages for many software applications and libraries, including the GTK+ stack. These 
packages are installed using the <a class="external" 
href="https://github.com/msys2/msys2/wiki/MSYS2-installation#iv-general-package-management";>pacman package 
manager</a>.</p>
+<p>The easiest way to install GTK and its dependencies in binary form is through the <a class="external" 
href="https://msys2.github.io/";>MSYS2</a> project. MSYS2 provides a UNIX-like development environment for 
Windows. It provides packages for many software applications and libraries, including the GTK stack. These 
packages are installed using the <a class="external" 
href="https://github.com/msys2/msys2/wiki/MSYS2-installation#iv-general-package-management";>pacman package 
manager</a>.</p>
 
 <p>Note: in the following steps, we'll assume you're using a 64-bit Windows. Therefore, the package names 
include the <code>x86_64</code> architecture identifier. If you're using a 32-bit Windows, please adapt the 
instructions below using the <code>i686</code> architecture identifier.</p>
 
@@ -25,27 +25,27 @@ ob_start();
 <a class="external" href="https://msys2.github.io/";>Download the MSYS2 installer</a> that matches your 
platform and follow the installation instructions.
 </p>
 
-<h4>Step 2: Install GTK+3 and its dependencies</h4>
+<h4>Step 2: Install GTK3 and its dependencies</h4>
 <p>Open a MSYS2 shell, and run:<br />
 <code>pacman -S mingw-w64-x86_64-gtk3</code>
 </p>
 
-<h4>Step 3 (recommended): Install GTK+ core applications</h4>
-<p><strong>Glade</strong> is a GUI designer for GTK+. It lets you design your GUI and export it in XML 
format.
-You can then import your GUI from your code using the <code>GtkBuilder</code> API. Read the 
<code>GtkBuilder</code> section in the GTK+ manual for more information.</p>
+<h4>Step 3 (recommended): Install GTK core applications</h4>
+<p><strong>Glade</strong> is a GUI designer for GTK. It lets you design your GUI and export it in XML format.
+You can then import your GUI from your code using the <code>GtkBuilder</code> API. Read the 
<code>GtkBuilder</code> section in the GTK manual for more information.</p>
 
 <p>To install Glade:<br />
 <code>pacman -S mingw-w64-x86_64-glade</code>
 </p>
 
-<p><strong>Devhelp</strong> is a help browser. It lets you easily navigate offline in the GTK+, glib and 
gobject API help relative to the version of these libraries installed on your system.</p>
+<p><strong>Devhelp</strong> is a help browser. It lets you easily navigate offline in the GTK, glib and 
gobject API help relative to the version of these libraries installed on your system.</p>
 
 <p>To install Devhelp:<br />
 <code>pacman -S mingw-w64-x86_64-devhelp</code>
 </p>
 
 <h4>Step 4 (optional): Install the Python bindings</h4>
-<p>If you want to develop a GTK+3 application in Python, you need to install the Python bindings.</p>
+<p>If you want to develop a GTK3 application in Python, you need to install the Python bindings.</p>
 
 <p>If you develop in Python 3:<br />
 <code>pacman -S mingw-w64-x86_64-python3-gobject</code>
@@ -56,23 +56,23 @@ You can then import your GUI from your code using the <code>GtkBuilder</code> AP
 </p>
 
 <h4>Step 5 (optional): Install build tools</h4>
-<p>If you want to develop a GTK+3 application in other languages like C, C++, Fortran, etc, you'll need a 
compiler like gcc and other development tools:<br />
+<p>If you want to develop a GTK3 application in other languages like C, C++, Fortran, etc, you'll need a 
compiler like gcc and other development tools:<br />
 <code>pacman -S mingw-w64-x86_64-toolchain base-devel</code>
 </p>
 
 <h2>Building and distributing your application</h2>
 
 <h3>Building your application with MSYS2</h3>
-<p>You may use MSYS2 to <a class="external" 
href="https://blogs.gnome.org/nacho/2014/08/01/how-to-build-your-gtk-application-on-windows/";>build your GTK+ 
application and create an installer to distribute it</a>. Your installer will need to ship your application 
build artifacts as well as GTK+ binaries and runtime dependencies.</p>
+<p>You may use MSYS2 to <a class="external" 
href="https://blogs.gnome.org/nacho/2014/08/01/how-to-build-your-gtk-application-on-windows/";>build your GTK 
application and create an installer to distribute it</a>. Your installer will need to ship your application 
build artifacts as well as GTK binaries and runtime dependencies.</p>
 
 <h3>Building your application with Visual Studio</h3>
-<p>GTK+ releases provide project files for Microsoft Visual Studio. You can use them to build GTK+ itself 
and use it in your own project. Learn more on <a class="external" 
href="https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack";>how to build the GTK+ stack using 
Microsoft Visual Studio</a> and read these other tips on <a class="external" 
href="https://blogs.gnome.org/nacho/2015/02/19/building-gtk-3-with-msvc-2013/";>how to build GTK+ with MSVC on 
Windows</a>.</p>
+<p>GTK releases provide project files for Microsoft Visual Studio. You can use them to build GTK itself and 
use it in your own project. Learn more on <a class="external" 
href="https://wiki.gnome.org/Projects/GTK/Win32/MSVCCompilationOfGTKStack";>how to build the GTK stack using 
Microsoft Visual Studio</a> and read these other tips on <a class="external" 
href="https://blogs.gnome.org/nacho/2015/02/19/building-gtk-3-with-msvc-2013/";>how to build GTK with MSVC on 
Windows</a>.</p>
 
-<h3>Distributing GTK+ with your application</h3>
-<p>You are welcome to redistribute GTK+ binaries, including applications that bundle them, on other web 
sites, CD-ROM, and other media. You don't have to ask for permission. That's one of the points of Free 
Software. One important thing that the <a class="external" 
href="http://www.fsf.org/licenses/licenses.html";>GNU licenses</a> require is that <strong>you must also 
redistribute the source code</strong>. This usually means at least the gettext, GLib, GTK+, Pango and Atk 
sources.</p>
+<h3>Distributing GTK with your application</h3>
+<p>You are welcome to redistribute GTK binaries, including applications that bundle them, on other web 
sites, CD-ROM, and other media. You don't have to ask for permission. That's one of the points of Free 
Software. One important thing that the <a class="external" 
href="http://www.fsf.org/licenses/licenses.html";>GNU licenses</a> require is that <strong>you must also 
redistribute the source code</strong>. This usually means at least the gettext, GLib, GTK, Pango and Atk 
sources.</p>
 
-<h4>List of GTK+ dependencies</h4>
-<p>GTK+ depends on several libraries:</p>
+<h4>List of GTK dependencies</h4>
+<p>GTK depends on several libraries:</p>
 <ul>
 <li>GLib</li>
 <li>cairo</li>
@@ -81,7 +81,7 @@ You can then import your GUI from your code using the <code>GtkBuilder</code> AP
 <li>gdk-pixbuf</li>
 </ul>
 
-<p>To run GTK+ programs you will also need:</p>
+<p>To run GTK programs you will also need:</p>
 <ul>
 <li>gettext-runtime</li>
 <li>fontconfig</li>
diff --git a/features.php b/features.php
index ea1b991..181ed91 100644
--- a/features.php
+++ b/features.php
@@ -1,6 +1,6 @@
 <?php
 $nav = "features";
-$title = "GTK+ Features";
+$title = "GTK Features";
 
 ob_start();
 
@@ -10,17 +10,17 @@ ob_start();
 
        <div class="bubble" id="Stability">
                <h2><a name="Stability">Stability</a></h2>
-               <p>GTK+ has been developed for over a decade to be able to deliver the enticing features and 
superb performance that it brings to your application development. GTK+ is supported by a large community of 
developers and has core maintainers from companies such as <a href="http://www.redhat.com/"; 
class="external">Red Hat</a>, <a href="http://www.novell.com/"; class="external">Novell</a>, <a 
href="http://www.lanedo.com/gtk+.html"; class="external">Lanedo</a>, <a href="http://www.codethink.co.uk/"; 
class="external">Codethink</a>, <a href="https://endlessm.com/"; class="external">Endless Mobile</a> and <a 
href="http://www.intel.com/"; class="external">Intel</a>.</p>
+               <p>GTK has been developed for over a decade to be able to deliver the enticing features and 
superb performance that it brings to your application development. GTK is supported by a large community of 
developers and has core maintainers from companies such as <a href="http://www.redhat.com/"; 
class="external">Red Hat</a>, <a href="http://www.novell.com/"; class="external">Novell</a>, <a 
href="http://www.lanedo.com/gtk+.html"; class="external">Lanedo</a>, <a href="http://www.codethink.co.uk/"; 
class="external">Codethink</a>, <a href="https://endlessm.com/"; class="external">Endless Mobile</a> and <a 
href="http://www.intel.com/"; class="external">Intel</a>.</p>
        </div>
 
        <div class="bubble" id="LanguageBindings">
                <h2><a name="LanguageBindings">Language Bindings</a></h2>
-               <p>GTK+ is available in many other programming languages thanks to the <a 
href="language-bindings.php">language bindings</a> available. This makes GTK+ quite an attractive toolkit for 
application development.</p>
+               <p>GTK is available in many other programming languages thanks to the <a 
href="language-bindings.php">language bindings</a> available. This makes GTK quite an attractive toolkit for 
application development.</p>
        </div>
 
        <div class="bubble" id="Interfaces">
                <h2><a name="Interfaces">Interfaces</a></h2>
-               <p>GTK+ has a comprehensive collection of core widgets and interfaces for use in your 
application.</p>
+               <p>GTK has a comprehensive collection of core widgets and interfaces for use in your 
application.</p>
                <div class="figure">
                        <a href="images/features/twf.png" class="image"><img 
src="images/features/thumbnail-twf.png" alt="The Widget Factory" /></a>
                </div>
@@ -48,7 +48,7 @@ ob_start();
 
        <div class="bubble" id="CrossPlatform">
                <h2><a name="CrossPlatform">Cross Platform</a></h2>
-               <p>Originally GTK+ was developed for the X Window System but it has grown over the years to 
include backend support for other well known windowing systems. Today you can use GTK+ on:</p>
+               <p>Originally GTK was developed for the X Window System but it has grown over the years to 
include backend support for other well known windowing systems. Today you can use GTK on:</p>
                <ul class="platform_list">
                        <li class="linux"><a href="download/linux.php">GNU/Linux and Unix</a></li>
                        <li class="windows"><a href="download/windows.php">Windows</a></li>
@@ -58,7 +58,7 @@ ob_start();
 
        <div class="bubble" id="Accommodating">
                <h2><a name="Accommodating">Accommodating</a></h2>
-               <p>GTK+ caters for a number features that today's developers are looking for in a toolkit 
including:</p>
+               <p>GTK caters for a number features that today's developers are looking for in a toolkit 
including:</p>
                <ul>
                        <li>Native look and feel</li>
                        <li>Theme support</li>
@@ -75,7 +75,7 @@ ob_start();
 
        <div class="bubble" id="Foundations">
                <h2><a name="Foundations">Foundations</a></h2>
-               <p>GTK+ is built on top of GLib. GLib provides the fundamental algorithmic language 
constructs commonly duplicated in applications. This library has features such as: (this list is not a 
comprehensive list)</p>
+               <p>GTK is built on top of GLib. GLib provides the fundamental algorithmic language constructs 
commonly duplicated in applications. This library has features such as: (this list is not a comprehensive 
list)</p>
                <ul>
                        <li>Object and type system</li>
                        <li>Main loop</li>
@@ -96,8 +96,8 @@ ob_start();
 
        <div class="bubble" id="Mobile">
                <h2><a name="Mobile">Mobile</a></h2>
-               <p>The GMAE (GNOME Mobile &amp; Embedded) initiative has advanced the use, development and 
commercialization of GNOME components as a mobile and embedded user experience platform. It has brought 
together industry leaders, expert consultants, key developers and the community and industry organizations 
they represent. As a direct result of this, GTK+ has features pertaining to mobile and embedded platform 
requirements.</p>
-               <p>GTK+ has been involved in a number of embedded initiatives over the past few years 
including the development of:</p>
+               <p>The GMAE (GNOME Mobile &amp; Embedded) initiative has advanced the use, development and 
commercialization of GNOME components as a mobile and embedded user experience platform. It has brought 
together industry leaders, expert consultants, key developers and the community and industry organizations 
they represent. As a direct result of this, GTK has features pertaining to mobile and embedded platform 
requirements.</p>
+               <p>GTK has been involved in a number of embedded initiatives over the past few years 
including the development of:</p>
                <ul>
                        <li>Nokia <a href="http://europe.nokia.com/A4145104"; class="external">770</a> / <a 
href="http://web.nseries.com/products/#l=products,n800"; class="external">N800</a> / <a 
href="http://web.nseries.com/products/#l=products,n810"; class="external">N810</a> / <a 
href="http://maemo.nokia.com/n900/"; class="external">N900</a></li>
                        <li><a href="http://www.laptop.org/"; class="external">One Laptop Per Child 
Project</a></li>
diff --git a/gtk-doc/index.php b/gtk-doc/index.php
index a334d3a..9505814 100644
--- a/gtk-doc/index.php
+++ b/gtk-doc/index.php
@@ -7,10 +7,10 @@ require 'gtkdoc.config.php';
 ?>
 
 <h2>The GTK-Doc Project</h2>
-<p>GTK-Doc is a project which was started to generate API documentation from comments added to C code. It is 
typically used to document the public API of <a href="http://www.gtk.org/"; class="external">GTK+</a> and <a 
href="http://www.gnome.org/"; class="external">GNOME</a> libraries, but it can also be used to document 
application code.</p>
+<p>GTK-Doc is a project which was started to generate API documentation from comments added to C code. It is 
typically used to document the public API of <a href="http://www.gtk.org/"; class="external">GTK</a> and <a 
href="http://www.gnome.org/"; class="external">GNOME</a> libraries, but it can also be used to document 
application code.</p>
 
 <h2>History</h2>
-<p>GTK-Doc wasn't originally intended to be a general-purpose documentation tool, so it can be a bit awkward 
to setup and use. For a more polished general-purpose documentation tool you may want to look at <a 
href="http://www.doxygen.org/"; class="external">Doxygen</a>. However GTK-Doc has some special code to 
document the signals and properties of GTK+ widgets and GObject classes which other tools may not have.</p>
+<p>GTK-Doc wasn't originally intended to be a general-purpose documentation tool, so it can be a bit awkward 
to setup and use. For a more polished general-purpose documentation tool you may want to look at <a 
href="http://www.doxygen.org/"; class="external">Doxygen</a>. However GTK-Doc has some special code to 
document the signals and properties of GTK widgets and GObject classes which other tools may not have.</p>
 
 <h2>How it works</h2>
 <p>GTK-Doc allows your documentation to be written in 2 ways:</p>
@@ -26,6 +26,6 @@ require 'gtkdoc.config.php';
 <p>For full details have a look at the <a href="http://developer.gnome.org/gtk-doc-manual/unstable/"; 
class="external">GTK-Doc user manual</a>.</p>
 
 <h2>Examples</h2>
-<p>Visit the <a href="../documentation.php" class="external">GTK+ documentation</a> and click on one of the 
API references there to see the final result of using GTK-Doc. For examples on how to make use of GTK-Doc in 
your project, <a href="../download/index.php" class="external">download GTK+</a> and see how it is added to 
the source files. GTK-Doc itself has a test suite as well that can be used as examples.</p>
+<p>Visit the <a href="../documentation.php" class="external">GTK documentation</a> and click on one of the 
API references there to see the final result of using GTK-Doc. For examples on how to make use of GTK-Doc in 
your project, <a href="../download/index.php" class="external">download GTK</a> and see how it is added to 
the source files. GTK-Doc itself has a test suite as well that can be used as examples.</p>
 
 <?php require '../template.php';
diff --git a/gtk-doc/news.php b/gtk-doc/news.php
index 3edd3fe..893119e 100644
--- a/gtk-doc/news.php
+++ b/gtk-doc/news.php
@@ -285,7 +285,7 @@ require 'gtkdoc.config.php';
         <ul>
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=625776"; class="external">Bug 
625776</a>: serialise doubles and floats always with a decimal dot</li>
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=627269"; class="external">Bug 
627269</a>: link to signalflags docs from signal descriptions</li>
-                <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=467488"; class="external">Bug 
467488</a>: GTK+ man pages request</li>
+                <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=467488"; class="external">Bug 
467488</a>: GTK man pages request</li>
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=481811"; class="external">Bug 
481811</a>: Inline function bodies are confused with declarations</li>
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=501107"; class="external">Bug 
501107</a>: EXTRA_DIST automake warnings</li>
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=512565"; class="external">Bug 
512565</a>: add GTK_DOC_IGNORE</li>
@@ -309,7 +309,7 @@ require 'gtkdoc.config.php';
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=631336"; class="external">Bug 
631336</a>: remove lists of gtk+ signal args in gtkdoc-scanobj and -scangobj</li>
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=632587"; class="external">Bug 
632587</a>: gtkdoc-scanner fails to identify (closure) annotation</li>
                 <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=638330"; class="external">Bug 
638330</a>: const in parameter list is ignored</li>
-                <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=638831"; class="external">Bug 
638831</a>: Support GTK+ 3 cell properties</li>
+                <li><a href="https://bugzilla.gnome.org/show_bug.cgi?id=638831"; class="external">Bug 
638831</a>: Support GTK 3 cell properties</li>
         </ul>
 </div>
 
diff --git a/gtk-web.doap b/gtk-web.doap
index 5493423..5ed28bb 100644
--- a/gtk-web.doap
+++ b/gtk-web.doap
@@ -5,8 +5,8 @@
          xmlns="http://usefulinc.com/ns/doap#";>
 
   <name xml:lang="en">gtk-web</name>
-  <shortdesc xml:lang="en">GTK+ website</shortdesc>
-  <description xml:lang="en">The GTK+ website</description>
+  <shortdesc xml:lang="en">GTK website</shortdesc>
+  <description xml:lang="en">The GTK website</description>
   <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gtk%2B"; />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#infrastructure"; />
diff --git a/index-fails.php b/index-fails.php
index 29f7295..a04ba58 100644
--- a/index-fails.php
+++ b/index-fails.php
@@ -176,7 +176,7 @@ $first = false;
        </ul>
 
        <div class="newsfeed_buttons">
-               <div>Follow the GTK+ project on:</div>
+               <div>Follow the GTK project on:</div>
                <span>
                        <a href="http://twitter.com/GTKtoolkit"; title="Follow GTKtoolkit on 
Twitter">Twitter</a> |
                        <a href="http://identi.ca/gtktoolkit"; title="Follow GTKtoolkit on 
identi.ca">identi.ca</a> |
@@ -186,25 +186,25 @@ $first = false;
 
 </div>
 
-<h2 id="WhatIsGTK"><a name="WhatIsGTK">What is GTK+, and how can I use it?</a></h2>
+<h2 id="WhatIsGTK"><a name="WhatIsGTK">What is GTK, and how can I use it?</a></h2>
 
-<p><span id="intro">GTK+</span>, or the GIMP Toolkit, is a multi-platform toolkit for creating graphical 
user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off 
tools to complete application suites.</p>
+<p><span id="intro">GTK</span>, or the GIMP Toolkit, is a multi-platform toolkit for creating graphical user 
interfaces. Offering a complete set of widgets, GTK is suitable for projects ranging from small one-off tools 
to complete application suites.</p>
 
 <dl>
        <dt id="WhereCanIUseIt">Where can I use it?</dt>
-       <dd>Everywhere! GTK+ is cross-platform and boasts an easy to use API, speeding up your development 
time. Take a look at the <a href="screenshots/">screenshots</a> to see a number of platforms GTK+ will 
run.</dd>
+       <dd>Everywhere! GTK is cross-platform and boasts an easy to use API, speeding up your development 
time. Take a look at the <a href="screenshots/">screenshots</a> to see a number of platforms GTK will 
run.</dd>
 
        <dt id="WhatLanguages">What languages are supported?</dt>
-       <dd>GTK+ is written in C but has been designed from the ground up to support a <a 
href="language-bindings.php">wide range of languages</a>, not only C/C++. Using GTK+ from languages such as 
Perl and Python (especially in combination with the <a href="http://glade.gnome.org/"; class="external">Glade 
GUI builder</a>) provides an effective method of rapid application development.</dd>
+       <dd>GTK is written in C but has been designed from the ground up to support a <a 
href="language-bindings.php">wide range of languages</a>, not only C/C++. Using GTK from languages such as 
Perl and Python (especially in combination with the <a href="http://glade.gnome.org/"; class="external">Glade 
GUI builder</a>) provides an effective method of rapid application development.</dd>
 
        <dt id="AreThereRestrictions">Are there any licensing restrictions?</dt>
-       <dd>GTK+ is free software and part of the GNU Project. However, the licensing terms for GTK+, the <a 
href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"; class="external">GNU LGPL</a>, allow it to be 
used by all developers, including those developing proprietary software, without any license fees or 
royalties.</dd>
+       <dd>GTK is free software and part of the GNU Project. However, the licensing terms for GTK, the <a 
href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"; class="external">GNU LGPL</a>, allow it to be 
used by all developers, including those developing proprietary software, without any license fees or 
royalties.</dd>
 </dl>
 
-<p>Get an <a href="overview.php">overview</a> of GTK+. Understand who started it, the basic architecture and 
why we use the license we do.</p>
+<p>Get an <a href="overview.php">overview</a> of GTK. Understand who started it, the basic architecture and 
why we use the license we do.</p>
 
-<p>GTK+ has been involved in many <a href="http://www.gtk-apps.org/"; class="external">projects</a> and some 
big platforms. To get a glimpse of what people think of GTK+ and how it has been used in commercial projects, 
<a href="commerce.php">read the success stories...</a></p>
+<p>GTK has been involved in many <a href="http://www.gtk-apps.org/"; class="external">projects</a> and some 
big platforms. To get a glimpse of what people think of GTK and how it has been used in commercial projects, 
<a href="commerce.php">read the success stories...</a></p>
 
-<p>To find out how more about what GTK+ can do for you, visit our <a href="features.php">features</a> page. 
If you want to <a href="development.php#Contributing">contribute</a>, you are more than welcome.</p>
+<p>To find out how more about what GTK can do for you, visit our <a href="features.php">features</a> page. 
If you want to <a href="development.php#Contributing">contribute</a>, you are more than welcome.</p>
 
 <?php require 'template.php';
diff --git a/index.php b/index.php
index c0ef37e..1756b05 100644
--- a/index.php
+++ b/index.php
@@ -35,7 +35,7 @@ $first = false;
 } ?>
        </ul>
        <div class="newsfeed_buttons">
-               <div>Follow the GTK+ project on:</div>
+               <div>Follow the GTK project on:</div>
                <span>
                         <a href="https://blog.gtk.org"; title="Follow the GTK blog">blog</a> |
                        <a href="https://twitter.com/GTKtoolkit"; title="Follow GTKtoolkit on 
Twitter">Twitter</a> |
@@ -46,25 +46,25 @@ $first = false;
 
 </div>
 
-<h2 id="WhatIsGTK"><a name="WhatIsGTK">What is GTK+, and how can I use it?</a></h2>
+<h2 id="WhatIsGTK"><a name="WhatIsGTK">What is GTK, and how can I use it?</a></h2>
 
-<p><span id="intro">GTK+</span>, or the GIMP Toolkit, is a multi-platform toolkit for creating graphical 
user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off 
tools to complete application suites.</p>
+<p><span id="intro">GTK</span>, or the GIMP Toolkit, is a multi-platform toolkit for creating graphical user 
interfaces. Offering a complete set of widgets, GTK is suitable for projects ranging from small one-off tools 
to complete application suites.</p>
 
 <dl>
        <dt id="WhereCanIUseIt">Where can I use it?</dt>
-       <dd>Everywhere! GTK+ is cross-platform and boasts an easy to use API, speeding up your development 
time. Take a look at the <a href="screenshots/">screenshots</a> to see a number of platforms GTK+ will 
run.</dd>
+       <dd>Everywhere! GTK is cross-platform and boasts an easy to use API, speeding up your development 
time. Take a look at the <a href="screenshots/">screenshots</a> to see a number of platforms GTK will 
run.</dd>
 
        <dt id="WhatLanguages">What languages are supported?</dt>
-       <dd>GTK+ is written in C but has been designed from the ground up to support a <a 
href="language-bindings.php">wide range of languages</a>, not only C/C++. Using GTK+ from languages such as 
Perl and Python (especially in combination with the <a href="http://glade.gnome.org/"; class="external">Glade 
GUI builder</a>) provides an effective method of rapid application development.</dd>
+       <dd>GTK is written in C but has been designed from the ground up to support a <a 
href="language-bindings.php">wide range of languages</a>, not only C/C++. Using GTK from languages such as 
Perl and Python (especially in combination with the <a href="http://glade.gnome.org/"; class="external">Glade 
GUI builder</a>) provides an effective method of rapid application development.</dd>
 
        <dt id="AreThereRestrictions">Are there any licensing restrictions?</dt>
-       <dd>GTK+ is free software and part of the <a href="http://www.gnu.org/"; class="external">GNU 
Project</a>. However, the licensing terms for GTK+, the <a 
href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"; class="external">GNU LGPL</a>, allow it to be 
used by all developers, including those developing proprietary software, without any license fees or 
royalties.</dd>
+       <dd>GTK is free software and part of the <a href="http://www.gnu.org/"; class="external">GNU 
Project</a>. However, the licensing terms for GTK, the <a 
href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"; class="external">GNU LGPL</a>, allow it to be 
used by all developers, including those developing proprietary software, without any license fees or 
royalties.</dd>
 </dl>
 
-<p>Get an <a href="overview.php">overview</a> of GTK+. Understand who started it, the basic architecture and 
why we use the license we do.</p>
+<p>Get an <a href="overview.php">overview</a> of GTK. Understand who started it, the basic architecture and 
why we use the license we do.</p>
 
-<p>GTK+ has been involved in many <a href="http://www.gtk-apps.org/"; class="external">projects</a> and some 
big platforms. To get a glimpse of what people think of GTK+ and how it has been used in commercial projects, 
<a href="commerce.php">read the success stories...</a></p>
+<p>GTK has been involved in many <a href="http://www.gtk-apps.org/"; class="external">projects</a> and some 
big platforms. To get a glimpse of what people think of GTK and how it has been used in commercial projects, 
<a href="commerce.php">read the success stories...</a></p>
 
-<p>To find out how more about what GTK+ can do for you, visit our <a href="features.php">features</a> page. 
If you want to <a href="development.php#Contributing">contribute</a>, you are more than welcome.</p>
+<p>To find out how more about what GTK can do for you, visit our <a href="features.php">features</a> page. 
If you want to <a href="development.php#Contributing">contribute</a>, you are more than welcome.</p>
 
 <?php require 'template.php';
diff --git a/language-bindings.php b/language-bindings.php
index 521c9f5..f378e7a 100644
--- a/language-bindings.php
+++ b/language-bindings.php
@@ -1,6 +1,6 @@
 <?php
 $nav = "features";
-$title = "GTK+ Language Bindings";
+$title = "GTK Language Bindings";
 ob_start();
 
 // Keep these values unique
@@ -24,7 +24,7 @@ define("UNKNOWN", 4, true);
  */
 
 // Versions of GTK used in the table
-$versions = array('GTK+ 2', 'GTK+ 3');
+$versions = array('GTK 2', 'GTK 3');
 
 // Array of languages and their support
 $bindings = array(
@@ -37,8 +37,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://libre.adacore.com/libre/tools/gtkada/',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => PARTIAL
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => PARTIAL
                )
        ),
 
@@ -46,8 +46,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://www.mono-project.com/GtkSharp',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => UNSUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => UNSUPPORTED
                )
        ),
 
@@ -55,8 +55,8 @@ $bindings = array(
                'official' => true, // Whether this binding is an official GNOME binding
                'url' => 'http://www.gtkmm.org/', // Link to this page
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -64,8 +64,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://gtkd.org/',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -73,8 +73,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://github.com/jerryd/gtk-fortran/wiki',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => PARTIAL
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => PARTIAL
                )
        ),
 
@@ -82,26 +82,26 @@ $bindings = array(
                'official' => false,
                'url' => 'http://www.freebasic-portal.de/downloads/ressourcencompiler/gtktobac2-2-0-131.html',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
-       "Go (GTK+ 2)" => array(
+       "Go (GTK 2)" => array(
                'official' => false,
                'url' => 'http://mattn.github.com/go-gtk/',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => UNSUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => UNSUPPORTED
                 )
         ),
 
-       "Go (GTK+ 3)" => array(
+       "Go (GTK 3)" => array(
                'official' => false,
                'url' => 'https://github.com/conformal/gotk3',
                'support' => array(
-                       'GTK+ 2' => UNSUPPORTED,
-                       'GTK+ 3' => PARTIAL
+                       'GTK 2' => UNSUPPORTED,
+                       'GTK 3' => PARTIAL
                )
        ),
 
@@ -109,8 +109,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://www.gnu.org/software/guile-gnome/',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => UNSUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => UNSUPPORTED
                )
        ),
 
@@ -118,8 +118,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://projects.haskell.org/gtk2hs/documentation/',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -127,8 +127,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://java-gnome.sourceforge.net/',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -136,8 +136,8 @@ $bindings = array(
                'official' => true,
                'url' => 'https://wiki.gnome.org/JavaScript',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -145,8 +145,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://github.com/pavouk/lgi',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -154,8 +154,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => UNSUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => UNSUPPORTED
                )
        ),
 
@@ -163,8 +163,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://wiki.lazarus.freepascal.org/GTK2_Interface',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -172,8 +172,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://gtk2-perl.sourceforge.net/',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -181,8 +181,8 @@ $bindings = array(
                'official' => true,
                'url' => 'https://wiki.gnome.org/Projects/PyGObject',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -190,8 +190,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://gtk.php.net/',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => UNSUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => UNSUPPORTED
                )
        ),
 
@@ -199,8 +199,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://cran.r-project.org/web/packages/RGtk2/index.html',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => UNSUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => UNSUPPORTED
                )
        ),
 
@@ -208,8 +208,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://ruby-gnome2.sourceforge.jp/',
                'support' => array(
-                       'GTK+ 2' => PARTIAL,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => PARTIAL,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -217,8 +217,8 @@ $bindings = array(
                'official' => false,
                'url' => 'http://gtk-rs.org/',
                'support' => array(
-                       'GTK+ 2' => UNSUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => UNSUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        ),
 
@@ -226,8 +226,8 @@ $bindings = array(
                'official' => true,
                'url' => 'https://wiki.gnome.org/Projects/Vala',
                'support' => array(
-                       'GTK+ 2' => SUPPORTED,
-                       'GTK+ 3' => SUPPORTED
+                       'GTK 2' => SUPPORTED,
+                       'GTK 3' => SUPPORTED
                )
        )
 );
@@ -259,7 +259,7 @@ if(isset($_GET['json'])) {
 
 ?>
 <h2><a name="LanguageBindings">Language Bindings</a></h2>
-<p>Language Bindings (or 'wrappers') allow GTK+ to be used from other programming languages, in the style of 
those languages. They are relatively easy to create because GTK+ is designed with them in mind.</p>
+<p>Language Bindings (or 'wrappers') allow GTK to be used from other programming languages, in the style of 
those languages. They are relatively easy to create because GTK is designed with them in mind.</p>
 
 <p>The official GNOME bindings follow the GNOME release schedule which guarantees API stability and 
time-based releases.</p>
 
diff --git a/mailing-lists.php b/mailing-lists.php
index 06cd9e6..b10eb90 100644
--- a/mailing-lists.php
+++ b/mailing-lists.php
@@ -1,38 +1,38 @@
 <?php
 $nav = "development";
-$title = "GTK+ Mailing Lists";
+$title = "GTK Mailing Lists";
 ob_start();
 ?>
 <h2><a name="MailingLists">Mailing Lists</a></h2>
 
-<p>There are several GTK+ mailing lists. With ALL of these mailing lists, if you want to subscribe, all you 
need to do is to go to the subscribe url for each mailing list or visit the list information page detailed 
below:</p>
+<p>There are several GTK mailing lists. With ALL of these mailing lists, if you want to subscribe, all you 
need to do is to go to the subscribe url for each mailing list or visit the list information page detailed 
below:</p>
 <p>For information on how to use the mailing lists, see the <a href="http://mail.gnome.org/"; 
class="external">mailing list FAQ</a>.</p>
 
 <h3>gtk-list gnome org</h3>
-<p>This is the main mailing list and probably the one on which you should ask questions about GTK+.</p>
-<p>This list is for general topics related to GTK+, including everything from discussion of proposed new 
features to questions about compiling GTK+.</p>
+<p>This is the main mailing list and probably the one on which you should ask questions about GTK.</p>
+<p>This list is for general topics related to GTK, including everything from discussion of proposed new 
features to questions about compiling GTK.</p>
 <p>Mailing list: <a href="mailto:gtk-list-request gnome org?subject=subscribe" class="email">Subscribe</a>, 
<a href="http://mail.gnome.org/mailman/listinfo/gtk-list"; class="info">Information</a>, <a 
href="http://mail.gnome.org/archives/gtk-list/"; class="archives">Archives</a></p>
 
 <h3>gtk-app-devel-list gnome org</h3>
-<p>Discussion on this list is oriented toward developing applications with GTK+. This has been a lower 
traffic list which is good for asking simple GTK+ questions.</p>
+<p>Discussion on this list is oriented toward developing applications with GTK. This has been a lower 
traffic list which is good for asking simple GTK questions.</p>
 <p>Mailing list: <a href="mailto:gtk-app-devel-list-request gnome org?subject=subscribe" 
class="email">Subscribe</a>, <a href="http://mail.gnome.org/mailman/listinfo/gtk-app-devel-list"; 
class="info">Information</a>, <a href="http://mail.gnome.org/archives/gtk-app-devel-list/"; 
class="archives">Archives</a></p>
 
 <h3>gtk-devel-list gnome org</h3>
-<p>This list is for developers of the <strong>core</strong> GTK+ library to discuss GTK+ implementation. 
GTK+ application development and general GTK+ questions should <strong>not</strong> be asked on this list. 
The gtk-app-devel-list mailing list is more appropriate for that.</p>
+<p>This list is for developers of the <strong>core</strong> GTK library to discuss GTK implementation. GTK 
application development and general GTK questions should <strong>not</strong> be asked on this list. The 
gtk-app-devel-list mailing list is more appropriate for that.</p>
 <p>Bug reports and requests for new features should generally be entered in <a 
href="https://gitlab.gnome.org/GNOME/gtk"; class="external">GitLab</a> instead of sent to this list.</p>
 <p>Mailing list: <a href="mailto:gtk-devel-list-request gnome org?subject=subscribe" 
class="email">Subscribe</a>, <a href="http://mail.gnome.org/mailman/listinfo/gtk-devel-list"; 
class="info">Information</a>, <a href="http://mail.gnome.org/archives/gtk-devel-list/"; 
class="archives">Archives</a></p>
 
 <h3>gtk-doc-list gnome org</h3>
-<p>This list is for discussion of the development of the gtk-doc documentation tool. Discussion about 
improving the GTK+ documentation itself belongs on gtk-devel-list.</p>
+<p>This list is for discussion of the development of the gtk-doc documentation tool. Discussion about 
improving the GTK documentation itself belongs on gtk-devel-list.</p>
 <p>Specific suggestions for the documentation should be put in <a href="http://bugzilla.gnome.org"; 
class="external">Bugzilla</a>.</p>
 <p>Mailing list: <a href="mailto:gtk-doc-list-request gnome org?subject=subscribe" 
class="email">Subscribe</a>, <a href="http://mail.gnome.org/mailman/listinfo/gtk-doc-list"; 
class="info">Information</a>, <a href="http://mail.gnome.org/archives/gtk-doc-list/"; 
class="archives">Archives</a></p>
 
 <h3>gtk-i18n-list gnome org</h3>
-<p>This list is intended for discussion of the internationalization and localization of GTK+ itself and of 
GTK+ applications.</p>
+<p>This list is intended for discussion of the internationalization and localization of GTK itself and of 
GTK applications.</p>
 <p>Mailing list: <a href="mailto:gtk-i18n-list-request gnome org?subject=subscribe" 
class="email">Subscribe</a>, <a href="http://mail.gnome.org/mailman/listinfo/gtk-i18n-list"; 
class="info">Information</a>, <a href="http://mail.gnome.org/archives/gtk-i18n-list/"; 
class="archives">Archives</a></p>
 
 <h3>gtk-perl-list gnome org</h3> 
-<p>This list is intended for discussion of the usage of GTK+
+<p>This list is intended for discussion of the usage of GTK
 with Perl.</p>
 <p>Mailing list: <a href="mailto:gtk-perl-list-request gnome org?subject=subscribe" 
class="email">Subscribe</a>, <a href="http://mail.gnome.org/mailman/listinfo/gtk-perl-list"; 
class="info">Information</a>, <a href="http://mail.gnome.org/archives/gtk-perl-list/"; 
class="archives">Archives</a></p>
 
diff --git a/overview.php b/overview.php
index 20b2706..44784ac 100644
--- a/overview.php
+++ b/overview.php
@@ -1,23 +1,23 @@
 <?php
 $nav = "about";
-$title = "GTK+ Overview";
+$title = "GTK Overview";
 ob_start();
 ?>
 
-<h2>Overview of GTK+ and its Libraries</h2>
+<h2>Overview of GTK and its Libraries</h2>
 
-<img src="/images/architecture.png" class="diagram" alt="GTK+ has grown over time, and with it, has brought 
different libraries including Pango (text layout), Cairo (graphics rendering), GDK (platform abstraction), 
ATK (accessibility), GIO (file input/output), and GLib (core library)." title="GTK+ Architecture" />
+<img src="/images/architecture.png" class="diagram" alt="GTK has grown over time, and with it, has brought 
different libraries including Pango (text layout), Cairo (graphics rendering), GDK (platform abstraction), 
ATK (accessibility), GIO (file input/output), and GLib (core library)." title="GTK Architecture" />
 
 <div class="columns">
 
        <div class="left">
 
                <h2>Architecture</h2>
-               <p>Over time GTK+ has been built up to be based on four libraries, also developed by the GTK+ 
team:</p>
+               <p>Over time GTK has been built up to be based on four libraries, also developed by the GTK 
team:</p>
 
                <ul class="librarieslist">
-                       <li class="glib"><a href="https://developer.gnome.org/glib/"; 
class="external">GLib</a>, a low-level core library that forms the basis of GTK+. It provides data structure 
handling for C, portability wrappers and interfaces for such run-time functionality as an event loop, 
threads, dynamic loading and an object system.</li>
-                       <li class="pango"><a href="http://www.pango.org"; class="external">Pango</a>, a 
library for layout and rendering of text with an emphasis on internationalization. It forms the core of text 
and font handling for GTK+.</li>
+                       <li class="glib"><a href="https://developer.gnome.org/glib/"; 
class="external">GLib</a>, a low-level core library that forms the basis of GTK. It provides data structure 
handling for C, portability wrappers and interfaces for such run-time functionality as an event loop, 
threads, dynamic loading and an object system.</li>
+                       <li class="pango"><a href="http://www.pango.org"; class="external">Pango</a>, a 
library for layout and rendering of text with an emphasis on internationalization. It forms the core of text 
and font handling for GTK.</li>
                        <li class="cairo"><a href="http://www.cairographics.org/"; class="external">Cairo</a>, 
a library for 2D graphics with support for multiple output devices (including the X Window System, Win32) 
while producing a consistent output on all media while taking advantage of display hardware acceleration when 
available.</li>
                        <li class="atk"><a href="https://developer.gnome.org/atk/"; class="external">ATK</a>, 
a library for a set of interfaces providing accessibility. By supporting the ATK interfaces, an application 
or toolkit can be used with tools such as screen readers, magnifiers, and alternative input devices.</li>
                </ul>
@@ -27,18 +27,18 @@ ob_start();
        <div class="right">
 
                <h2>Creation</h2>
-               <p>GTK+ was initially developed for and used by the GIMP, the GNU Image Manipulation Program. 
It is called the "The GIMP ToolKit" so that the origins of the project are remembered. Today it is more 
commonly known as GTK+ for short and is used by a large number of applications including the GNU project's 
GNOME desktop.</p>
+               <p>GTK was initially developed for and used by the GIMP, the GNU Image Manipulation Program. 
It is called the "The GIMP ToolKit" so that the origins of the project are remembered. Today it is more 
commonly known as GTK for short and is used by a large number of applications including the GNU project's 
GNOME desktop.</p>
 
-               <p>Peter Mattis started it all, with help from Spencer Kimball and Josh Macdonald. Marius 
Vollmer taught us how to make GTK+ work for language bindings. Lars Hamann and Stefan Jeske added all sorts 
of features to the core widgets. Carsten Haitzler designed and did the first implementation of theme support. 
Shawn Amundson did release management for GTK+ 1.0 and GTK+ 1.2.</p>
+               <p>Peter Mattis started it all, with help from Spencer Kimball and Josh Macdonald. Marius 
Vollmer taught us how to make GTK work for language bindings. Lars Hamann and Stefan Jeske added all sorts of 
features to the core widgets. Carsten Haitzler designed and did the first implementation of theme support. 
Shawn Amundson did release management for GTK 1.0 and GTK 1.2.</p>
 
                <h2>License</h2>
-               <p>GTK+ is free software and part of the GNU Project. However, the licensing terms for GTK+, 
the GNU LGPL 2.1, allow it to be used by all developers, including those developing proprietary software, 
without any license fees or royalties.</p>
+               <p>GTK is free software and part of the GNU Project. However, the licensing terms for GTK, 
the GNU LGPL 2.1, allow it to be used by all developers, including those developing proprietary software, 
without any license fees or royalties.</p>
 
                <h2>Languages</h2>
-               <p>GTK+ has been designed from the ground up to support a range of <a 
href="language-bindings.php">languages</a>, not only C/C++. Using GTK+ from languages such as Perl and Python 
(especially in combination with the Glade GUI builder) provides an effective method of rapid application 
development.</p>
+               <p>GTK has been designed from the ground up to support a range of <a 
href="language-bindings.php">languages</a>, not only C/C++. Using GTK from languages such as Perl and Python 
(especially in combination with the Glade GUI builder) provides an effective method of rapid application 
development.</p>
 
                <h2>Community</h2>
-               <p>GTK+ has a large development community, as can be seen by the lists of contributors in 
GTK+ release announcements. While there are people that can be identified as responsible for one piece of 
code or the other, there are also <a href="development.php#Team">core developers</a> who are always working 
on the toolkit.</p>
+               <p>GTK has a large development community, as can be seen by the lists of contributors in GTK 
release announcements. While there are people that can be identified as responsible for one piece of code or 
the other, there are also <a href="development.php#Team">core developers</a> who are always working on the 
toolkit.</p>
 
        </div>
        
diff --git a/screenshots/index.php b/screenshots/index.php
index 5e62667..495ffc2 100644
--- a/screenshots/index.php
+++ b/screenshots/index.php
@@ -1,10 +1,10 @@
 <?php
 $nav = "screenshots";
-$title = "GTK+ Screenshots";
+$title = "GTK Screenshots";
 ob_start();
 ?>
 <h2><a name="RunsEverywhere">Runs everywhere!</a></h2>
-<p>Below are screenshots showing applications using GTK+ running on Windows, GNU/Linux and Unix, OSX, and 
mobile devices.</p>
+<p>Below are screenshots showing applications using GTK running on Windows, GNU/Linux and Unix, OSX, and 
mobile devices.</p>
 
 <div class="gallery">
        <ul>
@@ -84,6 +84,6 @@ ob_start();
 </div>
 
 <h2><a name="OlderScreenshots">Older Screenshots</a></h2>
-<p>For older images of GTK+, visit the <a href="museum.php">screenshots museum</a>.</p>
+<p>For older images of GTK, visit the <a href="museum.php">screenshots museum</a>.</p>
 
 <?php require '../template.php';
diff --git a/screenshots/museum.php b/screenshots/museum.php
index 003efb3..ab20ba7 100644
--- a/screenshots/museum.php
+++ b/screenshots/museum.php
@@ -1,23 +1,23 @@
 <?php
 $nav = "screenshots";
-$title = "GTK+ Screenshots Museum";
+$title = "GTK Screenshots Museum";
 ob_start();
 ?>
 <h2><a name="ScreenshotsMuseum">Screenshots Museum</a></h2>
-<p>BeOS has been discontinued, so these screenshots show GTK+ when BeOS was still in active development.</p>
+<p>BeOS has been discontinued, so these screenshots show GTK when BeOS was still in active development.</p>
 
 <div class="gallery">
        <ul>
                <li>
                        <div class="figure"><!-- figcaption -->
                                <a href="../images/screenshots/screenshot-beos.png" class="image"><img 
src="../images/screenshots/thumbnail-beos.png" alt="[Screenshot]" /></a>
-                               <div class="caption"><!-- figcaption -->GTK+ on BeOS</div>
+                               <div class="caption"><!-- figcaption -->GTK on BeOS</div>
                        </div>
                </li>
                <li>
                        <div class="figure"><!-- figcaption -->
                                <a href="../images/screenshots/screenshot-dfb-alpha.png" class="image"><img 
src="../images/screenshots/thumbnail-dfb-alpha.png" alt="[Screenshot]"/></a>
-                               <div class="caption"><!-- figcaption -->GTK+ using DirectFB</div>
+                               <div class="caption"><!-- figcaption -->GTK using DirectFB</div>
                        </div>
                </li>
        </ul>
diff --git a/support.php b/support.php
index c378877..4a9b89c 100644
--- a/support.php
+++ b/support.php
@@ -1,6 +1,6 @@
 <?php
 $nav = "support";
-$title = "GTK+ Support";
+$title = "GTK Support";
 ob_start();
 ?>
 <div class="sidebar">
@@ -8,16 +8,16 @@ ob_start();
        <p>For information about frequently asked questions, please <a 
href="https://developer.gnome.org/gtk3/stable/gtk-question-index.html"; class="external">visit the FAQ</a>.</p>
 
        <h2><a name="Documentation">Documentation</a></h2>
-       <p>Visit our <a href="/documentation.php">documentation</a> page for books, tutorials, articles and 
presentations about GTK+.</p>
+       <p>Visit our <a href="/documentation.php">documentation</a> page for books, tutorials, articles and 
presentations about GTK.</p>
 
        <h2><a name="GetInvolved">Get Involved</a></h2>
        <p>For support and details about how to get involved, see our <a 
href="/development.php">development</a> page.</p>
 </div>
 
 <h2><a name="GetSupportFor">Get Assistance</a></h2>
-<p>GTK+ is supported by a number of businesses and they provide services, experience and skills to help the 
large community of GTK+ users produce innovative customer solutions in multiple industries and devices (like 
mobile and embedded).</p>
+<p>GTK is supported by a number of businesses and they provide services, experience and skills to help the 
large community of GTK users produce innovative customer solutions in multiple industries and devices (like 
mobile and embedded).</p>
 
-<p>Consultancy partners which support GTK+ offer a range of business services including:</p>
+<p>Consultancy partners which support GTK offer a range of business services including:</p>
 <ul>
        <li><a href="#Consultation">Consultation</a></li>
        <li><a href="#HardwareIntegration">Hardware integration</a></li>
@@ -76,21 +76,21 @@ $r = array_random_assoc($businesses, sizeof($businesses));
 </table>
 
 <h3><a name="Consultation">Consultation</a></h3>
-<p>Perhaps your business is looking for consultancy around using GTK+. If this is what you&apos;re looking 
for, our consultancy partners affilliated with GTK+ can offer these services. This can range from 
development, to support, to even queries about licensing and how to integrate the toolkit into your existing 
solutions and much more!</p>
+<p>Perhaps your business is looking for consultancy around using GTK. If this is what you&apos;re looking 
for, our consultancy partners affilliated with GTK can offer these services. This can range from development, 
to support, to even queries about licensing and how to integrate the toolkit into your existing solutions and 
much more!</p>
 
 <h3><a name="HardwareIntegration">Hardware Integration</a></h3>
-<p>With changes happening all the time in hardware, GTK+ is constantly adapting to the requests for newer 
and richer user interface features. One great example of those is Multi-Touch support. Businesses invested in 
GTK+ have been at the forefront of implementing this hardware support and working with other projects up and 
down the Linux stack to make that happen (such as Xorg).</p>
+<p>With changes happening all the time in hardware, GTK is constantly adapting to the requests for newer and 
richer user interface features. One great example of those is Multi-Touch support. Businesses invested in GTK 
have been at the forefront of implementing this hardware support and working with other projects up and down 
the Linux stack to make that happen (such as Xorg).</p>
 
 <h3><a name="Porting">Porting</a></h3>
-<p>Porting can cover a range of areas. Businesses supporting GTK+ offer porting applications to GTK+ from 
other toolkits and also porting areas of the toolkit to specific platforms (for example, Windows 64bit 
support).</p>
+<p>Porting can cover a range of areas. Businesses supporting GTK offer porting applications to GTK from 
other toolkits and also porting areas of the toolkit to specific platforms (for example, Windows 64bit 
support).</p>
 
 <h3><a name="ApplicationDevelopment">Application Development</a></h3>
-<p>Should you need application development for your solution to be deliverable cross platform, GTK+ has all 
the tools you need to do that. Most of the businesses who are involved with GTK+ have decades of experience 
on offer to assist you.</p>
+<p>Should you need application development for your solution to be deliverable cross platform, GTK has all 
the tools you need to do that. Most of the businesses who are involved with GTK have decades of experience on 
offer to assist you.</p>
 
 <h3><a name="BackFolding">Patch Set Back-Folding</a></h3>
-<p>It&apos;s not uncommon for companies to start forking a project to customize it and perhaps to keep it 
in-house. This can lead to wanting new features from an upstream project like GTK+ being available in your 
forked version. If you need help back-folding patch sets into upstream GTK+ or suggesting new features into 
the main stream, we have a support network that can help you do that.</p>
+<p>It&apos;s not uncommon for companies to start forking a project to customize it and perhaps to keep it 
in-house. This can lead to wanting new features from an upstream project like GTK being available in your 
forked version. If you need help back-folding patch sets into upstream GTK or suggesting new features into 
the main stream, we have a support network that can help you do that.</p>
 
 <h3><a name="Training">Training</a></h3>
-<p>There are various training opportunities on offer. Everything from writing an application with GTK+ to 
developing and customizing GTK+. If this is what you&apos;re looking for, there are businesses out there that 
can help you do that.</p>
+<p>There are various training opportunities on offer. Everything from writing an application with GTK to 
developing and customizing GTK. If this is what you&apos;re looking for, there are businesses out there that 
can help you do that.</p>
 
 <?php require 'template.php';
diff --git a/template.php b/template.php
index 524a5ae..d6cb7ce 100644
--- a/template.php
+++ b/template.php
@@ -95,13 +95,13 @@ if (!isset($nav)) {
 }
 
 $tmpnav = array(
-       "about" => array( "About", "/", "About GTK+" ),
-       "features" => array( "Features", "/features.php", "Find out what GTK+ can do for you" ),
-       "download" => array( "Download", "/download/index.php", "Download the latest version of GTK+" ),
-       "screenshots" => array( "Screenshots", "/screenshots/index.php", "See applications using GTK+ on 
various platforms" ),
-       "documentation" => array( "Documentation", "/documentation.php", "Read up on documentation about how 
to use GTK+" ),
-       "development" => array( "Development", "/development.php", "Get involved in the development of GTK+" 
),
-       "support" => array( "Support", "/support.php", "Support for GTK+ commercially" )
+       "about" => array( "About", "/", "About GTK" ),
+       "features" => array( "Features", "/features.php", "Find out what GTK can do for you" ),
+       "download" => array( "Download", "/download/index.php", "Download the latest version of GTK" ),
+       "screenshots" => array( "Screenshots", "/screenshots/index.php", "See applications using GTK on 
various platforms" ),
+       "documentation" => array( "Documentation", "/documentation.php", "Read up on documentation about how 
to use GTK" ),
+       "development" => array( "Development", "/development.php", "Get involved in the development of GTK" ),
+       "support" => array( "Support", "/support.php", "Support for GTK commercially" )
 );
 
 
@@ -117,9 +117,9 @@ if (!isset($navlinks)) {
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="en-us" />
-<meta name="author" content="The GTK+ Team" />
-<meta name="description" content="GTK+ is a highly usable, feature rich toolkit for creating graphical user 
interfaces which boasts cross platform compatibility and an easy to use API. GTK+ is licensed under the GNU 
LGPL 2.1 allowing development of both free and proprietary software with GTK+ without any license fees or 
royalties." />
-<meta name="keywords" content="gtk, gtk+, gimp, toolkit, user interface" />
+<meta name="author" content="The GTK Team" />
+<meta name="description" content="GTK is a highly usable, feature rich toolkit for creating graphical user 
interfaces which boasts cross platform compatibility and an easy to use API. GTK is licensed under the GNU 
LGPL 2.1 allowing development of both free and proprietary software with GTK without any license fees or 
royalties." />
+<meta name="keywords" content="gtk, gtk, gimp, gnome, toolkit, user interface" />
 <link href="/css/global.css" rel="stylesheet" type="text/css" />
 <link href="/css/browser.css" rel="stylesheet" type="text/css" />
 <link rel="icon" href="/images/gtk-logo.ico" type="image/x-icon" />
@@ -242,7 +242,7 @@ pre {
 </style>
 <![endif]-->
 
-<title><?php if (!isset($title)) { $title = "The GTK+ Project"; } echo htmlentities($title); ?></title>
+<title><?php if (!isset($title)) { $title = "The GTK Project"; } echo htmlentities($title); ?></title>
 </head>
 
 <body<?php if (isset($bodyclass)) { echo ' class="'.$bodyclass.'"'; } ?>>
@@ -250,7 +250,7 @@ pre {
 <?php if (isset($globalnav)) { ?>
        <div id="globalnav_wrap">
                <div id="globalnav">
-                       <span class="relation">Part of the <a href="../">GTK+ Project</a></span>
+                       <span class="relation">Part of the <a href="../">GTK Project</a></span>
                        <ul><?php foreach( $globalnav as $k => $v ) { ?> 
                                <li<?php if ($k == $nav) echo ' class="current"'; ?>><a href="..<?php echo 
htmlentities($v[1]); ?>"<?php if (isset($v[2])) { echo ' title="'.htmlentities($v[2]).'"'; } ?>><?php echo 
htmlentities($v[0]); ?></a></li><?php } ?> 
                        </ul>
@@ -280,7 +280,7 @@ pre {
 
        <div id="footer">
                <pre style="display: none;"><!-- For Lynx --></pre>
-               <span>Copyright &copy; 2007-2017 The GTK+ Team</span> |
+               <span>Copyright &copy; 2007-2019 The GTK Team</span> |
                <span>Valid <a href="http://validator.w3.org/check?uri=http://<?php echo 
htmlentities("gtk.org".$_SERVER['REQUEST_URI']); 
?>&amp;charset=utf-8&amp;doctype=Inline&amp;group=0">XHTML</a> and <a 
href="http://jigsaw.w3.org/css-validator/validator?uri=<?php echo htmlentities("gtk.org"); 
?>/css/global.css&amp;profile=css21&amp;usermedium=all&amp;warning=1&amp;lang=en">CSS</a></span>
        </div>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]