From 2ce66e6717c0d2f4b6088f5130640ccb55e79f2d Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Fri, 25 Sep 2015 08:58:16 +0400
Subject: [PATCH 1/3] maj doc

---
 lib/ulib/templates/apacheconfig/README-apacheconfig.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/ulib/templates/apacheconfig/README-apacheconfig.txt b/lib/ulib/templates/apacheconfig/README-apacheconfig.txt
index 69ddb6f..a7f97de 100644
--- a/lib/ulib/templates/apacheconfig/README-apacheconfig.txt
+++ b/lib/ulib/templates/apacheconfig/README-apacheconfig.txt
@@ -44,3 +44,11 @@ optionnels:
   les fichiers RewriteRules*.conf de ce répertoire sont copiés dans /etc/apache2
 
 IMPORTANT: Cette configuration n'est pour le moment supporté que sur debian
+
+## Configuration TLS
+
+Le site https://mozilla.github.io/server-side-tls/ssl-config-generator/ contient
+des informations sur la façon de configurer ssl côté serveur pour la sécurité et
+les navigateurs modernes
+
+Voir les détails sur https://wiki.mozilla.org/Security/Server_Side_TLS

From 552e4ba9811cdd7e5a3f07776d36551f6a09816f Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Sat, 26 Sep 2015 11:51:23 +0400
Subject: [PATCH 2/3] =?UTF-8?q?am=C3=A9liorer=20pxs=20pour=20un=20d=C3=A9p?=
 =?UTF-8?q?=C3=B4t=20en=20mode=20direct?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uproject | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/uproject b/uproject
index 9df4a0a..aab39db 100755
--- a/uproject
+++ b/uproject
@@ -237,9 +237,16 @@ elif array_contains VCS_CMDS "$CMD"; then
 
 elif array_contains GITANNEX_CMDS "$CMD"; then
     function xsync() {
-        local direct
-        is_yes "$(git config --get annex.direct)" && direct=1
-        git annex sync ${direct:+--content}
+        if is_yes "$(git config --get annex.direct)"; then
+            git annex sync    --pull --no-commit --no-push --no-content &&
+            git annex add &&
+            git annex sync --no-pull    --commit --no-push --no-content &&
+            git annex sync --no-pull --no-commit --no-push    --content &&
+            git annex sync --no-pull --no-commit    --push --no-content &&
+            git annex sync
+        else
+            git annex sync
+        fi
     }
     use_ssh_wrapper
     case "$CMD" in

From adf2d195e23e3e06db72ccb41a6a00a758c361aa Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Sat, 26 Sep 2015 11:51:47 +0400
Subject: [PATCH 3/3] Init changelog & version 2.17.0

---
 CHANGES.txt | 5 +++++
 VERSION.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8ea4f3d..6c33b51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+## Version 2.17.0 du 26/09/2015-11:51
+
+552e4ba améliorer pxs pour un dépôt en mode direct
+2ce66e6 maj doc
+
 ## Version 2.16.0 du 10/09/2015-11:16
 
 42aa7ea fonctions e*: changer l'affichage en mode NO_COLOR pour afficher les préfixes complets
diff --git a/VERSION.txt b/VERSION.txt
index 7524906..d76bd2b 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-2.16.0
+2.17.0