Skip to content

Commit

Permalink
Fixes Readme, License Files & Snipits
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmoser committed Sep 12, 2013
1 parent 8d7f319 commit ae87b5e
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 81 deletions.
70 changes: 49 additions & 21 deletions license.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,54 @@
The software in this package is distributed under the GNU General Public
License (with a special exception described below). The term "library"
is a reference to the entire Slatwall package and all files in which
Slatwall is released under the GPL v3.0 license (with a special exception described below).
You can use Slatwall on any commercial application as long as you abide by the license.
The term "library" is a reference to the entire Slatwall package and all files in which
the GNU General Public License applies.

A copy of GNU General Public License (GPL) is included in this distribution,
in the file GNU_V3_Copy.txt. If you do not have the source code, it is available at:
in the file GNU_V3_Copy.txt. If you do not have the source code, or for more information
including questions about commercial license both can be found on the website:

http://www.getslatwall.com
http://www.getslatwall.com

Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.

As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version.

Slatwall - An Open Source eCommerce Platform
Copyright (C) ten24, LLC

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

Linking this program statically or dynamically with other modules is
making a combined work based on this program. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.

As a special exception, the copyright holders of this program give you
permission to combine this program with independent modules and your
custom code, regardless of the license terms of these independent
modules, and to copy and distribute the resulting program under terms
of your choice, provided that you follow these specific guidelines:

- You also meet the terms and conditions of the license of each
independent module
- You must not alter the default display of the Slatwall name or logo from
any part of the application
- Your custom code must not alter or create any files inside Slatwall,
except in the following directories:
/integrationServices/

You may copy and distribute the modified version of this program that meets
the above guidelines as a combined work under the terms of GPL for this program,
provided that you include the source code of that other code when and as the
GNU GPL requires distribution of source code.

If you modify this program, you may extend this exception to your version
of the program, but you are not obligated to do so.
2 changes: 1 addition & 1 deletion meta/eclipse/snipits/SlatwallDAOSnipits/Base Template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
Notes:
--->
<cfcomponent extends="BaseDAO">
<cfcomponent extends="HibachiDAO">
</cfcomponent>]]></starttext>
<endtext><![CDATA[]]></endtext>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Notes:
*/
component extends="Slatwall.com.service.BaseService" accessors="true" {
component extends="HibachiService" accessors="true" {
// ===================== START: Logical Methods ===========================
Expand Down
99 changes: 41 additions & 58 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,91 +1,74 @@

Introduction
------------

Slatwall is an Open Source e-commerce platform. It is made possible by
the support of fellow developers.
To find out more about the brains behind Slatwall read here:
http://www.getslatwall.com/contributors

For more information on how to get involved please reference the "Contribution"
section of our development guide that is located here:
http://github.com/ten24/Slatwall/wiki/Developer-Guide


Requirements
------------

Mura Version 5.6 or Newer
Mura Version 6 or Newer

Coldfusion 9.0.1 or Newer

Railo 4 or Newer


Installation
------------

Install Option 1: Have ORM settings auto Installed for you.

1. To be on the safe side you should make sure that you are running the latest version of Mura.
2. Download the latest Slatwall zip from this link: http://github.com/ten24/Slatwall/zipball/master
3. In the mura admin, go to Site Settings > Global Settings
4. Click on the Plugins Tab, and Upload the Slatwall zip file as a new plugin.
Railo 4.1 or Newer


Documentation
-------------

Please view the project documentation here: https://github.com/ten24/Slatwall/wiki
Please view the project documentation, including install instructions: http://docs.getslatwall.com


License
-------

Slatwall is released under the GPL v3.0 license. You can use Slatwall on any
commercial application as long as you abide by the license.
More information including questions about commercial license can be found on
the website:
Slatwall is released under the GPL v3.0 license (with a special exception described below).
You can use Slatwall on any commercial application as long as you abide by the license.
The term "library" is a reference to the entire Slatwall package and all files in which
the GNU General Public License applies.

http://www.getslatwall.com
A copy of GNU General Public License (GPL) is included in this distribution,
in the file GNU_V3_Copy.txt. If you do not have the source code, or for more information
including questions about commercial license both can be found on the website:

The software in this package is distributed under the GNU General Public
License (with a special exception described below). The term "library"
is a reference to the entire Slatwall package and all files in which
the GNU General Public License applies.
http://www.getslatwall.com

Slatwall - An e-commerce plugin for Mura CMS
Copyright (C) 2011 ten24, LLC

Slatwall - An Open Source eCommerce Platform
Copyright (C) ten24, LLC

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
Linking this program statically or dynamically with other modules is
making a combined work based on this program. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.

As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version.

Slatwall's documentation and logos are *not* licensed under the GPL v3.0 license:
Copyright 2011 ten24, LLC All rights reserved.

As a special exception, the copyright holders of this program give you
permission to combine this program with independent modules and your
custom code, regardless of the license terms of these independent
modules, and to copy and distribute the resulting program under terms
of your choice, provided that you follow these specific guidelines:

- You also meet the terms and conditions of the license of each
independent module
- You must not alter the default display of the Slatwall name or logo from
any part of the application
- Your custom code must not alter or create any files inside Slatwall,
except in the following directories:
/integrationServices/

You may copy and distribute the modified version of this program that meets
the above guidelines as a combined work under the terms of GPL for this program,
provided that you include the source code of that other code when and as the
GNU GPL requires distribution of source code.

If you modify this program, you may extend this exception to your version
of the program, but you are not obligated to do so.

0 comments on commit ae87b5e

Please sign in to comment.