Merge remote-tracking branch 'dubbo-docs/master'
diff --git a/.gitignore b/.gitignore
index 01ff673..59f507d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,30 @@
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
+# maven ignore
+target/
 *.jar
 *.war
-*.ear
+*.zip
+*.tar
+*.tar.gz
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# eclipse ignore
+.settings/
+.project
+.classpath
 
-.idea
+# idea ignore
+.idea/
+*.ipr
 *.iml
+*.iws
+
+# temp ignore
+*.log
+*.cache
+*.diff
+*.patch
+*.tmp
+
+# system ignore
+.DS_Store
+Thumbs.db
+