no clue what happened when I just merged branches

[charsel.git] / README.md

diff --git a/README.md b/README.md
index 2fd4ae920076334e2afd16597e122d57759cdda8..c5aaa701f8ced0962e9ddfb5ba043aae5776e990 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,9 +4,8 @@ A very simple shell script to make copying frequently used special characters to
 It uses a plain-text file known as a "charfile" to define shortcuts to special characters that are easy to access on the keyboard.
 
 ## Installation
-Running the INSTALL.sh script should work fine for most people.
-
-If it is run as root or with sudo, the program and charfiles will be installed for all users. If it is run without elevated privileges, it will just be installed for the local user.
+Run `make install` as root to install  
+Run `make uninstall` as root to remove. Will not delete your personal charfiles
 
 ## Dependencies
   * Posix shell  
@@ -28,6 +27,9 @@ Make a new file in `~/.local/share/charsel/` or `/usr/share/charsel` with the na
 Fill it in, using the provided examples as a template. Hidden shortcuts go above the '---'
 
 ## LICENSE
-charfile is GPLv3 licensed, see COPYING for more information
+Charfile is GNU GPLv3 licensed, see COPYING for more information
  
-charfile is written by [Armaan Bhojwani)](https://armaan.bhojwani.org ) [Email](mailto:3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me)
+Charfile is written by [Armaan Bhojwani](https://armaan.bhojwani.org), [Email](mailto:3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me)
+
+## BRANCHES
+Development happens on the "development" branch, which then gets merged into the "master" branch once its ready for a stable release