diff options
| author | Bozhidar Batsov <bozhidar@batsov.com> | 2016-04-10 09:29:38 -0700 |
|---|---|---|
| committer | Bozhidar Batsov <bozhidar@batsov.com> | 2016-04-10 09:29:38 -0700 |
| commit | b9dd471703f2296beea0b6ac16eb27adfd961462 (patch) | |
| tree | 456cc77a3a1f52bb08f3be5545edb1ea9d55c099 /doc/configuration.md | |
| parent | 740db881f638d5a62251bf3e03b1aa326cc3b5d3 (diff) | |
Improve a bit the wording in the auto-completion section of the manual
Diffstat (limited to 'doc/configuration.md')
| -rw-r--r-- | doc/configuration.md | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/doc/configuration.md b/doc/configuration.md index d996cd72..4561080b 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -254,6 +254,9 @@ the time of this writing it's still in development). #### Migrating from `auto-complete-mode` +In case you have some `auto-complete-mode` configuration lying around and you +want to switch to `company-mode` there are a few steps you have to take: + * Disable `ac-cider-setup` or `ac-nrepl-setup` from running on CIDER hooks * Remove `cider-mode` and `cider-repl-mode` from the `ac-modes` list @@ -261,14 +264,14 @@ the time of this writing it's still in development). #### Completion annotations Completion candidates will be annotated by default with an abbreviation -corresponding to their type, and (contextually) their ns. The function used to -format the annotation can be configured by `cider-annotate-completion-function.` -The abbreviations used are configured by `cider-completion-annotations-alist` -and the context in which their namespace is included is configured by -`cider-completion-annotations-include-ns.` +corresponding to their type, and (contextually) their namespace. The function +used to format the annotation can be configured by +`cider-annotate-completion-function.` The abbreviations used are configured by +`cider-completion-annotations-alist` and the context in which their namespace is +included is configured by `cider-completion-annotations-include-ns.` Completion annotations can be disabled by setting -`cider-annotate-completion-candidates` to nil. +`cider-annotate-completion-candidates` to `nil`.  |