- Merged changesets 1399 up to and including 1415 into 1.2 branch
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index c440840..07dfdc2 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
*/
/**
- * @mainpage PolarSSL v1.2.0 source code documentation
+ * @mainpage PolarSSL v1.2.1 source code documentation
*
* This documentation describes the internal structure of PolarSSL. It was
* automatically generated from specially formatted comment blocks in
@@ -21,7 +21,7 @@
*
* @section mainpage_modules Modules
*
- * PolarSSL supports SSLv3 up to TLSv1.1 communication by providing the
+ * PolarSSL supports SSLv3 up to TLSv1.2 communication by providing the
* following:
* - TCP/IP communication functions: listen, connect, accept, read/write.
* - SSL/TLS communication functions: init, handshake, read/write.
diff --git a/doxygen/polarssl.doxyfile b/doxygen/polarssl.doxyfile
index 90fd2a3..008364e 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.doxyfile
@@ -25,7 +25,7 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "PolarSSL v1.2.0"
+PROJECT_NAME = "PolarSSL v1.2.1"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or