From 2de3d688948eb5c437b308a2c124b8dcadff1f2e Mon Sep 17 00:00:00 2001
From: Dylan <dyl@tfwno.gf>
Date: Sat, 5 Mar 2016 09:30:53 +1100
Subject: [PATCH] Merge 'text colors' and 'text formatting' headings in help,
 makefile and readme

---
 README.md  | 7 +++----
 neofetch   | 7 +++----
 neofetch.1 | 5 +----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 276b7997..85b23035 100644
--- a/README.md
+++ b/README.md
@@ -262,12 +262,11 @@ alias fetch2="fetch \
     --birthday_shorthand on/off Shorten the output of birthday
     --birthday_time on/off      Enable/Disable showing the time in birthday output
 
-    Text Colors:
-    --colors x x x x x x        Changes the text colors in this order:
-                                title, @, underline, subtitle, colon, info
 
     Text Formatting:
-    --underline_char char       Character to use when underlineing title
+    --colors x x x x x x        Changes the text colors in this order:
+                                title, @, underline, subtitle, colon, info
+    --underline_char char       Character to use when underlining title
     --line_wrap on/off          Enable/Disable line wrapping
     --bold on/off               Enable/Disable bold text
     --prompt_height num         Set this to your prompt height to fix issues with
diff --git a/neofetch b/neofetch
index 4d5291b5..5e5e47bb 100755
--- a/neofetch
+++ b/neofetch
@@ -2301,12 +2301,11 @@ usage () { cat << EOF
     --birthday_shorthand on/off Shorten the output of birthday
     --birthday_time on/off      Enable/Disable showing the time in birthday output
 
-    Text Colors:
-    --colors x x x x x x        Changes the text colors in this order:
-                                title, @, underline, subtitle, colon, info
 
     Text Formatting:
-    --underline_char char       Character to use when underlineing title
+    --colors x x x x x x        Changes the text colors in this order:
+                                title, @, underline, subtitle, colon, info
+    --underline_char char       Character to use when underlining title
     --line_wrap on/off          Enable/Disable line wrapping
     --bold on/off               Enable/Disable bold text
     --prompt_height num         Set this to your prompt height to fix issues with
diff --git a/neofetch.1 b/neofetch.1
index 841bd837..9b743d1d 100644
--- a/neofetch.1
+++ b/neofetch.1
@@ -75,14 +75,11 @@ Shorten the output of birthday
 .B \--birthday_time 'on/off'
 Enable/Disable showing the time in birthday output
 
-.SH TEXT COLORS
+.SH TEXT FORMATTING
 .TP
 .B \--colors x x x x x x
 Changes the text colors in this order:
 title, @, underline, subtitle, colon, info
-
-.SH TEXT FORMATTING
-.TP
 .B \--underline_char 'char'
 Character to use when underlining title
 .TP