From 00205aa6a7ea5d96ac53ec6e90b75ecf74c5da0a Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Mon, 10 Feb 2020 00:38:57 -0500 Subject: [PATCH] Update readme --- LICENSE | 2 +- README.md | 8 +++++--- assets/packaging/micro.1 | 2 +- runtime/syntax/LICENSE | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 8e0d4d35..43e74514 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016-2017: Zachary Yedidia, et al. +Copyright (c) 2016-2020: Zachary Yedidia, et al. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index 73e2ab77..d1c7548f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Snap Status](https://build.snapcraft.io/badge/zyedidia/micro.svg)](https://build.snapcraft.io/user/zyedidia/micro) Micro is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the full capabilities -of modern terminals. It comes as one single, batteries-included, static binary with no dependencies, and you can download and use it right now. +of modern terminals. It comes as one single batteries-included binary with no dependencies, and you can download and use it right now. As the name indicates, micro aims to be somewhat of a successor to the nano editor by being easy to install and use in a pinch, but micro also aims to be enjoyable to use full time, whether you work in the terminal because you prefer it (like me), or because you need to (over ssh). @@ -16,7 +16,7 @@ Here is a picture of micro editing its source code. ![Screenshot](./assets/micro-solarized.png) -To see more screenshots of micro, showcasing all of the default colorschemes, see [here](http://zbyedidia.webfactional.com/micro/screenshots.html). +To see more screenshots of micro, showcasing some of the default colorschemes, see [here](http://zbyedidia.webfactional.com/micro/screenshots.html). You can also check out the website for Micro at https://micro-editor.github.io. @@ -58,7 +58,9 @@ You can also check out the website for Micro at https://micro-editor.github.io. * Colorscheme support * By default, micro comes with 16, 256, and true color themes. * True color support (set the `MICRO_TRUECOLOR` environment variable to 1 to enable it) -* Copy and paste with the system clipboard +* Copy and paste with the system clipboard (requires xclip/xsel on Linux) +* Built-in diff gutter +* Simple autocompletion * Small and simple * Easily configurable * Macros diff --git a/assets/packaging/micro.1 b/assets/packaging/micro.1 index 4cca6a71..184807be 100644 --- a/assets/packaging/micro.1 +++ b/assets/packaging/micro.1 @@ -119,5 +119,5 @@ and to report any newly encountered bugs you may find. We strive to correct bugs as swiftly as possible. .SH COPYRIGHT -Copyright \(co 2017 Zachary Yedidia, Collin Warren, et al. +Copyright \(co 2020 Zachary Yedidia, et al. See /usr/share/doc/micro/LICENSE and /usr/share/doc/micro/AUTHORS for more information. diff --git a/runtime/syntax/LICENSE b/runtime/syntax/LICENSE index 68f69415..20e978cb 100644 --- a/runtime/syntax/LICENSE +++ b/runtime/syntax/LICENSE @@ -1,6 +1,6 @@ Micro's syntax files are licensed under the MIT "Expat" License: -Copyright (c) 2016: Zachary Yedidia, Collin Warren, et al. +Copyright (c) 2020: Zachary Yedidia, et al. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the