[PATCH 1/2] publican: Update docs license from MIT "X11" to MIT "Expat" style

Bryce Harrington bryce at osg.samsung.com
Fri Jun 12 16:41:03 PDT 2015


Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
---
 doc/publican/sources/Book_Info.xml | 46 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/doc/publican/sources/Book_Info.xml b/doc/publican/sources/Book_Info.xml
index 38e5bfc..e9e5ff0 100644
--- a/doc/publican/sources/Book_Info.xml
+++ b/doc/publican/sources/Book_Info.xml
@@ -40,30 +40,30 @@
       Copyright <trademark class="copyright"></trademark> &YEAR; &HOLDER;
     </para>
 
-    <para>
-      Permission to use, copy, modify, distribute, and sell this
-      software and its documentation for any purpose is hereby granted
-      without fee, provided that the above copyright notice appear in
-      all copies and that both that copyright notice and this
-      permission notice appear in supporting documentation, and that
-      the name of the copyright holders not be used in advertising or
-      publicity pertaining to distribution of the software without
-      specific, written prior permission.  The copyright holders make
-      no representations about the suitability of this software for
-      any purpose.  It is provided "as is" without express or implied
-      warranty.
-    </para>
+	<para>
+	  Permission is hereby granted, free of charge, to any person obtaining a
+	  copy of this software and associated documentation files (the "Software"),
+	  to deal in the Software without restriction, including without limitation
+	  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+	  and/or sell copies of the Software, and to permit persons to whom the
+	  Software is furnished to do so, subject to the following conditions:
+	</para>
 
-    <para>
-      THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO
-      THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-      MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE COPYRIGHT
-      HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-      DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-      DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-      OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-      USE OR PERFORMANCE OF THIS SOFTWARE.
-    </para>
+	<para>
+	  The above copyright notice and this permission notice (including the next
+	  paragraph) shall be included in all copies or substantial portions of the
+	  Software.
+	</para>
+
+	<para>
+	  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+	  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+	  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+	  DEALINGS IN THE SOFTWARE.
+	</para>
   </legalnotice>
 
 
-- 
1.9.1



More information about the wayland-devel mailing list