1 files changed, 24 insertions, 19 deletions
diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml
index bdb6ca84ee..31ab27628a 100644
--- a/doc/classes/PopupMenu.xml
+++ b/doc/classes/PopupMenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PopupMenu" inherits="Popup" category="Core" version="3.2">
+<class name="PopupMenu" inherits="Popup" version="4.0">
 	<brief_description>
 		PopupMenu displays a list of options.
 	</brief_description>
@@ -334,7 +334,7 @@
 			<return type="bool">
 			</return>
 			<description>
-				Returns whether the popup will be hidden when the window loses focus or not.
+				Returns [code]true[/code] if the popup will be hidden when the window loses focus or not.
 			</description>
 		</method>
 		<method name="is_item_checkable" qualifiers="const">
@@ -391,7 +391,7 @@
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-				Returns whether the shortcut of the specified item [code]idx[/code] is disabled or not.
+				Returns [code]true[/code] if the specified item's shortcut is disabled.
 			</description>
 		</method>
 		<method name="remove_item">
@@ -477,7 +477,7 @@
 			<argument index="1" name="disabled" type="bool">
 			</argument>
 			<description>
-				Sets whether the item at index [code]idx[/code] is disabled or not. When it is disabled, it can't be selected and its action can't be invoked.
+				Enables/disables the item at index [code]idx[/code]. When it is disabled, it can't be selected and its action can't be invoked.
 			</description>
 		</method>
 		<method name="set_item_icon">
@@ -521,6 +521,7 @@
 			<argument index="1" name="state" type="int">
 			</argument>
 			<description>
+				Sets the state of an multistate item. See [method add_multistate_item] for details.
 			</description>
 		</method>
 		<method name="set_item_shortcut">
@@ -595,6 +596,7 @@
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
+				Cycle to the next state of an multistate item. See [method add_multistate_item] for details.
 			</description>
 		</method>
 	</methods>
@@ -643,55 +645,58 @@
 	</constants>
 	<theme_items>
 		<theme_item name="checked" type="Texture">
-			Sets a custom [Texture] icon for [code]checked[/code] state of checkbox items.
+			[Texture] icon for the checked checkbox items.
 		</theme_item>
 		<theme_item name="font" type="Font">
-			Sets a custom [Font].
+			[Font] used for the menu items.
 		</theme_item>
 		<theme_item name="font_color" type="Color" default="Color( 0.88, 0.88, 0.88, 1 )">
-			Sets a custom [Color] for the [Font].
+			The default text [Color] for menu items' names.
 		</theme_item>
 		<theme_item name="font_color_accel" type="Color" default="Color( 0.7, 0.7, 0.7, 0.8 )">
+			The text [Color] used for shortcuts and accelerators that show next to the menu item name when defined. See [method get_item_accelerator] for more info on accelerators.
 		</theme_item>
 		<theme_item name="font_color_disabled" type="Color" default="Color( 0.4, 0.4, 0.4, 0.8 )">
-			Sets a custom [Color] for disabled text.
+			[Color] used for disabled menu items' text.
 		</theme_item>
 		<theme_item name="font_color_hover" type="Color" default="Color( 0.88, 0.88, 0.88, 1 )">
-			Sets a custom [Color] for the hovered text.
+			[Color] used for the hovered text.
 		</theme_item>
 		<theme_item name="hover" type="StyleBox">
-			Sets a custom [StyleBox] when the [PopupMenu] is hovered.
+			[StyleBox] displayed when the [PopupMenu] item is hovered.
 		</theme_item>
 		<theme_item name="hseparation" type="int" default="4">
-			Sets the horizontal space separation between each item.
+			The horizontal space between the item's name and the shortcut text/submenu arrow.
 		</theme_item>
 		<theme_item name="labeled_separator_left" type="StyleBox">
+			[StyleBox] for the left side of labeled separator. See [method add_separator].
 		</theme_item>
 		<theme_item name="labeled_separator_right" type="StyleBox">
+			[StyleBox] for the right side of labeled separator. See [method add_separator].
 		</theme_item>
 		<theme_item name="panel" type="StyleBox">
-			Sets a custom [StyleBox] for the panel of the [PopupMenu].
+			Default [StyleBox] of the [PopupMenu] items.
 		</theme_item>
 		<theme_item name="panel_disabled" type="StyleBox">
-			Sets a custom [StyleBox] for the panel of the [PopupMenu], when the panel is disabled.
+			[StyleBox] used when the [PopupMenu] item is disabled.
 		</theme_item>
 		<theme_item name="radio_checked" type="Texture">
-			Sets a custom [Texture] icon for [code]checked[/code] of radio button items.
+			[Texture] icon for the checked radio button items.
 		</theme_item>
 		<theme_item name="radio_unchecked" type="Texture">
-			Sets a custom [Texture] icon for [code]unchecked[/code] of radio button items.
+			[Texture] icon for the unchecked radio button items.
 		</theme_item>
 		<theme_item name="separator" type="StyleBox">
-			Sets a custom [StyleBox] for separator's.
+			[StyleBox] used for the separators. See [method add_separator].
 		</theme_item>
 		<theme_item name="submenu" type="Texture">
-			Sets a custom [Texture] for submenu's.
+			[Texture] icon for the submenu arrow.
 		</theme_item>
 		<theme_item name="unchecked" type="Texture">
-			Sets a custom [Texture] icon for [code]unchecked[/code] of checkbox items.
+			[Texture] icon for the unchecked checkbox items.
 		</theme_item>
 		<theme_item name="vseparation" type="int" default="4">
-			Sets the vertical space separation between each item.
+			The vertical space between each menu item.
 		</theme_item>
 	</theme_items>
 </class>