From d2df9bc7cc9d4b3e53818470c5d0977c9a36677c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Apr 2007 17:41:17 +0000 Subject: update pMachine to EllisLab update copyright year update Code Igniter to CodeIgniter --- user_guide/license.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'user_guide/license.html') 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 @@ -Code Igniter User Guide +CodeIgniter User Guide @@ -22,7 +22,7 @@ window.onload = function() { - + @@ -33,7 +33,7 @@ window.onload = function() {
- +

Code Igniter User Guide Version 1.5.2

CodeIgniter User Guide Version 1.5.3
@@ -46,7 +46,7 @@ window.onload = function() { @@ -63,12 +63,12 @@ License Agreement
-

Code Igniter License Agreement

+

CodeIgniter License Agreement

-

Copyright (c) 2006, pMachine, Inc.
+

Copyright (c) 2006, EllisLab, Inc.
All rights reserved.

-

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.

+

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.

Permitted Use

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:

@@ -78,8 +78,8 @@ All rights reserved.

  • Redistributions of source code must retain the above copyright notice in all source code files.
  • Redistributions in binary form must reproduce the above copyright notice in the documentation and/or other materials provided with the distribution.
  • Any files that have been modified must carry notices stating the nature of the change and the names of those who changed them.
    • -
  • 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.
    • -
  • 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.
    • +
  • 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.
    • +
  • Products derived from the Software may not be called "CodeIgniter", nor may "CodeIgniter" appear in their name, without prior written permission from EllisLab, Inc.

    • Indemnity

    @@ -106,7 +106,7 @@ Previous Topic:  Server Requiremen Next Topic:  Change Log

    -

    Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    -- cgit v1.2.3-24-g4f1b