aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guide.tex3
-rw-r--r--doc/release_notes_1.1.0.txt10
-rw-r--r--doc/version.tex2
3 files changed, 10 insertions, 5 deletions
diff --git a/doc/guide.tex b/doc/guide.tex
index 12f64fd0e..40bad08b9 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2301,6 +2301,9 @@ figure~\ref{fig:webadmmainru} with figure~\ref{fig:webadmmain})
\subsection{ejabberd 1.0.0}
\verbatiminput{release_notes_1.0.0.txt}
+\subsection{ejabberd 1.1.0}
+\verbatiminput{release_notes_1.1.0.txt}
+
\section{Acknowledgements}
\label{sec:acknowledgements}
diff --git a/doc/release_notes_1.1.0.txt b/doc/release_notes_1.1.0.txt
index 588327ec7..453fcfa3d 100644
--- a/doc/release_notes_1.1.0.txt
+++ b/doc/release_notes_1.1.0.txt
@@ -99,11 +99,13 @@ Migration Notes
References
Contributed tutorials of interest are:
- - Migration from Jabberd1.4 to ejabberd:
- http://ejabberd.jabber.ru/jabberd1-to-ejabberd
- - Migration from Jabberd2 to ejabberd:
- http://ejabberd.jabber.ru/jabberd2-to-ejabberd
+ - Migration from Jabberd1.4, Jabberd2 and WPJabber to ejabberd:
+ http://ejabberd.jabber.ru/migrate-to-ejabberd
- Transport configuration for connecting to other networks:
http://ejabberd.jabber.ru/tutorials-transports
+ - Using ejabberd with MySQL native driver:
+ http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver
+ - Anonymous User Support:
+ http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support
END
diff --git a/doc/version.tex b/doc/version.tex
index a1e8fb162..28dea9cf6 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
% Define ejabberd version here.
-\newcommand{\version}{1.0.0} \ No newline at end of file
+\newcommand{\version}{1.1.0}