Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated composer.json, readme.md, license.md

  • Loading branch information...
commit 9ecadad0c75fb3dfb3aa67c75e3da1d0256ad483 1 parent 79932e8
@dg dg authored
Showing with 50 additions and 63 deletions.
  1. +1 −1  composer.json
  2. +12 −12 license.txt → license.md
  3. +37 −0 readme.md
  4. +0 −50 readme.txt
View
2  composer.json
@@ -3,7 +3,7 @@
"description": "The sandbox is a pre-packaged Nette Framework project, basic configured structure for your application.",
"keywords": ["framework", "mvc", "debugging", "templating", "database", "dbal", "forms", "latte", "neon", "mailing", "images", "micro"],
"homepage": "http://nette.org",
- "license": ["BSD-3", "GPLv2", "GPLv3"],
+ "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
"authors": [
{
"name": "David Grudl",
View
24 license.txt → license.md
@@ -39,16 +39,16 @@ are permitted provided that the following conditions are met:
may be used to endorse or promote products derived from this software
without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This software is provided by the copyright holders and contributors "as is" and
+any express or implied warranties, including, but not limited to, the implied
+warranties of merchantability and fitness for a particular purpose are
+disclaimed. In no event shall the copyright owner or contributors be liable for
+any direct, indirect, incidental, special, exemplary, or consequential damages
+(including, but not limited to, procurement of substitute goods or services;
+loss of use, data, or profits; or business interruption) however caused and on
+any theory of liability, whether in contract, strict liability, or tort
+(including negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
@@ -58,5 +58,5 @@ GNU General Public License
GPL licenses are very very long, so instead of including them here we offer
you URLs with full text:
-- GPL version 2: http://www.gnu.org/licenses/gpl-2.0.html
-- GPL version 3: http://www.gnu.org/licenses/gpl-3.0.html
+- [GPL version 2](http://www.gnu.org/licenses/gpl-2.0.html)
+- [GPL version 3](http://www.gnu.org/licenses/gpl-3.0.html)
View
37 readme.md
@@ -0,0 +1,37 @@
+Nette Framework Sandbox
+=======================
+
+The basic skeleton of application.
+
+
+What is [Nette Framework](http://nette.org)?
+------------------------
+
+Nette Framework is a popular tool for PHP web development. It is designed to be
+the most usable and friendliest as possible. It focuses on security and
+performance and is definitely one of the safest PHP frameworks.
+
+Nette Framework speaks your language and helps you to easily build better websites.
+
+
+Installing
+----------
+
+The best way to install Nette Framework is to download latest package
+from http://nette.org/download or create new project using
+[Composer](http://doc.nette.org/composer):
+
+ curl -s http://getcomposer.org/installer | php
+ php composer.phar create-project nette/sandbox myApp
+ cd myApp
+
+Make directories `temp` and `log` writable. Navigate your browser
+to the `www` directory and you will see a welcome page. PHP 5.4 allows
+you run `php -S localhost:8888 -t www` to start the webserver and
+than visit `http://localhost:8888` in your browser.
+
+
+It is CRITICAL that file `app/config/config.neon` & whole `app`, `log`
+and `temp` directory are NOT accessible directly via a web browser! If you
+don't protect this directory from direct web access, anybody will be able to see
+your sensitive data. See [security warning](http://nette.org/security-warning).
View
50 readme.txt
@@ -1,50 +0,0 @@
-Nette Framework Sandbox
-=======================
-
-The basic structure for your application.
-
-
-What is Nette Framework?
-------------------------
-
-Nette Framework is a powerful, component-based and event-driven framework
-for creating web applications and services in PHP 5.2 & 5.3. Nette Framework
-is designed with simplicity, speed and flexibility in mind. It allows developers
-to easy built better websites.
-
-Nette Framework focuses on security and performance and is definitely one of
-the safest and fastest PHP frameworks. Nette Framework support the latest
-technologies and approaches like AJAX, HTML5, SEO, DRY, KISS, MVC, etc.
-
-
-Requirements
-------------
-
-Nette Framework requires PHP 5.2.0 and/or 5.3.0.
-
-
-Installing
-----------
-
-Make directories 'sandbox/temp' and 'sandbox/log' writable.
-
-It is CRITICAL that file 'sandbox/app/config.neon' & whole 'sandbox/app', 'sandbox/log'
-and 'sandbox/temp' directory are NOT accessible directly via a web browser! If you
-don't protect this directory from direct web access, anybody will be able to see
-your sensitive data. See: http://nette.org/security-warning
-
-
-Documentation, Examples, Sandbox, Tools
----------------------------------------
-
-Nette Framework: homepage http://nette.org and repository http://github.com/nette/nette
-Sandbox, pre-packaged and configured project: http://github.com/nette/sandbox
-Examples repository: http://github.com/nette/examples
-
-
-License
--------
-
-This skeleton is part of the Nette Framework (http://nette.org). For the full
-copyright and license information, please view the file license.txt.
-For "Adminer" copyright and license information, please view it's source code.
Please sign in to comment.
Something went wrong with that request. Please try again.