From 09d3cf12900ef0e3996dce9a0960b8b1705637eb Mon Sep 17 00:00:00 2001
From: Reed Esau <reed@esau.org>
Date: Sun, 19 Jan 2014 12:46:02 -0700
Subject: [PATCH] shorten and fix a few names

---
 README.markdown  | 21 +++++++++------------
 plugin/wordy.vim | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/README.markdown b/README.markdown
index 20f6f9d..02429aa 100644
--- a/README.markdown
+++ b/README.markdown
@@ -35,7 +35,7 @@ literature on usage (Strunk and White, e.g.).
 
 ## Requirements
 
-May require a recent version of Vim.
+_wordy_ may require a recent version of Vim.
 
 ## Installation
 
@@ -51,10 +51,10 @@ Important note: on the first use of each of the plugin’s dictionaries,
 a spell file will be built. This produces a message that resembles:
 
 ```
-Reading word file /Users/reede/.vim/bundle/vim-wordy/data/en/cred.dic ...
+Reading word file /Users/reede/.vim/bundle/vim-wordy/data/en/weasel.dic ...
 Compressing word tree...
 Compressed 618 of 1738 nodes; 1120 (64%) remaining
-Writing spell file /Users/reede/.vim/bundle/vim-wordy/spell/cred.en.utf-8.spl ...
+Writing spell file /Users/reede/.vim/bundle/vim-wordy/spell/weasel.en.utf-8.spl ...
 Done!
 Estimated runtime memory use: 5600 bytes
 Press ENTER or type command to continue
@@ -65,9 +65,8 @@ least until it needs to build again.
 
 ## Commands
 
-You can switch _wordy_ on and off. You’ll use the commands described below
-to enable it. To disable and restore your previous spell environment,
-enter the command:
+You’ll use the commands that follow to enable _wordy_. To disable it and
+restore your previous spell environment, enter the command:
 
 ```
 :NoWordy
@@ -130,7 +129,7 @@ targeted by _ProblemWordy_.
 
 ```
 :PuffWordy
-:JargoneseWordy
+:JargWordy
 ```
 
 Instead of puffery, demonstrate through details.
@@ -168,9 +167,7 @@ of the verb to be.
 ### Colloquialisms, Idioms, and Similies
 
 ```
-:ColloquialWordy
-:IdiomaticWordy
-:LikeWordy
+:TriteWordy
 ```
 
 Dictionaries for uncovering the tired cliché.
@@ -179,14 +176,14 @@ Dictionaries for uncovering the tired cliché.
 
 ```
 :SaidWordy
-:OpinionatedWordy
+:OpineWordy
 :TimeWordy
 ```
 
 A few dictionaries to serve specific needs.
 
 If you’re writing to be neutral, you will want to avoid editorializing
-your use of ‘said’ and other words.
+(_OpineWordy_) and loaded use ‘said’ (_SaidWordy_).
 
 _TimeWordy_ finds where you are using general descriptions of time where
 you could be more specific.
diff --git a/plugin/wordy.vim b/plugin/wordy.vim
index c2b3eec..2bb6d70 100644
--- a/plugin/wordy.vim
+++ b/plugin/wordy.vim
@@ -18,29 +18,30 @@ let g:wordy_dir = fnamemodify(resolve(expand('<sfile>:p')), ':h:h')
 
 command -nargs=0 NoWordy           call wordy#init({})
 command -nargs=0 BeingWordy        call wordy#init({ 'd': ['being',] })
-command -nargs=0 ColloquialWordy   call wordy#init({ 'd': ['colloquial',] })
-command -nargs=0 WeaselWordy       call wordy#init({ 'd': ['weasel',] })
-command -nargs=0 IdiomaticWordy    call wordy#init({ 'd': ['idiomatic',] })
-command -nargs=0 JargoneseWordy    call wordy#init({ 'd': ['jargonese',] })
+command -nargs=0 JargWordy         call wordy#init({ 'd': ['jargonese',] })
 command -nargs=0 LazyWordy         call wordy#init({ 'd': ['weak-and-lazy',] })
-command -nargs=0 LikeWordy         call wordy#init({ 'd': ['similies',] })
-command -nargs=0 OpinionatedWordy  call wordy#init({ 'd': ['opinionated',] })
+command -nargs=0 OpineWordy        call wordy#init({ 'd': ['opinion',] })
 command -nargs=0 ProblemWordy      call wordy#init({ 'd': ['problematic',] })
 command -nargs=0 PuffWordy         call wordy#init({ 'd': ['puffery',] })
 command -nargs=0 SaidWordy         call wordy#init({ 'd': ['said-synonyms',] })
 command -nargs=0 TimeWordy         call wordy#init({ 'd': ['non-spec-time',] })
+command -nargs=0 WeaselWordy       call wordy#init({ 'd': ['weasel',] })
 command -nargs=0 WordyWordy        call wordy#init({ 'd': ['redundant',] })
 
+command -nargs=0 TriteWordy        call wordy#init({ 'd': [ 'colloquial', 'idiomatic', 'similies',] })
+
 command -nargs=0 Wordy call wordy#init({ 'd': [ 'being',
                                               \ 'colloquial',
                                               \ 'idiomatic',
                                               \ 'jargonese',
-                                              \ 'manipulative',
-                                              \ 'opinionated',
+                                              \ 'weasel',
+                                              \ 'opinion',
                                               \ 'puffery',
                                               \ 'redundant',
+                                              \ 'similies',
                                               \ 'weak-and-lazy',
-                                              \ ])
+                                              \ ]})
+
 
 let &cpo = s:save_cpo
 unlet s:save_cpo