Merge remote-tracking branch 'origin/master' into pr/pulseaudio_mapping

# Conflicts:
#	src/util/audio_backend.cpp

man/waybar-pulseaudio.5.scd

@@ -40,7 +40,7 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 
 *rotate*: ++
 	typeof: integer ++
-	Positive value to rotate the text label.
+	Positive value to rotate the text label (in 90 degree increments).
 
 *states*: ++
 	typeof: object ++
@@ -97,7 +97,11 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 
 *reverse-scrolling*: ++
 	typeof: bool ++
-	Option to reverse the scroll direction.
+	Option to reverse the scroll direction for touchpads.
+
+*reverse-mouse-scrolling*: ++
+	typeof: bool ++
+	Option to reverse the scroll direction for mice.
 
 *tooltip*: ++
 	typeof: bool ++
@@ -130,6 +134,11 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 	typeof: array ++
 	The actions corresponding to the buttons of the menu.
 
+*expand*: ++
+	typeof: bool ++
+	default: false ++
+	Enables this module to consume all left over space dynamically.
+
 # FORMAT REPLACEMENTS
 
 *{desc}*: Pulseaudio port's description, for bluetooth it'll be the device name.
@@ -172,9 +181,9 @@ to be selected when the corresponding audio device is muted. This applies to *de
 	"format-icons": {
 		"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
 		"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
-		"headphones": "",
-		"handsfree": "",
-		"headset": "",
+		"headphone": "",
+		"hands-free": "󰂑",
+		"headset": "󰂑",
 		"phone": "",
 		"phone-muted": "",
 		"portable": "",