Permalink
Browse files

Update license and readme. [admin]

  • Loading branch information...
trans committed Mar 4, 2012
1 parent 1da6ac4 commit 29488519a49d64c0ddc8d92b41503099f6d1043a
Showing with 32 additions and 46 deletions.
  1. +22 −0 LICENSE.txt
  2. +0 −37 NOTICE.md
  3. +10 −9 README.md
View
@@ -0,0 +1,22 @@
+YARD::TomDoc - Use TomDoc with YARD
+
+Copyright (c) 2010 Loren Segal, Thomas Sawyer (MIT License)
+
+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.
+
View
@@ -1,37 +0,0 @@
-# COPYRIGHT NOTICES
-
-
-## YARD Tomdoc
-
-**Copyright (c) 2010 Loren Segal, Thomas Sawyer**
-
-Distributed under the terms of the MIT License (see below).
-
-
-## Tomdoc
-
-**Copyright (c) 2010 Tom Preston-Werner, Chris Wanstrath**
-
-Distributed under the terms of the MIT License (see below).
-
-
-## The MIT License
-
- 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.
-
View
@@ -1,19 +1,18 @@
-# yard-tomdoc
+# YARD::TomDoc
-| Author: | Thomas Sawyer <transfire@gmail.com> |
-|------------|------------------------------------------------|
-| Copyright: | (c) 2010 Loren Segal, Thomas Sawyer |
-| Home: | http://rubyworks.github.com/yard-tomdoc |
-| Issues: | http://github.com/rubyworks/yard-tomdoc/issues |
-| Status: | [![Build Status](https://secure.travis-ci.org/rubyworks/yard-tomdoc.png)](http://travis-ci.org/rubyworks/yard-tomdoc) |
+[Website](http://rubyworks.github.com/yard-tomdoc) /
+[Development](http://github.com/rubyworks/yard-tomdoc) /
+[Issues](http://github.com/rubyworks/yard-tomdoc/issues)
+
+[![Build Status](https://secure.travis-ci.org/rubyworks/yard-tomdoc.png)](http://travis-ci.org/rubyworks/yard-tomdoc)
## Description
Implements [TomDoc](http://tomdoc.org) syntax for YARD. 'Nuff said.
-## Usage
+## Instruction
Since `yard-tomdoc` is a standard YARD plugin, utilize it with yard's
`--plugin` option.
@@ -31,5 +30,7 @@ and TomDoc syntax [here](http://gnuu.org/2010/05/12/whats-missing-from-tomdoc/).
Copyright (c) 2010 Loren Segal, Thomas Sawyer
-See the `NOTICE` file for license information on TomDoc.
+YARD::TomDoc is distributable in accordance with the ters of the **MIT** licsnse.
+
+See the `LICENSE.txt` file for details.

0 comments on commit 2948851

Please sign in to comment.