diff --git a/.gitignore b/.gitignore
index 6060515495e7f..8a341be9da820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@ _site
Gemfile
Gemfile.lock
node_modules
-package.json
\ No newline at end of file
+package.json
+/.settings/
+/.project
diff --git a/CNAME b/CNAME
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/_config.yml b/_config.yml
index cdb46a3119c80..6db1ab35cc79f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,13 +3,13 @@
#
# Name of your site (displayed in the header)
-name: Your Name
+name: 佛陀(邵令)
# Short bio or description (displayed in the header)
-description: Web Developer from Somewhere
+description: ------>>>> 程序猿 <<<<<-------------
# URL of your avatar or profile pic (you could use your GitHub profile pic)
-avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/jekyll-logo.png
+avatar: http://www.infoq.com/resource/articles/netty-concurrent-programming-analysis/zh/smallimage/netty_100.png
#
# Flags below are optional
@@ -18,15 +18,14 @@ avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/je
# Includes an icon in the footer for each username you enter
footer-links:
dribbble:
- email:
+ email: sshling@gmail.com
+ infoq:http://www.infoq.com/cn
facebook:
flickr:
- github: barryclark/jekyll-now
instagram:
linkedin:
pinterest:
rss: # just type anything here for a working RSS icon, make sure you set the "url" above!
- twitter: jekyllrb
stackoverflow: # your stackoverflow profile, e.g. "users/50476/bart-kiers"
# Your disqus shortname, entering this will enable commenting on posts
diff --git a/_includes/analytics.html b/_includes/analytics.html
index d8cdc0ec09cb5..5720eebf7c562 100644
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -1,13 +1,3 @@
{% if site.google_analytics %}
-
-
-
+
{% endif %}
diff --git a/_posts/2014-3-3-Hello-World.md b/_posts/2014-3-3-Hello-World.md
index c469524e3efa3..3b71094bf2782 100644
--- a/_posts/2014-3-3-Hello-World.md
+++ b/_posts/2014-3-3-Hello-World.md
@@ -1,10 +1,11 @@
---
layout: post
-title: You're up and running!
+title:博文目录
---
-Next you can update your site name, avatar and other options using the _config.yml file in the root of your repository (shown below :point_down:).
+ - java
+importnew(http://www.importnew.com)
-
-The easiest way to make your first post is to edit this one. Go into /_posts/ and update the Hello World markdown file. For more instructions head over to the [Jekyll Now repository](https://github.com/barryclark/jekyll-now) on GitHub.
\ No newline at end of file
+
+-[github Pages和Jekyll入门](http://www.ruanyifeng.com/blog/2012/08/blogging_with_jekyll.html)
diff --git a/_posts/2015-7-8-Nginx.md b/_posts/2015-7-8-Nginx.md
new file mode 100644
index 0000000000000..204416c138b14
--- /dev/null
+++ b/_posts/2015-7-8-Nginx.md
@@ -0,0 +1,8 @@
+---
+layout: post
+title:Nginx介绍
+---
+
+
+#刚刚开始
+ Nginx介绍
\ No newline at end of file
diff --git a/about.md b/about.md
index db54e4dba16c6..aded99f398feb 100644
--- a/about.md
+++ b/about.md
@@ -1,15 +1,17 @@
---
layout: page
-title: About
+title: 关于我
permalink: /about/
---
-Some information about you!
-### More Information
-A place to include any other types of information that you'd like to include about yourself.
+路途漫漫,继续努力 ...
+ 2006 十年光阴,一晃而过
-### Contact me
+###更多关于我
-[email@domain.com](mailto:email@domain.com)
\ No newline at end of file
+
+### 联系我
+
+[sshling@gmail.com](mailto:sshling@gmail.com)
diff --git a/index.html b/index.html
index 0e3e137dded24..977e182cf5761 100644
--- a/index.html
+++ b/index.html
@@ -15,4 +15,4 @@