diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 898f61ff..21cf91aa 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -208,9 +208,6 @@ this is for compatibility with Openbox.
 
 		- *type* Show view type ("xdg-shell" or "xwayland")
 
-		- *winfo* Show workspace name, *type* "X" or "W"
-		  along with *state* M/m/F (max, min, full)
-
 		- *identifier* Show identifier (app_id for native Wayland
 		  windows and WM_CLASS for XWayland clients)
 
@@ -219,6 +216,14 @@ this is for compatibility with Openbox.
 
 		- *title* Show window title if different to app_id
 
+		- *workspace* Show workspace name
+
+		- *state* Show window state, M/m/F (max/min/full)
+
+		- *type_short* Show view type ("W" or "X")
+
+		- *output* Show output id, if more than one output detected
+
 	*width* defines the width of the field expressed as a percentage of
 	the overall window switcher width. The "%" character is required.
 
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index bb9c66db..65a6ab54 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -64,12 +64,21 @@
   </windowSwitcher>
 
   <!--
-    When using all workspaces option of window switcher, there is a replacement
-    for "type" above called "winfo" that will give more info about the window,
-    workspace name, state of window (min, max, full) and output that it's on 
-    if more than one monitor is being used. 
+    When using all workspaces option of window switcher, there are extra fields
+    that can be used, workspace (variable length), state (single space), 
+    type_short (3 spaces), output (variable length), and can be set up 
+    like this. Note: output only shows if more than one output available.
 
-      <field content="winfo" width="25%" />
+    <windowSwitcher show="yes" preview="no" outlines="no" allWorkspaces="yes">
+      <fields>
+        <field content="workspace" width="5%" />
+        <field content="state" width="3%" />
+        <field content="type_short" width="3%" />
+        <field content="output" width="9%" />
+        <field content="identifier" width="30%" />
+        <field content="title" width="50%" />
+       </fields>  
+    </windowSwitcher>
   -->
 
   <!-- edge strength is in pixels -->