From 1ba36b183522817896245539bff6a58194ea030b Mon Sep 17 00:00:00 2001 From: iadgovadmin Date: Tue, 2 Feb 2016 11:54:26 -0500 Subject: [PATCH] prep for release --- LICENSE.md | 18 +++++++++--------- README.md | 13 ++++++++++--- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index d1aa4f7..4641adf 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -5,8 +5,8 @@ GRASSMARLIN is licensed under LGPL 3.0. - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies @@ -174,11 +174,11 @@ Library. ##Libraries -GRASSMARLIN uses a number of libraries: +GRASSMARLIN uses a number of libraries that are licensed under various licenses: -* Prefuse - http://prefuse.org/ is covered by a BSD license. -* Common Lang - https://github.com/apache/commons-lang is covered by an Apache 2.0 license. -* JnetPCAP - http://jnetpcap.com/ is covered by a LGPL 3.0 license. -* ANTLR4 - http://www.antlr.org is covered by a BSD license. -* StringTemplate4 - http://www.stringtemplate.org is covered by a BSD license. -* Common IO - http://github.com/apache/commons-io is covered by an Apache 2.0 license. +* [Prefuse](http://prefuse.org) is licensed under BSD. +* [Common Lang](https://github.com/apache/commons-lang) is licensed under Apache 2.0. +* [JnetPCAP](http://jnetpcap.com) is licensed under LGPL 3.0. +* [ANTLR4](http://www.antlr.org) is licensed under BSD. +* [StringTemplate4](http://www.stringtemplate.org) is licensed under BSD. +* [Common IO](http://github.com/apache/commons-io) is licensed under Apache 2.0. diff --git a/README.md b/README.md index b8d5f57..3e664d7 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,21 @@ GRASSMARLIN provides IP network situational awareness of industrial control systems (ICS) and Supervisory Control and Data Acquisition (SCADA) networks to support network security. Passively map, and visually display, an ICS/SCADA network topology while safely conducting device discovery, accounting, and reporting on these critical cyber-physical systems. -## Paper +## Documentation +To learn more about GRASSMARLIN, read the introduction paper: * [Download PDF](https://github.com/iadgov/GRASSMARLIN/raw/master/GRASSMARLIN.pdf) * [View PDF on GitHub](https://github.com/iadgov/GRASSMARLIN/blob/master/GRASSMARLIN.pdf) -# License +## Release + +Download the [latest release](https://github.com/iadgov/GRASSMARLIN/releases/latest). + +## License + See [LICENSE.md](https://github.com/iadgov/GRASSMARLIN/raw/master/LICENSE.md) -# Disclaimer +## Disclaimer + See [DISCLAIMER.md](https://github.com/iadgov/GRASSMARLIN/raw/master/DISCLAIMER.md)