This closes #816

docs/hacking-guide/en/formatting.md

@@ -4,7 +4,7 @@ Eclipse code formatting and (basic) project configuration files can be found at
 copy them _after importing all your projects_:
 
     for settings_dir in `find . -type d -name .settings`; do
-       \cp -v etc/ide-settings/org.eclipse.jdt.* $settings_dir
+       \cp -v etc/ide-settings/eclipse/org.eclipse.jdt.* $settings_dir
     done
 
 Do not use the [maven-eclipse-plugin](https://maven.apache.org/plugins/maven-eclipse-plugin/) to copy the files as it 

docs/hacking-guide/en/ide.md

@@ -1,6 +1,6 @@
 # IDE Integration
 
-There a few files useful for IDE integration under ./etc/ide-settings on a checked out folder. This folder is not part of the source distribution can it can be easily obtained:
+There a few files useful for IDE integration under ./etc/ide-settings on a checked out folder. This folder is not part of the source distribution, but it can be easily obtained:
 
 - https://github.com/apache/activemq-artemis/tree/master/etc/ide-settings
 
@@ -41,7 +41,7 @@ There's a [SOF Question](http://stackoverflow.com/questions/27906481/can-intelli
 We have shared the style templates that are good for this project. If you want to apply them use these steps:
 
 * File->Import Settings
-* Select the file under ./artemis-cloned-folder/etc/ide-settings/IDEA-style.jar
+* Select the file under ./artemis-cloned-folder/etc/ide-settings/idea/IDEA-style.jar
 * Select both Code Style Templates and File templates (it's the default option)
 * Select OK and restart Idea
 
@@ -50,7 +50,7 @@ Alternatively you can copy artemis-codestyle.xml under your home settings at ``I
 #### To import inspection settings:
 
 * File->Settings->Editor->Inspections->Manage->Import
-* Select the file ./artemis-cloned-folder/etc/ide-settings/IDEA-artemis-inspections.xml
+* Select the file ./artemis-cloned-folder/etc/ide-settings/idea/artemis-inspections.xml
 * Select OK
 
 ### Issue: My JUnit tests are not runnable with in the IDE.

etc/ide-settings/README.md

@@ -3,4 +3,4 @@
 
 Include any files that are specific to IDE such as settings, etc.
 
-These directory is ignored from the source release, so they will only be available through the source repository checkout or clone.
+These directories are ignored from the source release, so they will only be available through the source repository checkout or clone.

etc/ide-settings/eclipse/org.eclipse.jdt.core.prefs

@@ -115,11 +115,11 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
@@ -135,7 +135,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
 org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
 org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
 org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert