Merge branch 'master' into perso

diff --git a/.bashrc b/.bashrc
index 77178337d2b3d44342af25c276ca9ed42b5288b8..6df39e266815f62d743ef9c9531987bf760fcd60 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -337,6 +337,11 @@ export EDITOR='/usr/bin/nano'
 # Ajouter ~/bin, /sbin et /usr/sbin à son PATH
 PATH=~/bin:$PATH:/sbin:/usr/sbin
 
+
+# +----------+
+# | Sourcing |
+# +----------+
+
 # Chargement des alias
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
@@ -349,6 +354,11 @@ if [ -f ~/.bash_aliases_local ]; then
     . ~/.bash_aliases_local
 fi
 
+
+# +-----+
+# | End |
+# +-----+
+
 # On n'exécute le welcome_message que à ce moment, parce que la customisation
 # locale a pu changer des couleurs
 welcome_message

diff --git a/.ssh/config b/.ssh/config
index ff709e3a403f126efcdcb76bd94177d6b9076a5d..1b76a2d3759749391293893ea669b146e2e30deb 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -342,7 +342,7 @@ Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org
 
 Host ethercalc ethercalc.crans.org
     HostName ethercalc.crans.org
-    User legallic
+    User loginCr@ns
     ForwardAgent yes
 
 Host freebox freebox.crans.org