4 files changed, 43 insertions, 0 deletions
diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml
index e84e265983..a131f1f8c8 100644
--- a/doc/classes/@GlobalScope.xml
+++ b/doc/classes/@GlobalScope.xml
@@ -42,8 +42,13 @@
 		<member name="JSON" type="JSON" setter="" getter="">
 			The [JSON] singleton.
 		</member>
+		<member name="JavaClassWrapper" type="JavaClassWrapper" setter="" getter="">
+			The [JavaClassWrapper] singleton.
+			[b]Note:[/b] Only implemented on Android.
+		</member>
 		<member name="JavaScript" type="JavaScript" setter="" getter="">
 			The [JavaScript] singleton.
+			[b]Note:[/b] Only implemented on HTML5.
 		</member>
 		<member name="Marshalls" type="Reference" setter="" getter="">
 			The [Marshalls] singleton.
diff --git a/doc/classes/JavaClass.xml b/doc/classes/JavaClass.xml
new file mode 100644
index 0000000000..c56f3cd481
--- /dev/null
+++ b/doc/classes/JavaClass.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="JavaClass" inherits="Reference" category="Core" version="3.2">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
diff --git a/doc/classes/JavaClassWrapper.xml b/doc/classes/JavaClassWrapper.xml
new file mode 100644
index 0000000000..f027ddb975
--- /dev/null
+++ b/doc/classes/JavaClassWrapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="JavaClassWrapper" inherits="Object" category="Core" version="3.2">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="wrap">
+			<return type="JavaClass">
+			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+	</methods>
+	<constants>
+	</constants>
+</class>
diff --git a/doc/classes/PacketPeer.xml b/doc/classes/PacketPeer.xml
index d52bf4e3bb..e8c1980dd9 100644
--- a/doc/classes/PacketPeer.xml
+++ b/doc/classes/PacketPeer.xml
@@ -67,6 +67,10 @@
 			If [code]true[/code], the PacketPeer will allow encoding and decoding of object via [method get_var] and [method put_var].
 			[b]Warning:[/b] Deserialized objects can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats such as remote code execution.
 		</member>
+		<member name="encode_buffer_max_size" type="int" setter="set_encode_buffer_max_size" getter="get_encode_buffer_max_size" default="8388608">
+			Maximum buffer size allowed when encoding [Variant]s. Raise this value to support heavier memory allocations.
+			The [method put_var] method allocates memory on the stack, and the buffer used will grow automatically to the closest power of two to match the size of the [Variant]. If the [Variant] is bigger than [code]encode_buffer_max_size[/code], the method will error out with [constant ERR_OUT_OF_MEMORY].
+		</member>
 	</members>
 	<constants>
 	</constants>