diff --git a/xwiki/content.md b/xwiki/content.md
index 443fb0ab8..445be1d2b 100644
--- a/xwiki/content.md
+++ b/xwiki/content.md
@@ -216,9 +216,7 @@ Thus all you need to do is to execute the installation instructions above as if
 
 Then you need to stop your running XWiki container. You should keep your DB container running. Then all you have to do is start a new container as described above, using the new XWiki docker image.
 
-Caveats:
-
--	Right now we have an [outstanding issue](https://jira.xwiki.org/browse/XDOCKER-20) and thus if you've had to modify `xwiki.properties` or `xwiki.cfg` inside the XWiki container, you'll need to port your changes inside the new container (see the section below).
+Note that your current XWiki configuration files (`xwiki.cfg`, `xwiki.properties` and `hibernate.cfg.xml`) will be preserved.
 
 # Details for the xwiki image
 
@@ -231,14 +229,14 @@ The first time you create a container out of the xwiki image, a shell script (`/
 -	`DB_DATABASE`: The name of the XWiki database to use/create.
 -	`DB_HOST`: The name of the host (or docker container) containing the database. Default is "db".
 
-If you need to configure XWiki (e.g. modify `xwiki.properties` or `xwiki.cfg`) or perform some additional configuration, you can execute another container and attach to the running XWiki container by issuing:
+The main XWiki configuration files (`xwiki.cfg`, `xwiki.properties` and `hibernate.cfg.xml`) are available in the mapped local directory for the permanent directory on your host.
+
+If you need to perform some advanced configuration, you can execute another container and attach to the running XWiki container by issuing (but note that these won't be saved if you remove the container):
 
 ```console
 docker exec -it <xwiki container id> bash -l
 ```
 
-Note that we plan to [lift this limitation in the future](https://jira.xwiki.org/browse/XDOCKER-20).
-
 ## Passing JVM options
 
 It's possible to pass JVM options to Tomcat by defining the `JAVA_OPTS` environment property.