From f9ad3686bbedea0ca2adf3bc4ab19c3e90e8800a Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:39:38 +0100
Subject: [PATCH 1/3] suggest setting $LANG to fix #1286 and fix #1823

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c25c20e75..5e1d9b2f1 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -54,6 +54,9 @@ source $ZSH/oh-my-zsh.sh
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
 # # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'

From 04c2d293985adced1bd702fca16357b858002bb8 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:45:55 +0100
Subject: [PATCH 2/3] mention $ZSH_CUSTOM as suggested in #2295

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5e1d9b2f1..48757ba0e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -42,6 +42,9 @@ ZSH_THEME="robbyrussell"
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 6889dfaa46858ddacc82549a57d73118c66a32b6 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:47:10 +0100
Subject: [PATCH 3/3] $ZSH is the OMZ installation folder, not configuration

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 48757ba0e..7b7f1df85 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,4 +1,4 @@
-# Path to your oh-my-zsh configuration.
+# Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.