tesanchez
diff --git a/‎CONTRIBUTING.md‎
Lines changed: 5 additions & 43 deletions b/‎CONTRIBUTING.md‎
Lines changed: 5 additions & 43 deletions
@@ -5,8 +5,8 @@
 Before starting to work on something, please comment in JIRA or ask on the mailing list
 to make sure nobody else is working on it.
 
-If a fix applies to 2.1 and 3.0, work on the 2.1 branch, your commit will eventually
-get merged in 3.0. Other branches (2.0 and 2.2) are now discontinued.
+If your fix applies to multiple branches, base your work on the lowest active branch
+(2.1 at the time of writing, but ask for confirmation). We regularly merge changes downstream.
 
 Before you send your pull request, make sure that:
 
@@ -24,46 +24,8 @@ in-depth knowledge of the codebase.
 
 ## Editor configuration
 
-### General
-
-We consider automatic formatting as a help, not a crutch. Sometimes it makes sense to
-break the rules to make the code more readable, for instance aligning columns (see the
-constant declarations in `DataType.Name` for an example of this).
-
-**Please do not reformat whole files, only the lines that you have added or modified**.
-
-
-### Eclipse
-
-Formatter:
-
-- Preferences > Java > Code Style > Formatter.
-- Click "Import".
-- Select `src/main/config/ide/eclipse-formatter.xml`.
-
-Import order:
-
-- Preferences > Java > Code Style > Organize imports.
-- Click "Import".
-- Select `src/main/config/ide/eclipse.importorder`.
-
-Prevent trailing whitespaces:
-
-- Preferences > Java > Editor > Save Actions.
-- Check "Perform the selected actions on save".
-- Ensure "Format source code" and "Organize imports" are unchecked.
-- Check "Additional actions".
-- Click "Configure".
-- In the "Code Organizing" tab, check "Remove trailing whitespace" and "All lines".
-- Click "OK" (the text area should only have one action "Remove trailing white spaces").
-
-
-### IntelliJ IDEA
-
-- File > Import Settings...
-- Select `src/main/config/ide/intellij-code-style.jar`.
-
-This should add a new Code Style scheme called "java-driver".
+We use IntelliJ IDEA with the default formatting options. Please format your code and
+organize imports before submitting your changes.
 
 ## Running the tests
 
@@ -90,7 +52,7 @@ Two Maven properties control its execution:
 
 
 CCM launches multiple Cassandra instances on localhost by binding to different addresses. The
-driver uses up to 6 different instances (127.0.1.1 to 127.0.1.6 with the default prefix).
+driver uses up to 10 different instances (127.0.1.1 to 127.0.1.10 with the default prefix).
 You'll need to define loopback aliases for this to work, on Mac OS X your can do it with:
 
 ```