Merge branch 'master' of git@github.com:katmore/flat.git

katmore · Mar 24, 2017 · 544d005 · 544d005
2 parents 43110a9 + 786c05e
commit 544d005
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,11 +1,6 @@
-THIS DOCUMENT APPLIES TO ALL SOURCE FILES IN THE PROJECT:
-"the flat framework" AS FOUND IN https://github.com/katmore/flat
-UNLESS SOURCE FILE CONTAINS TEXT EXPLICITLY STATING OTHERWISE.
-
 The MIT License (MIT)
 
-The flat framework. Copyright (c) 2012-2017, Doug Bird.
-All rights reserved.
+Copyright (c) 2012-2017 Doug Bird
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
-# flat: an experimental framework for php
+# Flat
+**The Flat Framework**
+
 *Flat* is an experimental framework for php.
 
 The purpose in creating *flat* is to have a framework which conceptualizes the organization of an application project as set of hierarchical resources.
@@ -128,7 +130,8 @@ if (class_exists($check_class)) {
 
 ## Legal
 ### Copyright
-The Flat Framework. https://github.com/katmore/flat
+The Flat Framework - https://github.com/katmore/flat
+
 Copyright (c) 2012-2016 Doug Bird. All Rights Reserved.
 
 ### License