Merge lp:~ya-bo-ng/ubuntu-font-family-website/licence-update-lp1278509 into lp:ubuntu-font-family-website

[Anthony Dillon]

Small copy change to the licence page.

[Paul Sladen (sladen)]

I'm not sure of the value of the whitespace changes, but other that, seems reasonable.

review: Approve

=== modified file 'licence/index.html'
--- licence/index.html	2012-09-29 01:30:30 +0000
+++ licence/index.html	2014-03-05 22:56:43 +0000
@@ -38,14 +38,14 @@
 			<h1>Ubuntu Font Licence</h1>
 		</div>
 	</div>
-	
+
 	<div class="grid-12">
 		<div class="content-main">
 			<h2>Version 1.0</h2>
-			
+
 			<h3>Preamble</h3>
 			<p>This licence allows the licensed fonts to be used, studied, modified and redistributed freely. The fonts, including any derivative works, can be bundled, embedded, and redistributed provided the terms of this licence are met. The fonts and derivatives, however, cannot be released under any other licence. The requirement for fonts to remain under this licence does not require any document created using the fonts or their derivatives to be published under this licence, as long as the primary purpose of the document is not to be a vehicle for the distribution of the fonts.</p>
-		
+
 			<h3>Definitions</h3>
 			<p>"Font Software" refers to the set of files released by the Copyright Holder(s) under this licence and clearly marked as such. This may include source files, build scripts and documentation.</p>
 			<p>"Original Version" refers to the collection of Font Software components as received under this licence.</p>
@@ -53,7 +53,7 @@
 			<p>"Copyright Holder(s)" refers to all individuals and companies who have a copyright ownership of the Font Software.</p>
 			<p>"Substantially Changed" refers to Modified Versions which can be easily identified as dissimilar to the Font Software by users of the Font Software comparing the Original Version with the Modified Version.</p>
 			<p>To "Propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification and with or without charging a redistribution fee), making available to the public, and in some countries other activities as well.</p>
-		
+
 			<h3>Permission &amp; Conditions</h3>
 			<p>This licence does not grant any rights under trademark law and all such rights are reserved.</p>
 			<p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to propagate the Font Software, subject to the below conditions:</p>
@@ -79,18 +79,19 @@
 					<li>The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this licence, and must not be distributed under any other licence. The requirement for fonts to remain under this licence does not affect any document created using the Font Software, except any version of the Font Software extracted from a document created using the Font Software may only be distributed under this licence.</li>
 				</li>
 			</ol>
-		
+
 			<h3>Termination</h3>
 			<p>This licence becomes null and void if any of the above conditions are not met.</p>
-		
+
 			<h3>Disclaimer</h3>
 			<p>THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.</p>
 			<p><a href="http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt">Ubuntu Font Licence Version 1.0 (plain text)</a></p>
 		</div>
 	</div>
-	
+
 	<div class="grid-12">
 		<div class="content-intro">
+			<h2>Ubuntu Font Licence &mdash; Further information</h2>
 			<p>The Ubuntu Font Family is presently distributed under the Ubuntu Font Licence.  This means you can use the font in much the same way as you would use any other font (open or proprietary).  The <em>open</em> means that in the long run, the font can continue to be expanded, because the raw source code (design files) for the font itself are available to those who are interested.</p>
 
 			<p>You are most welcome to use the Ubuntu Font Family, in your documents, graphic designs, logos, or company stationary.  We'd like as many people as possible to have a better quality reading experience everyday.</p>
@@ -105,7 +106,7 @@
 			</ul>
 		</div>
 	</div>
-	
+
 	<!--<div class="grid-4">
 		<div class="content-sample">
 			<div id="sample"></div>