Skip to content

Commit 319d80c

Browse files
committed
chore: add COPYRIGHT file and update license references
- move copyright information from LICENSE-* files to COPYRIGHT - use some improved wording used by the Rust project
1 parent 0001b20 commit 319d80c

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

COPYRIGHT

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Copyright (c) Michael Howell
2+
Copyright (c) uutils developers
3+
4+
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
5+
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
6+
<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
7+
option. All files in the project carrying such notice may not be
8+
copied, modified, or distributed except according to those terms.

LICENSE-APACHE

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
Copyright (c) Michael Howell
2-
Copyright (c) uutils developers
3-
41
Apache License
52
Version 2.0, January 2004
63
http://www.apache.org/licenses/

LICENSE-MIT

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
Copyright (c) Michael Howell
2-
Copyright (c) uutils developers
3-
41
Permission is hereby granted, free of charge, to any
52
person obtaining a copy of this software and associated
63
documentation files (the "Software"), to deal in the

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,8 @@ $ cargo run -- -u fruits_old.txt fruits_new.txt
5454

5555
## License
5656

57-
diffutils is licensed under the MIT and Apache Licenses - see the `LICENSE-MIT` or `LICENSE-APACHE` files for details
57+
This project is distributed under the terms of both the MIT license and the
58+
Apache License (Version 2.0).
59+
60+
See [LICENSE-APACHE](LICENSE-APACHE), [LICENSE-MIT](LICENSE-MIT), and
61+
[COPYRIGHT](COPYRIGHT) for details.

0 commit comments

Comments
 (0)