From 68c7da5a35f84fb8da3b7aaf466a5c0dc1618bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Thu, 1 Sep 2016 18:56:48 +0200
Subject: [PATCH] classref: Sync with current source

---
 doc/base/classes.xml | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 56eeaf6aca..ad177267e7 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -6026,7 +6026,7 @@
 			</argument>
 			<argument index="2" name="rect" type="Rect2">
 			</argument>
-			<argument index="3" name="align" type="Vector2" default="Vector2((0, 0))">
+			<argument index="3" name="align" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<argument index="4" name="advance" type="float" default="-1">
 			</argument>
@@ -9318,7 +9318,7 @@
 		<method name="get_cursor_shape" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="Vector2" default="Vector2((0, 0))">
+			<argument index="0" name="pos" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<description>
 				Return the cursor shape at a certain position in the control.
@@ -9517,7 +9517,7 @@
 		<method name="get_tooltip" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="atpos" type="Vector2" default="Vector2((0, 0))">
+			<argument index="0" name="atpos" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<description>
 				Return the tooltip, which will appear when the cursor is resting over this control.
@@ -10161,9 +10161,9 @@
 		<method name="add_point">
 			<argument index="0" name="pos" type="Vector2">
 			</argument>
-			<argument index="1" name="in" type="Vector2" default="Vector2((0, 0))">
+			<argument index="1" name="in" type="Vector2" default="Vector2(0, 0)">
 			</argument>
-			<argument index="2" name="out" type="Vector2" default="Vector2((0, 0))">
+			<argument index="2" name="out" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<argument index="3" name="atpos" type="int" default="-1">
 			</argument>
@@ -10332,9 +10332,9 @@
 		<method name="add_point">
 			<argument index="0" name="pos" type="Vector3">
 			</argument>
-			<argument index="1" name="in" type="Vector3" default="Vector3((0, 0, 0))">
+			<argument index="1" name="in" type="Vector3" default="Vector3(0, 0, 0)">
 			</argument>
-			<argument index="2" name="out" type="Vector3" default="Vector3((0, 0, 0))">
+			<argument index="2" name="out" type="Vector3" default="Vector3(0, 0, 0)">
 			</argument>
 			<argument index="3" name="atpos" type="int" default="-1">
 			</argument>
@@ -11742,7 +11742,7 @@
 			<argument index="0" name="info" type="Dictionary">
 			</argument>
 			<description>
-			Add a custom property info to a property. The dictionary must contain: name:[String](the name of the property) and type:[int](see TYPE_* in [@Global Scope]), and optionally hint:[int](see PROPERTY_HINT_* in [@Global Scope]), hint_string:[String].
+				Add a custom property info to a property. The dictionary must contain: name:[String](the name of the property) and type:[int](see TYPE_* in [@Global Scope]), and optionally hint:[int](see PROPERTY_HINT_* in [@Global Scope]), hint_string:[String].
 			Example:[codeblock]
 			editor_settings.set("category/property_name", 0)
 
@@ -13772,7 +13772,7 @@
 			<argument index="0" name="hint" type="Dictionary">
 			</argument>
 			<description>
-			Add a custom property info to a property. The dictionary must contain: name:[String](the name of the property) and type:[int](see TYPE_* in [@Global Scope]), and optionally hint:[int](see PROPERTY_HINT_* in [@Global Scope]), hint_string:[String].
+				Add a custom property info to a property. The dictionary must contain: name:[String](the name of the property) and type:[int](see TYPE_* in [@Global Scope]), and optionally hint:[int](see PROPERTY_HINT_* in [@Global Scope]), hint_string:[String].
 			Example:
 			[codeblock]
 			Globals.set("category/property_name", 0)
@@ -15868,7 +15868,7 @@
 		<method name="begin">
 			<argument index="0" name="primitive" type="int">
 			</argument>
-			<argument index="1" name="texture" type="Texture" default="Object()">
+			<argument index="1" name="texture" type="Texture" default="NULL">
 			</argument>
 			<description>
 				Begin drawing (And optionally pass a texture override). When done call end(). For more information on how this works, search for glBegin() glEnd() references.
@@ -16108,7 +16108,7 @@
 		<method name="set_custom_mouse_cursor">
 			<argument index="0" name="image" type="Texture">
 			</argument>
-			<argument index="1" name="hotspot" type="Vector2" default="Vector2((0, 0))">
+			<argument index="1" name="hotspot" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<description>
 				Set a custom mouse cursor image, which is only visible inside the game window. The hotspot can also be specified.
@@ -17628,7 +17628,7 @@
 			<argument index="1" name="selectable" type="bool" default="true">
 			</argument>
 			<description>
-			Adds an item to the item list with no text, only an icon.
+				Adds an item to the item list with no text, only an icon.
 			</description>
 		</method>
 		<method name="add_item">
@@ -29653,14 +29653,14 @@
 			</description>
 		</method>
 		<method name="popup_centered">
-			<argument index="0" name="size" type="Vector2" default="Vector2((0, 0))">
+			<argument index="0" name="size" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<description>
 				Popup (show the control in modal form) in the center of the screen, at the current size, or at a size determined by "size".
 			</description>
 		</method>
 		<method name="popup_centered_minsize">
-			<argument index="0" name="minsize" type="Vector2" default="Vector2((0, 0))">
+			<argument index="0" name="minsize" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<description>
 				Popup (show the control in modal form) in the center of the screen, ensuring the size is never smaller than [code]minsize[/code].
@@ -43184,7 +43184,7 @@
 		<method name="create_action">
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="mergeable" type="bool" default="false">
+			<argument index="1" name="merge_mode" type="int" default="0">
 			</argument>
 			<description>
 				Create a new action. After this is called, do all your calls to [method add_do_method], [method add_undo_method], [method add_do_property] and [method add_undo_property].
@@ -43207,6 +43207,12 @@
 		</method>
 	</methods>
 	<constants>
+		<constant name="MERGE_DISABLE" value="0">
+		</constant>
+		<constant name="MERGE_ENDS" value="1">
+		</constant>
+		<constant name="MERGE_ALL" value="2">
+		</constant>
 	</constants>
 </class>
 <class name="VBoxContainer" inherits="BoxContainer" category="Core">
@@ -44662,9 +44668,9 @@
 		<method name="set_size_override">
 			<argument index="0" name="enable" type="bool">
 			</argument>
-			<argument index="1" name="size" type="Vector2" default="Vector2((-1, -1))">
+			<argument index="1" name="size" type="Vector2" default="Vector2(-1, -1)">
 			</argument>
-			<argument index="2" name="margin" type="Vector2" default="Vector2((0, 0))">
+			<argument index="2" name="margin" type="Vector2" default="Vector2(0, 0)">
 			</argument>
 			<description>
 				Set the size of the viewport. If the enable parameter is true, it would use the override, otherwise it would use the default size. If the size parameter is equal to [code](-1, -1)[/code], it won't update the size.