From 5dfbfe827dc7d7ebdf0384fd57d041764b9aedea Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 15 Dec 2015 14:24:12 -0500 Subject: [PATCH] Preparation for release 2.3.4 --- Documentation/SOGoInstallationGuide.asciidoc | 10 ++++++---- Documentation/docinfo.xml | 6 +++--- Documentation/includes/global-attributes.asciidoc | 2 +- NEWS | 7 +++---- Version | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc index 6851dad81..d2a6bf5af 100644 --- a/Documentation/SOGoInstallationGuide.asciidoc +++ b/Documentation/SOGoInstallationGuide.asciidoc @@ -1,5 +1,7 @@ Installation and Configuration Guide ==================================== +:toc: left +:icons: font //// @@ -54,7 +56,7 @@ at http://www.sogo.nu/ Architecture and Compatibility ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -image::images/architecture.png[System Architecture] +image::images/architecture.png[System Architecture, 400, 964] Standard protocols such as CalDAV, CardDAV, GroupDAV, HTTP, IMAP and SMTP are used to communicate with the SOGo platform or its @@ -179,7 +181,7 @@ standard distribution. For example, if you are using Red Hat Enterprise Linux 5, you have to be subscribed to the Red Hat Network before continuing with the SOGo software installation. -This document covers the installation of SOGo under RHEL 6. +NOTE: This document covers the installation of SOGo under RHEL 6. For installation instructions on Debian and Ubuntu, please refer directly to the SOGo website at http://www.sogo.nu/. @@ -294,7 +296,7 @@ associated to a domain is limited to access only the users data from the same domain. Consequently, the configuration parameters of SOGo are defined on three levels: -image::images/preferences-hierarchy.png[Preferences Hierarchy] +image::images/preferences-hierarchy.png[Preferences Hierarchy, 400, 400] Each level inherits the preferences of the parent level. Therefore, domain preferences define the defaults values of the user preferences, @@ -1125,7 +1127,7 @@ fax number, one could map it to the _facsimiletelephonenumber_ attribute like this: ---- -mapping = \{ +mapping = {   facsimiletelephonenumber = ("fax", "facsimiletelephonenumber"); }; ---- diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml index 3faa889fe..c0ae790f1 100644 --- a/Documentation/docinfo.xml +++ b/Documentation/docinfo.xml @@ -1,7 +1,7 @@ -Version 2.3.3 - November 2015 -for version 2.3.3 -2015-11-11 +Version 2.3.4 - December 2015 +for version 2.3.4 +2015-12-15 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License". diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc index 275b05fc0..c221bafdd 100644 --- a/Documentation/includes/global-attributes.asciidoc +++ b/Documentation/includes/global-attributes.asciidoc @@ -13,6 +13,6 @@ // TODO have the build system take care of this -:release_version: 2.3.3 +:release_version: 2.3.4 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: diff --git a/NEWS b/NEWS index 42c7063d9..baf40ee35 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,11 @@ -2.3.4 (YYYY-MM-DD) +2.3.4 (2015-12-15) ------------------ New features - - Initial support for EAS calendar exceptions + - initial support for EAS calendar exceptions Enhancements - - limit the maximum width of toolbar buttons - + - limit the maximum width of toolbar buttons (#3381) Bug fixes - JavaScript exception when printing events from calendars with no assigned color (#3203) diff --git a/Version b/Version index 3870a8b64..5ad9a808f 100644 --- a/Version +++ b/Version @@ -4,4 +4,4 @@ MAJOR_VERSION=2 MINOR_VERSION=3 -SUBMINOR_VERSION=3a +SUBMINOR_VERSION=4