You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/04/19 13:38:02 UTC

svn commit: r1739905 - in /jmeter/trunk: bin/report-template/sbadmin2-1.0.7/README.md licenses/src/startbootstrap-sb-admin-2.txt

Author: pmouawad
Date: Tue Apr 19 11:38:02 2016
New Revision: 1739905

URL: http://svn.apache.org/viewvc?rev=1739905&view=rev
Log:
Update startbootstrap license and README

Added:
    jmeter/trunk/licenses/src/startbootstrap-sb-admin-2.txt   (with props)
Modified:
    jmeter/trunk/bin/report-template/sbadmin2-1.0.7/README.md

Modified: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/README.md
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/sbadmin2-1.0.7/README.md?rev=1739905&r1=1739904&r2=1739905&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/sbadmin2-1.0.7/README.md (original)
+++ jmeter/trunk/bin/report-template/sbadmin2-1.0.7/README.md Tue Apr 19 11:38:02 2016
@@ -4,18 +4,18 @@
 
 ## Getting Started
 
-To use this template, choose one of the following options to get started:
-* Download the latest release on Start Bootstrap
-* Fork this repository on GitHub
-* Install via bower using `bower install startbootstrap-sb-admin-2`
+To begin using this template, choose one of the following options to get started:
+* [Download the latest release on Start Bootstrap](http://startbootstrap.com/template-overviews/sb-admin-2/)
+* Clone the repo: `git clone https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git`
+* Fork the repo
 
 ## Bugs and Issues
 
-Have a bug or an issue with this template? [Open a new issue](https://github.com/IronSummitMedia/startbootstrap-sb-admin-2/issues) here on GitHub or leave a comment on the [template overview page at Start Bootstrap](http://startbootstrap.com/template-overviews/sb-admin-2/).
+Have a bug or an issue with this template? [Open a new issue](https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/issues) here on GitHub or leave a comment on the [template overview page at Start Bootstrap](http://startbootstrap.com/template-overviews/sb-admin-2/).
 
 ## Creator
 
-Start Bootstrap was created by and is maintained by **David Miller**, Managing Parter at [Iron Summit Media Strategies](http://www.ironsummitmedia.com/).
+Start Bootstrap was created by and is maintained by **[David Miller](http://davidmiller.io/)**, Owner of [Blackrock Digital](http://blackrockdigital.io/).
 
 * https://twitter.com/davidmillerskt
 * https://github.com/davidtmiller
@@ -24,4 +24,4 @@ Start Bootstrap is based on the [Bootstr
 
 ## Copyright and License
 
-Copyright 2013-2015 Iron Summit Media Strategies, LLC. Code released under the [Apache 2.0](https://github.com/IronSummitMedia/startbootstrap-sb-admin-2/blob/gh-pages/LICENSE) license.
+Copyright 2013-2016 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/blob/gh-pages/LICENSE) license.
\ No newline at end of file

Added: jmeter/trunk/licenses/src/startbootstrap-sb-admin-2.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/src/startbootstrap-sb-admin-2.txt?rev=1739905&view=auto
==============================================================================
--- jmeter/trunk/licenses/src/startbootstrap-sb-admin-2.txt (added)
+++ jmeter/trunk/licenses/src/startbootstrap-sb-admin-2.txt Tue Apr 19 11:38:02 2016
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2016 Blackrock Digital LLC.
+
+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.

Propchange: jmeter/trunk/licenses/src/startbootstrap-sb-admin-2.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain