From e9c0d802049418ae88e578a9cb7ddc87d0d8fceb Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Tue, 19 Oct 2010 21:39:08 -0400
Subject: [PATCH] Update the copyright header to point to the Software Freedom
 Conservancy.

---
 disclaimer.txt     |  7 -------
 jquery.tmpl.js     |  9 ++++++---
 jquery.tmplPlus.js | 13 +++++++++----
 3 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 disclaimer.txt

diff --git a/disclaimer.txt b/disclaimer.txt
deleted file mode 100644
index 96ad8ec..0000000
--- a/disclaimer.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The code contributions made by Microsoft to the jQuery-tmpl source code, 
-on http://github.com/nje/jquery-tmpl, are modifications to the original 
-code at http://github.com/jquery/jquery-tmpl written by the jQuery team.  
-
-Thus, Microsoft is contributing solely its modifications to the original 
-templating code, as we cannot claim to own the original templating code, 
-which belongs to the jQuery team. 
diff --git a/jquery.tmpl.js b/jquery.tmpl.js
index 1c5b2d6..9003a1b 100644
--- a/jquery.tmpl.js
+++ b/jquery.tmpl.js
@@ -1,7 +1,10 @@
-/*
- * jQuery Templating Plugin
- * Copyright 2010, John Resig
+/*!
+ * jQuery Templates Plugin
+ * http://github.com/jquery/jquery-tmpl
+ *
+ * Copyright Software Freedom Conservancy, Inc.
  * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  */
 (function( jQuery, undefined ){
 	var oldManip = jQuery.fn.domManip, tmplItmAtt = "_tmplitem", htmlExpr = /^[^<]*(<[\w\W]+>)[^>]*$|\{\{\! /,
diff --git a/jquery.tmplPlus.js b/jquery.tmplPlus.js
index 7631a5e..7daae86 100644
--- a/jquery.tmplPlus.js
+++ b/jquery.tmplPlus.js
@@ -1,7 +1,12 @@
-/*
-* Additional templating features or support for more advanced/less common scenarios.
-* Requires jquery.tmpl.js 
-*/
+/*!
+ * Additional templating features or support for more advanced/less common scenarios.
+ * Requires jquery.tmpl.js 
+ * http://github.com/jquery/jquery-tmpl
+ *
+ * Copyright Software Freedom Conservancy, Inc.
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ */
 (function (jQuery) {
 	var oldComplete = jQuery.tmpl.complete, oldManip = jQuery.fn.domManip;