rename :EclimSettings to :WorkspaceSettings

doc/content/archive/changes.rst

@@ -375,7 +375,7 @@ Java:
     signatures.
   - Updated :ref:`:JavaImport` and :JavaImportSort to honor eclipse's
     import order preference and added the ability to edit that preference via
-    :ref:`:ProjectSettings` and :ref:`:EclimSettings`.
+    :ref:`:ProjectSettings` and **:EclimSettings**.
   - Added initial :doc:`refactoring </vim/java/refactor>` support.
 
 :gitlog:`Git Log (1.5.2) <1.5.1...1.5.2>`
@@ -442,7 +442,7 @@ Ruby:
 
 Java:
   - Added ability to configure java indentation globally via
-    :ref:`:EclimSettings` or per project using :ref:`:ProjectSettings`.
+    **:EclimSettings** or per project using :ref:`:ProjectSettings`.
 
 :gitlog:`Git Log (1.5.0) <1.4.9...1.5.0>`
 
@@ -1204,7 +1204,7 @@ Eclipse:
 
 Eclim:
   - Added support for global settings/preferences via new
-    :ref:`:EclimSettings <:EclimSettings>` command.
+    **:Settings** command.
 
 Java:
   - Delegate method creation.

doc/content/cheatsheet.rst

@@ -25,7 +25,8 @@ Global Commands
 
 - :ref:`:PingEclim <:PingEclim>` - Pings eclimd server.
 - :ref:`:ShutdownEclim <:ShutdownEclim>` - Shuts down eclimd server.
-- :ref:`:EclimSettings <:EclimSettings>` - View / edit global settings.
+- :ref:`:WorkspaceSettings <:WorkspaceSettings>` -
+  View / edit global workspace settings.
 - :ref:`:EclimDisable <:EclimDisable>` -
   Temporarily disables communication with eclimd.
 - :ref:`:EclimEnable <:EclimEnable>` - Re-enables communication with eclimd.

doc/content/vim/core/eclim.rst

@@ -1,4 +1,4 @@
-.. Copyright (C) 2005 - 2013  Eric Van Dewoestine
+.. Copyright (C) 2005 - 2014  Eric Van Dewoestine
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,12 +31,12 @@ Commands
 - **:ShutdownEclim** -
   Shuts down the current running eclimd instance.
 
-.. _\:EclimSettings:
+.. _\:WorkspaceSettings:
 
-- **:EclimSettings** -
-  Allows you to view / edit the global :doc:`settings </vim/settings>`.
-  For project level settings see the :ref:`:ProjectSettings` command on the
-  :doc:`project documentation page </vim/core/project>`.
+- **:WorkspaceSettings** -
+  Allows you to view / edit the global workspace :doc:`settings
+  </vim/settings>`. For project level settings see the :ref:`:ProjectSettings`
+  command on the :doc:`project documentation page </vim/core/project>`.
 
 .. _\:EclimDisable:
 

doc/content/vim/settings.rst

@@ -1,6 +1,6 @@
 :orphan:
 
-.. Copyright (C) 2005 - 2012  Eric Van Dewoestine
+.. Copyright (C) 2005 - 2014  Eric Van Dewoestine
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,21 +23,21 @@ settings.
 
 There are two types of settings available:
 
-- **Eclim global / project settings.**
+- **Global workspace / project settings.**
 
   These are settings that reside in your Eclipse workspace and are used to
-  control certain aspects of the eclim server's behavior.  These settings
+  control certain aspects of the eclim server's behavior. These settings
   can be viewed and modified using one of the following commands:
 
-  - :ref:`:EclimSettings`
+  - :ref:`:WorkspaceSettings`
   - :ref:`:ProjectSettings`
 
 - **Vim global variable settings.**
 
   These are your typical global Vim variables which can be set within your
   vimrc file.
 
-Givin these two types, you may be ask, why do we need two? Or, when a new
+Given these two types, you may be ask, why do we need two? Or, when a new
 setting is added, how do you decide which type to make it?
 
 The reasoning behind having two types is that there are some settings that may

org.eclim.adt/test/vunit/eclim/autoload/eclim/androidTest.vim

@@ -32,7 +32,7 @@ function! TestAndroidReload() " {{{
 endfunction " }}}
 
 function! TestAndroidSdkSetting() " {{{
-  EclimSettings
+  WorkspaceSettings
   call cursor(1, 1)
 
   call vunit#AssertTrue(

org.eclim.core/test/vunit/eclim/autoload/eclimTest.vim

@@ -52,7 +52,7 @@ function! TestPing() " {{{
 endfunction " }}}
 
 function! TestSettings() " {{{
-  exec 'EclimSettings ' . g:TestEclimWorkspace
+  exec 'WorkspaceSettings ' . g:TestEclimWorkspace
   call vunit#AssertEquals('Eclim_Global_Settings', expand('%'),
     \ "Didn't open settings window.")
   close

org.eclim.core/vim/eclim/autoload/eclim.vim

@@ -307,7 +307,7 @@ function! eclim#Settings(workspace) " {{{
     call add(content, '# }')
   endif
 
-  call eclim#util#TempWindow("Eclim_Global_Settings", content)
+  call eclim#util#TempWindow("Workspace_Settings", content)
   setlocal buftype=acwrite
   setlocal filetype=jproperties
   setlocal noreadonly

org.eclim.core/vim/eclim/plugin/eclim.vim

@@ -9,7 +9,7 @@
 "
 " License:
 "
-" Copyright (C) 2005 - 2013  Eric Van Dewoestine
+" Copyright (C) 2005 - 2014  Eric Van Dewoestine
 "
 " This program is free software: you can redistribute it and/or modify
 " it under the terms of the GNU General Public License as published by
@@ -147,9 +147,9 @@ endif
 if !exists(":ShutdownEclim")
   command ShutdownEclim :call eclim#ShutdownEclim()
 endif
-if !exists(":EclimSettings")
+if !exists(":WorkspaceSettings")
   command -nargs=? -complete=customlist,eclim#client#nailgun#CommandCompleteWorkspaces
-    \ EclimSettings :call eclim#Settings('<args>')
+    \ WorkspaceSettings :call eclim#Settings('<args>')
 endif
 if !exists(":EclimDisable")
   command EclimDisable :call eclim#Disable()

org.eclim.jdt/vim/eclim/autoload/eclim/java/junit.vim

@@ -126,7 +126,7 @@ function! eclim#java#junit#JUnitResult(test) " {{{
   if path == ''
     call eclim#util#EchoWarning(
       \ "Output directory setting for 'junit' not set. " .
-      \ "Use :EclimSettings or :ProjectSettings to set it.")
+      \ "Use :WorkspaceSettings or :ProjectSettings to set it.")
     return
   endif
 
@@ -239,7 +239,7 @@ function! eclim#java#junit#CommandCompleteResult(argLead, cmdLine, cursorPos) "
   if path == ''
     call eclim#util#EchoWarning(
       \ "Output directory setting for 'junit' not set. " .
-      \ "Use :EclimSettings or :ProjectSettings to set it.")
+      \ "Use :WorkspaceSettings or :ProjectSettings to set it.")
     return []
   endif