diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2007-04-15 19:41:17 +0200 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2007-04-15 19:41:17 +0200 |
| commit | d2df9bc7cc9d4b3e53818470c5d0977c9a36677c (patch) | |
| tree | 23c0794fefaa6860ec997813fefb9c64fcee1983 /user_guide/license.html | |
| parent | 9613e2c136c96fbb1d055b36a0a5055811f03451 (diff) | |
update pMachine to EllisLab
update copyright year
update Code Igniter to CodeIgniter
Diffstat (limited to 'user_guide/license.html')
| -rw-r--r-- | user_guide/license.html | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/user_guide/license.html b/user_guide/license.html index f346c14de..fb00e2002 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -2,7 +2,7 @@ <html>
<head>
-<title>Code Igniter User Guide</title>
+<title>CodeIgniter User Guide</title>
<style type='text/css' media='all'>@import url('userguide.css');</style>
<link rel='stylesheet' type='text/css' media='all' href='userguide.css' />
@@ -22,7 +22,7 @@ window.onload = function() { <meta http-equiv= 'pragma' content='no-cache' />
<meta name='robots' content='all' />
<meta name='author' content='Rick Ellis' />
-<meta name='description' content='Code Igniter User Guide' />
+<meta name='description' content='CodeIgniter User Guide' />
</head>
<body>
@@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>
<td id="breadcrumb_right"><a href="toc.html">Table of Contents Page</a></td>
</tr>
</table>
@@ -46,7 +46,7 @@ window.onload = function() { <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
<td id="breadcrumb">
-<a href="http://www.codeigniter.com/">Code Igniter Home</a> ›
+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> ›
<a href="index.html">User Guide Home</a> ›
License Agreement
</td>
@@ -63,12 +63,12 @@ License Agreement <!-- START CONTENT -->
<div id="content">
-<h1>Code Igniter License Agreement</h1>
+<h1>CodeIgniter License Agreement</h1>
-<p>Copyright (c) 2006, pMachine, Inc.<br />
+<p>Copyright (c) 2006, EllisLab, Inc.<br />
All rights reserved.</p>
-<p>This license is a legal agreement between you and pMachine Inc. for the use of Code Igniter Software (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.</p>
+<p>This license is a legal agreement between you and EllisLab Inc. for the use of CodeIgniter Software (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.</p>
<h2>Permitted Use</h2>
<p>You are permitted to use, copy, modify, and distribute the Software and its documentation, with or without modification, for any purpose, provided that the following conditions are met:</p>
@@ -78,8 +78,8 @@ All rights reserved.</p> <li>Redistributions of source code must retain the above copyright notice in all source code files.</li>
<li>Redistributions in binary form must reproduce the above copyright notice in the documentation and/or other materials provided with the distribution.</li>
<li>Any files that have been modified must carry notices stating the nature of the change and the names of those who changed them.</li>
-<li>Products derived from the Software must include an acknowledgment that they are derived from Code Igniter in their documentation and/or other materials provided with the distribution.</li>
-<li>Products derived from the Software may not be called "Code Igniter", nor may "Code Igniter" appear in their name, without prior written permission from pMachine, Inc.</li>
+<li>Products derived from the Software must include an acknowledgment that they are derived from CodeIgniter in their documentation and/or other materials provided with the distribution.</li>
+<li>Products derived from the Software may not be called "CodeIgniter", nor may "CodeIgniter" appear in their name, without prior written permission from EllisLab, Inc.</li>
</ol>
<h2>Indemnity</h2>
@@ -106,7 +106,7 @@ Previous Topic: <a href="general/requirements.html">Server Requiremen Next Topic: <a href="changelog.html">Change Log</a>
<p>
-<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
</body>
|