diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ac1a7165f..26ad1194b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -25,6 +25,7 @@
  - fixed corner case which causes the user profile to not load in cases where
    custom forms do not work or are broken. It now skips these and throws a
    warning
+ - fix: Added javascript confirmation for deleting wiki pages.
 
 
 7.3.4
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 4760099a2..53766ca7b 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,6 +7,17 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.3.5
+--------------------------------------------------------------------
+ * Template variables used in templates that use XML, or that are used
+   inside of Javascript need to be escaped to make quotes and other
+   characters safe.  This can be done by appending ESCAPE="HTML" or
+   ESCAPE="JS" to the tmpl_var tag.  Examples were added to the
+   Template Language help page.
+
+ * A javascript confirmation was added to the default Edit Wiki Page
+   template.  It will need to be manually added to custom templates.
+
 7.3.2
 --------------------------------------------------------------------
  * The testCodebase.pl script will now automatically set the CODE_COP
diff --git a/docs/upgrades/templates-7.3.5/wiki-page.tmpl b/docs/upgrades/templates-7.3.5/wiki-page.tmpl
new file mode 100644
index 000000000..def5b907f
--- /dev/null
+++ b/docs/upgrades/templates-7.3.5/wiki-page.tmpl
@@ -0,0 +1,24 @@
+#WikiPageEditTmpl000001
+<tmpl_var formHeader>
+<table>
+<tbody>
+<tr><td><label for="title_formId"><tmpl_var titleLabel></label></td><td><tmpl_var formTitle></td></tr>
+<tr><td><label for="content_formId"><tmpl_var contentLabel></label></td><td><tmpl_var formContent></td></tr>
+<tmpl_if canAdminister>
+	<tr><td><label for="isProtected_formId"><tmpl_var protectQuestionLabel></label></td><td><tmpl_var formProtect></td></tr>
+</tmpl_if>
+<tmpl_if allowsAttachments>
+	<tr><td><label for="storageId_formId"><tmpl_var attachmentLabel></label></td><td><tmpl_var formAttachment></td></tr>
+</tmpl_if>
+</tbody>
+</table>
+<tmpl_var formSubmit>
+<tmpl_var formFooter>
+
+<tmpl_if canAdminister><tmpl_unless isNew>
+	<ul>
+		<li><a href="<tmpl_var deleteUrl>" onclick="return confirm('<tmpl_var deleteConfirm ESCAPE="JS">');"><tmpl_var deleteLabel></a></li>
+	</ul>
+</tmpl_unless></tmpl_if>
+
+
diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm
index edb998e4e..5a8920fe0 100644
--- a/lib/WebGUI/Asset/WikiPage.pm
+++ b/lib/WebGUI/Asset/WikiPage.pm
@@ -159,6 +159,7 @@ sub getEditForm {
 		formFooter => WebGUI::Form::formFooter($session),
 		isNew => ($self->getId eq "new"),
 		canAdminister => $wiki->canAdminister,
+		deleteConfirm => $i18n->get("delete page confirmation"),
 		deleteLabel => $i18n->get("deleteLabel"),
 		deleteUrl => $self->getUrl("func=delete"),
 		titleLabel => $i18n->get("titleLabel"),
diff --git a/lib/WebGUI/Help/Asset_WikiPage.pm b/lib/WebGUI/Help/Asset_WikiPage.pm
index 83fbeafb1..aba753a30 100644
--- a/lib/WebGUI/Help/Asset_WikiPage.pm
+++ b/lib/WebGUI/Help/Asset_WikiPage.pm
@@ -59,6 +59,9 @@ our $HELP = {
                         {
                                 name => 'deleteUrl',
                         },
+                        {
+                                name => 'deleteConfirmation',
+                        },
 		],
 		related => [
 		],
diff --git a/lib/WebGUI/i18n/English/Asset_WikiPage.pm b/lib/WebGUI/i18n/English/Asset_WikiPage.pm
index 09a05415d..a48f2c7b0 100644
--- a/lib/WebGUI/i18n/English/Asset_WikiPage.pm
+++ b/lib/WebGUI/i18n/English/Asset_WikiPage.pm
@@ -257,6 +257,11 @@ our $I18N =
                 lastUpdated => 1166484508,
         },
 
+        'delete page confirmation' => {
+                message => q|Delete this wiki page?|,
+                lastUpdated => 1169074288,
+        },
+
 };
 
 1;