diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 7e243edf1..62957011f 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2280,18 +2280,18 @@ Other:
   Joshua Santos, Justin Stone, Kainalu Hagiwara, Kalle Lindqvist, Kechao Cai,
   Keith Simmons, Keith Wygant, Kevin Ji, Kristoffer Haugsbakk, lawrsp, Leo
   Joseph Buchignani III, Luke Worth, Marco Ieni, Marco Zucconelli, Max
-  Beutelspacher, Max Nordlund, Maximilian Wolff, Miciah Dashiel Butler Masters,
-  mjkramer, Mikhail Yakutovich, Muneeb Shaikh, Nasser Alshammari, Nasser
-  Alshammari, Niko Felger, Nikolai Myllymäki, nikolaiam, Nicolas Forgerit,
-  Olivier Verdier, Pancho Horrillo, Paul Milla, Paulo Schneider, Pawan Dubey,
-  Paweł Siudak, Phil Pirozhkov, Philippe Bourdages, Piotr Grzesik, Rafi Khan,
-  Rand01ph, rakyi, Raymond Wanyoike, Reverend Homer, Robby O'Connor, Rhommel
-  Lamas, Sam Pablo Kuper, Saulius Menkevičius, sduthil, Sergio Ugalde, Shane
-  Kilkelly, Sid Kapur, Somelauw, Soobin Rho, sorawee, SteveJobzniak, Sunghyun
-  Hwang, Swaroop C H, Sylvain Benner, Szunti, Tim Stewart, timor, TinySong,
-  Titov Andrey, Thomas de Beauchêne, Tomasz Cichocinski, tzhao11, Vincent Taing,
-  Vlad Bokov, Vladimir Kochnev, Wieland Hoffmann, Xiang Ji, Yi Liu, zer09, Zhige
-  Xin, Serghei Iakovlev)
+  Beutelspacher, Max Deineko, Max Nordlund, Maximilian Wolff,
+  Miciah Dashiel Butler Masters, mjkramer, Mikhail Yakutovich, Muneeb Shaikh,
+  Nasser Alshammari, Nasser Alshammari, Niko Felger, Nikolai Myllymäki, nikolaiam,
+  Nicolas Forgerit, Olivier Verdier, Pancho Horrillo, Paul Milla, Paulo Schneider,
+  Pawan Dubey, Paweł Siudak, Phil Pirozhkov, Philippe Bourdages, Piotr Grzesik,
+  Rafi Khan, Rand01ph, rakyi, Raymond Wanyoike, Reverend Homer, Robby O'Connor,
+  Rhommel Lamas, Sam Pablo Kuper, Saulius Menkevičius, sduthil, Sergio Ugalde,
+  Shane Kilkelly, Sid Kapur, Somelauw, Soobin Rho, sorawee, SteveJobzniak,
+  Sunghyun Hwang, Swaroop C H, Sylvain Benner, Szunti, Tim Stewart, timor,
+  TinySong, Titov Andrey, Thomas de Beauchêne, Tomasz Cichocinski, tzhao11,
+  Vincent Taing, Vlad Bokov, Vladimir Kochnev, Wieland Hoffmann, Xiang Ji,
+  Yi Liu, zer09, Zhige Xin, Serghei Iakovlev)
 *** Release notes summarized
   Thanks to: Grant Shangreaux, Songpeng Zu, Igor Almeida, Miciah Dashiel Butler
   Masters, Abhishek(Compro) Prasad, Deepak Khidia, Ward Harris, Jiahao Jiang,
diff --git a/doc/FAQ.org b/doc/FAQ.org
index 8cf6e7664..7905aa53e 100644
--- a/doc/FAQ.org
+++ b/doc/FAQ.org
@@ -151,6 +151,10 @@ in =user-init=, and any variable that Spacemacs explicitly sets but you wish to
 
 Anything that isn’t just setting a variable should 99% be in =user-config=.
 
+Note that at time of writing files supplied as command line arguments to emacs
+will be read before =user-config= is executed.  (Hence to yield consistent
+behaviour, mode hooks should be set in =user-init=.)
+
 ** Why do some of my =org=-related settings cause problems?
 Since version 0.104, spacemacs uses the =org= version from the org ELPA
 repository instead of the one shipped with emacs. Then, any =org= related code