Merge branch 'master' of https://github.com/Hackerpilot/DCD

editors/vim/README.md

@@ -42,6 +42,7 @@ Be sure that the following option is set in your .vimrc:
 ```vim
 set omnifunc=syntaxComplete#complete
 ```
+If you do not do this, omni-complete will not know to use DCD.
 
 Usage
 =====
@@ -67,11 +68,6 @@ under the cursor.
 When the server is running, use the `DCDsymbolLocation` to print jump to the
 declaration of the symbol under the cursor.
 
-Conflicts
-=========
-This plugin conflicts with the DScanner plugin, as both use the `dcomplete`
-autoload namespace and the `dcomplete#Complete` function - as per Vim's
-conventions.
 
 Configuration
 =============

modulecache.d

@@ -194,7 +194,7 @@ struct ModuleCache
 
 	/**
 	 * Params:
-	 *     moduleName the name of the module being imported, in "a/b/c" style
+	 *     moduleName = the name of the module being imported, in "a/b/c" style
 	 * Returns:
 	 *     The absolute path to the file that contains the module, or null if
 	 *     not found.