Browse Source

Improves Readme and License mdFiles

Removed some tabs, linked to the wiki and updated JVM Version to 8
Andreas T. Meyer-Berg 7 năm trước cách đây
mục cha
commit
1578b4942e
2 tập tin đã thay đổi với 21 bổ sung17 xóa
  1. 6 2
      README.md
  2. 15 15
      license.md

+ 6 - 2
README.md

@@ -4,7 +4,7 @@ Cyber-physical systems simulation software following a Holon-based smart grid sy
 
 ## Prerequisites
 
-* Java 1.7 compatible VM
+* Java 1.8 compatible VM
 * Gradle >= 3.1 (may be downloaded on-the-fly)
 
 ## Building
@@ -22,9 +22,13 @@ script `gradlew` (or `gradlew.bat` on Windows) instead of the `gradle` command.
 	
 	$ gradle tasks		# Displays all the tasks runnable from root project.
 
+## Introduction and User Manual
+
+The Wiki contains some general [Information](https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons/wiki/Introduction) and a [User Manual](https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons/wiki/User+Manual)
+
 ## API Instructions
 
-See [LICENSE.md](LICENSE.md) for some Instructions
+Check out the [API Instructions Wiki](https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons/wiki/Algorithms) for some Instructions
 
 ## License
 

+ 15 - 15
license.md

@@ -1,16 +1,16 @@
 # Copyright (c) 2017 Carlos Garcia Cordero, Rolf Egert
-	
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this 
-	software and associated documentation files (the "Software"), to deal in the Software 
-	without restriction, including without limitation the rights to use, copy, modify, merge
-	publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons 
-	to whom the Software is furnished to do so, subject to the following conditions:
-	The above copyright notice and this permission notice shall be included in all copies or 
-	substantial portions of the Software.
-	
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-	INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-	PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
-	FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
-	OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-	DEALINGS IN THE SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+software and associated documentation files (the "Software"), to deal in the Software 
+without restriction, including without limitation the rights to use, copy, modify, merge
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons 
+to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or 
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+DEALINGS IN THE SOFTWARE.