diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 7ce1f78c0..97d70a7db 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2827,29 +2827,29 @@ Other:
 - Multiple unit test improvements (thanks to Sylvain Benner, et2010 and
   Codruț Constantin Gușoi)
 - Various documentation improvements (thanks Aaron Jensen, Aaron Peckham, Aaron
-  Renner, Adam Frey, Adam Kruszewski, Alexander Dalshov, Alexander Eberspächer,
-  Alexander Iljin, Alexander Kjeldaas, Alexandros Kotzias, Andrew Grangaard,
-  Andrew Vit, Andriy Senyshyn, Anton Latukha, Antonio Miranda, Anurag Sharma,
-  Archenoth, Ather Sharif, Artur Juraszek, Benjamin Reynolds, Bernhard Schommer,
-  Billy Wade, bmag, Boris Buliga, Boris Wong, Carl Lange, Chase Adams, Christian
-  Bäuerlein, Cibin Mathew, CL123123, Codruț Constantin Gușoi, Compro-Prasad,
-  cormacc, Daniel Hodson, Daniel Le, Daniel Molina, Darkhan, David Florness,
-  David Parrish, David Vo, davidpham87, Deepu Mohan Puthrote, Dela Anthonio,
-  Diego Alvarez, Diego Berrocal, Dietrich Daroch, Dinesh Bhosale, Dominik
-  Schrempf, Doug Beardsley, dubnde, duianto, eldios, EMayej, Eugene Yaremenko,
-  Evan Klitzke, Evan Niessen-Derry, firemiles, Florian Bruhin, Fuqiao Xue,
-  Gabriel Arrillaga, Garrett Johnson, Grant Shangreaux, Guido Kraemer, Henrique
-  Jung, Henry Hirsch, Henry Marshall, hornuda, Hong Xu, Ivan Fedorov, Ivan
-  Kryvoruchko, J. Patrick Lanigan, Jaremy Creechley, Jason Axelson, Jesse Cooke,
-  Jethro Shuwen Sun, JI Xiang, Jim Deville, Jody Frankowski, Joe Hillenbrand,
-  John Eismeier, John Wood, Jon Tippens, Jonas Strømsodd, Jonathan Arnett,
-  Jonathan Chen, Jonathan Gillett, Josh Greenwood, Joshua Santos, Justin Stone,
-  Kainalu Hagiwara, Kalle Lindqvist, Kechao Cai, Keith Simmons, Keith Wygant,
-  Kenji Miyazaki ,Kevin Ji, Kristoffer Haugsbakk, lawrsp, Leo Joseph Buchignani
-  III, liuchong, Lucius Hu, Luke Winship, Luke Worth, Marco Ieni, Marco
-  Zucconelli, Max Beutelspacher, Max Deineko, Max Nordlund, Maximilian Wolff,
-  Miciah Dashiel Butler Masters, mjkramer, Mikhail Yakutovich, Muneeb Shaikh,
-  Nasser Alshammari, Niko Felger, Nikolai Myllymäki, nikolaiam, Nicolas
+  Renner, Adam Frey, Adam Kruszewski, ahanwadi, Alexander Dalshov, Alexander
+  Eberspächer, Alexander Iljin, Alexander Kjeldaas, Alexandros Kotzias, Andrew
+  Grangaard, Andrew Vit, Andriy Senyshyn, Anton Latukha, Antonio Miranda, Anurag
+  Sharma, Archenoth, Ather Sharif, Artur Juraszek, Benjamin Reynolds, Bernhard
+  Schommer, Billy Wade, bmag, Boris Buliga, Boris Wong, Carl Lange, Chase Adams,
+  Christian Bäuerlein, Cibin Mathew, CL123123, Codruț Constantin Gușoi,
+  Compro-Prasad, cormacc, Daniel Hodson, Daniel Le, Daniel Molina, Darkhan,
+  David Florness, David Parrish, David Vo, davidpham87, Deepu Mohan Puthrote,
+  Dela Anthonio, Diego Alvarez, Diego Berrocal, Dietrich Daroch, Dinesh Bhosale,
+  Dominik Schrempf, Doug Beardsley, dubnde, duianto, eldios, EMayej, Eugene
+  Yaremenko, Evan Klitzke, Evan Niessen-Derry, firemiles, Florian Bruhin, Fuqiao
+  Xue, Gabriel Arrillaga, Garrett Johnson, Grant Shangreaux, Guido Kraemer,
+  Henrique Jung, Henry Hirsch, Henry Marshall, hornuda, Hong Xu, Ivan Fedorov,
+  Ivan Kryvoruchko, J. Patrick Lanigan, Jaremy Creechley, Jason Axelson, Jesse
+  Cooke, Jethro Shuwen Sun, JI Xiang, Jim Deville, Jody Frankowski, Joe
+  Hillenbrand, John Eismeier, John Wood, Jon Tippens, Jonas Strømsodd, Jonathan
+  Arnett, Jonathan Chen, Jonathan Gillett, Josh Greenwood, Joshua Santos, Justin
+  Stone, Kainalu Hagiwara, Kalle Lindqvist, Kechao Cai, Keith Simmons, Keith
+  Wygant, Kenji Miyazaki ,Kevin Ji, Kristoffer Haugsbakk, lawrsp, Leo Joseph
+  Buchignani III, liuchong, Lucius Hu, Luke Winship, Luke Worth, Marco Ieni,
+  Marco Zucconelli, Max Beutelspacher, Max Deineko, Max Nordlund, Maximilian
+  Wolff, Miciah Dashiel Butler Masters, mjkramer, Mikhail Yakutovich, Muneeb
+  Shaikh, Nasser Alshammari, Niko Felger, Nikolai Myllymäki, nikolaiam, Nicolas
   Forgerit, Oguz Serbetci, 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,
@@ -2857,9 +2857,9 @@ Other:
   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, Trey Merkley, tzhao11, Vincent Taing, Vlad Bokov, Vladimir Kochnev, Wieland
-  Hoffmann, Witoslaw Koczewski, Xiang Ji, Yi Liu, Zane Sterling, zer09, Zhige
-  Xin, Serghei Iakovlev)
+  Cichocinski, Trey Merkley, tzhao11, Vincent Taing, Vlad Bokov, Vladimir
+  Kochnev, Wieland Hoffmann, Witoslaw Koczewski, Xiang Ji, Yi Liu, Zane
+  Sterling, zer09, Zhige Xin, Serghei Iakovlev)
 **** Documentation and website
   - Updated DOCUMENTATION.org to fix the example for how to change the separator style
 *** Release notes summarized
diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org
index ea5563f92..6f07158d0 100644
--- a/doc/DOCUMENTATION.org
+++ b/doc/DOCUMENTATION.org
@@ -1802,7 +1802,7 @@ the complete list using layer variables:
 
 ** Workspaces
 Workspaces are sub-layouts, they allow to define multiple layouts into a given
-layout, those layouts share the same buffer as the parent layout.
+layout, those layouts share the same buffers as the parent layout.
 
 The currently active workspace number is displayed before the window number,
 for instance "➊|➍" or "1|4" means the fourth window of the first workspace.