From 2f10353156f71432bbc76b79e318372194795588 Mon Sep 17 00:00:00 2001
From: Darko Poljak <foss@ungleich.com>
Date: Wed, 30 Aug 2017 23:11:10 +0200
Subject: [PATCH] Fix configuration bugs.

---
 cdist/exec/remote.py    | 2 +-
 docs/src/man1/cdist.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdist/exec/remote.py b/cdist/exec/remote.py
index 6e1dcefc..237c2a9f 100644
--- a/cdist/exec/remote.py
+++ b/cdist/exec/remote.py
@@ -241,7 +241,7 @@ class Remote(object):
         """
 
         command = [
-            self.configuration.get('CDIST_REMOTE_SHELL', "/bin/sh"),
+            self.configuration.get('remote_shell', "/bin/sh"),
             "-e"
         ]
         command.append(script)
diff --git a/docs/src/man1/cdist.rst b/docs/src/man1/cdist.rst
index 6ffa0f98..b6b2e04d 100644
--- a/docs/src/man1/cdist.rst
+++ b/docs/src/man1/cdist.rst
@@ -565,7 +565,7 @@ cdist/inventory
     This path is relative to cdist installation directory.
 /etc/cdist.cfg
     Global cdist configuration file, if exists.
-~/.cdist/cdist.cfg
+~/.cdist.cfg or $XDG_CONFIG_HOME/cdist/cdist.cfg
     Local cdist configuration file, if exists.
 
 NOTES