Merge branch 'tmgstevens-twitter' into trunk

[flume.git] / README.md

diff --git a/README.md b/README.md
index 7198a65bc64663d8a4239c8c57d8a5cd23ba2b84..f7daa79f118bccc47fc64b420a6ca423ded6614f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ In source form, it can be found in the flume-ng-doc directory.
 
 The Flume 1.x guide and FAQ are available here:
 
-* https://cwiki.apache.org/FLUME/flume-ng.html
+* https://cwiki.apache.org/FLUME
 * https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
 
 ## Contact us!
@@ -55,13 +55,13 @@ Bug and Issue tracker.
 
 Compiling Flume requires the following tools:
 
-* Oracle Java JDK 1.7
+* Oracle Java JDK 1.8
 * Apache Maven 3.x
 
 Note: The Apache Flume build requires more memory than the default configuration.
 We recommend you set the following Maven options:
 
-export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
+`export MAVEN_OPTS="-Xms512m -Xmx1024m"`
 
 To compile Flume and build a distribution tarball, run `mvn install` from the
 top level directory. The artifacts will be placed under `flume-ng-dist/target/`.