diff --git a/basics.html b/basics.html
index d41475e9db22617f0a94f63685a0b5732739a187..18f14dabc4f7400a13358807b218f79dfbd52f2f 100644
--- a/basics.html
+++ b/basics.html
@@ -446,18 +446,25 @@
             ## git setup #2
 
             ```bash
-            # editor
-            git config --global core.editor emacs
+            # command line editor
+            git config --global core.editor nano
 
-            # WINDOWS ONLY: let git handle line endings
+            # Linux GNOME / KDE
+            git config --global core.editor gedit
+            git config --global core.editor kate
+
+            # Windows
+            git config --global core.editor notepad
             git config --global core.autocrlf true
             ```
 
             notes:
-            - talk about line endings
+            ### line endings
+            - explain the difference: Windows CRLF, everyone else LF, some
+              accept only LF
             - maintainers may reject contributions because of line endings
-            - difference between git config and editor config
-            - you can have fine grained control over this with gitattributes(5)
+            - on Windows, git can do it for you, via `dos2unix`
+            - fine grained control with `man 5 gitattributes`
           </section>
         </section>