From 67017a26e9a52050d024f107373b576893caf4e2 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 23 Oct 2018 15:07:09 -0400
Subject: [PATCH] Preparation for release 4.0.4

---
 Documentation/docbook/xsl/sogo-fo.xsl             | 4 ++--
 Documentation/docinfo.xml                         | 6 +++---
 Documentation/includes/global-attributes.asciidoc | 2 +-
 NEWS                                              | 4 ++--
 Version                                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Documentation/docbook/xsl/sogo-fo.xsl b/Documentation/docbook/xsl/sogo-fo.xsl
index e8635b714..c074efffe 100644
--- a/Documentation/docbook/xsl/sogo-fo.xsl
+++ b/Documentation/docbook/xsl/sogo-fo.xsl
@@ -47,11 +47,11 @@
       but we decided to load all sensible local xsd since it only produce a warning on missing imports.
   -->
   <!-- CentOS / RHEL -->
-  <xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl"/>
+  <!-- <xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl"/> -->
   <!-- Debian / Ubuntu -->
   <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl"/>
   <!-- OSX through mac ports -->
-  <xsl:import href="/opt/local/share/xsl/docbook-xsl/fo/docbook.xsl"/>
+  <!-- <xsl:import href="/opt/local/share/xsl/docbook-xsl/fo/docbook.xsl"/> -->
 
   <!-- title page extra styling -->
   <xsl:import href="titlepage-fo.xsl"/>
diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml
index 37607db5d..4479485db 100644
--- a/Documentation/docinfo.xml
+++ b/Documentation/docinfo.xml
@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 4.0.3 - October 2018</releaseinfo>
-<subtitle>for version 4.0.3</subtitle>
-<date>2018-10-17</date>
+<releaseinfo>Version 4.0.4 - October 2018</releaseinfo>
+<subtitle>for version 4.0.4</subtitle>
+<date>2018-10-23</date>
 
 <legalnotice>
   <para>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".</para>
diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc
index 7d5921bb8..c776f11e8 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: 4.0.3
+:release_version: 4.0.4
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
diff --git a/NEWS b/NEWS
index 156989889..4b6f9b76a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,9 @@
-4.X.Y (2018-MM-DD)
+4.0.4 (2018-10-23)
 ------------------
 
 Bug fixes
  - [web] fixed time conflict validation when not the owner
- - [web] fixed freebusy display with default theme
+ - [web] fixed freebusy display with default theme (#4578)
 
 4.0.3 (2018-10-17)
 ------------------
diff --git a/Version b/Version
index 4266719c0..382414954 100644
--- a/Version
+++ b/Version
@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=0
-SUBMINOR_VERSION=3
+SUBMINOR_VERSION=4