From fb91aa3d1d7625e52d6d45c2ae55e43f2591b4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=9B=E9=99=80=2ERML?= Date: Sat, 1 Nov 2014 21:48:39 +0800 Subject: [PATCH 01/14] Update _config.yml --- _config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index cdb46a3119c80..071adf42305d1 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: 一个java开发程序员，热爱编程.... # 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 From f006791d0393eb05e43af7e68800c951e3215ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=9B=E9=99=80=2ERML?= Date: Sat, 1 Nov 2014 21:52:27 +0800 Subject: [PATCH 02/14] Update about.md --- about.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/about.md b/about.md index db54e4dba16c6..fdd4d76ba5b5c 100644 --- a/about.md +++ b/about.md @@ -1,15 +1,16 @@ --- layout: page -title: About +title: 关于我 permalink: /about/ --- -Some information about you! +刚刚明白自己想做什么，也刚刚明白自己将要做什么，路途漫漫，继续努力 ... +2006 十年光阴，一晃而过 -### More Information +###更多关于我 -A place to include any other types of information that you'd like to include about yourself. +出去写写代码，还喜欢打打球，喜欢美女，:-D -### Contact me +### 联系我 -[email@domain.com](mailto:email@domain.com) \ No newline at end of file +[sshling@gmail.com](mailto:sshling@gmail.com) From bb07335713dc6a80df75d15a72f5ce8f1a2f22e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=9B=E9=99=80=2ERML?= Date: Sat, 1 Nov 2014 21:53:13 +0800 Subject: [PATCH 03/14] Update about.md --- about.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about.md b/about.md index fdd4d76ba5b5c..cce18269c7a65 100644 --- a/about.md +++ b/about.md @@ -5,11 +5,11 @@ permalink: /about/ --- 刚刚明白自己想做什么，也刚刚明白自己将要做什么，路途漫漫，继续努力 ... -2006 十年光阴，一晃而过 +
2006 十年光阴，一晃而过 ###更多关于我 -出去写写代码，还喜欢打打球，喜欢美女，:-D +除去写写代码，还喜欢打打球，喜欢美女，:-D ### 联系我 From 6db8a7a84b2e914654d67fd88a73f4dc0c6657e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=9B=E9=99=80=2ERML?= Date: Sat, 1 Nov 2014 21:57:46 +0800 Subject: [PATCH 04/14] Update 2014-3-3-Hello-World.md --- _posts/2014-3-3-Hello-World.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/_posts/2014-3-3-Hello-World.md b/_posts/2014-3-3-Hello-World.md index c469524e3efa3..26f9eac4fcd47 100644 --- a/_posts/2014-3-3-Hello-World.md +++ b/_posts/2014-3-3-Hello-World.md @@ -1,10 +1,7 @@ --- 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:). - -![_config.yml]({{ site.baseurl }}/images/config.png) - -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 + + +#刚刚开始 From 580fb61c5f77aabeb154f1af2f7e1a63d0ba7311 Mon Sep 17 00:00:00 2001 From: shaoling Date: Wed, 8 Jul 2015 12:45:30 +0800 Subject: [PATCH 05/14] Signed-off-by: shaoling --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From e8ccc17f08d73a355eebf109bf25bf0e6fa6fa5a Mon Sep 17 00:00:00 2001 From: shaoling Date: Wed, 8 Jul 2015 12:46:39 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 8b137891791fe..05b0461cc5fa7 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ - +shaolingweb.cn From bb0eb0ef1dd1080256ca0dc13713f7409fa90723 Mon Sep 17 00:00:00 2001 From: shaoling Date: Wed, 8 Jul 2015 12:46:39 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CNAME | 2 +- _config.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CNAME b/CNAME index 8b137891791fe..05b0461cc5fa7 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ - +shaolingweb.cn diff --git a/_config.yml b/_config.yml index 071adf42305d1..326b24ecced17 100644 --- a/_config.yml +++ b/_config.yml @@ -3,10 +3,10 @@ # # Name of your site (displayed in the header) -name: 邵令 +name: 佛陀(邵令) # Short bio or description (displayed in the header) -description: 一个java开发程序员，热爱编程.... +description: ------>>>> 程序猿 <<<<<------------- # URL of your avatar or profile pic (you could use your GitHub profile pic) avatar: http://www.infoq.com/resource/articles/netty-concurrent-programming-analysis/zh/smallimage/netty_100.png From b4c9164024ceeae989df2c36134a78388ede4e74 Mon Sep 17 00:00:00 2001 From: shaoling Date: Wed, 8 Jul 2015 13:06:16 +0800 Subject: [PATCH 08/14] Signed-off-by: shaoling --- about.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/about.md b/about.md index cce18269c7a65..aded99f398feb 100644 --- a/about.md +++ b/about.md @@ -4,12 +4,13 @@ title: 关于我 permalink: /about/ --- -刚刚明白自己想做什么，也刚刚明白自己将要做什么，路途漫漫，继续努力 ... + + +路途漫漫，继续努力 ...
2006 十年光阴，一晃而过 ###更多关于我 -除去写写代码，还喜欢打打球，喜欢美女，:-D ### 联系我 From 2df0bb19486e2f27a5e893ec3b75462fbc1022c2 Mon Sep 17 00:00:00 2001 From: shaoling Date: Wed, 8 Jul 2015 18:06:17 +0800 Subject: [PATCH 09/14] Signed-off-by: shaoling --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 0e3e137dded24..07baa732f0571 100644 --- a/index.html +++ b/index.html @@ -15,4 +15,5 @@

{{ post.title }}

Read More {% endfor %} - \ No newline at end of file + + From 4769e16e6a692c89be514a78b247912f75b247b6 Mon Sep 17 00:00:00 2001 From: shaoling Date: Wed, 8 Jul 2015 18:26:08 +0800 Subject: [PATCH 10/14] Signed-off-by: shaoling --- _includes/analytics.html | 12 +----------- _posts/2014-3-3-Hello-World.md | 1 + index.html | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) 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 26f9eac4fcd47..eb6c0a306cdee 100644 --- a/_posts/2014-3-3-Hello-World.md +++ b/_posts/2014-3-3-Hello-World.md @@ -5,3 +5,4 @@ title:博文目录 #刚刚开始 +-[github Pages和Jekyll入门](http://www.ruanyifeng.com/blog/2012/08/blogging_with_jekyll.html) diff --git a/index.html b/index.html index 07baa732f0571..977e182cf5761 100644 --- a/index.html +++ b/index.html @@ -16,4 +16,3 @@

{{ post.title }}

{% endfor %} - From 59565d7c86571cb13fb9af384102d281f9671d03 Mon Sep 17 00:00:00 2001 From: shaoling Date: Wed, 8 Jul 2015 18:26:08 +0800 Subject: [PATCH 11/14] Signed-off-by: shaoling --- _includes/analytics.html | 12 +----------- _posts/2014-3-3-Hello-World.md | 1 + _posts/2015-7-8-Nginx.md | 8 ++++++++ index.html | 1 - 4 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 _posts/2015-7-8-Nginx.md 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 26f9eac4fcd47..eb6c0a306cdee 100644 --- a/_posts/2014-3-3-Hello-World.md +++ b/_posts/2014-3-3-Hello-World.md @@ -5,3 +5,4 @@ title:博文目录 #刚刚开始 +-[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/index.html b/index.html index 07baa732f0571..977e182cf5761 100644 --- a/index.html +++ b/index.html @@ -16,4 +16,3 @@

{{ post.title }}

{% endfor %} - From 5fba00fbac6ea22a43a9b7ec2d6eaef9c552786d Mon Sep 17 00:00:00 2001 From: shaoling Date: Fri, 24 Jun 2016 18:55:46 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CNAME => CNAME.bak | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CNAME => CNAME.bak (100%) diff --git a/CNAME b/CNAME.bak similarity index 100% rename from CNAME rename to CNAME.bak From c30a746b683c72088c0da4541e35b05da55e012a Mon Sep 17 00:00:00 2001 From: shaoling Date: Fri, 24 Jun 2016 18:57:56 +0800 Subject: [PATCH 13/14] de --- CNAME.bak | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME.bak diff --git a/CNAME.bak b/CNAME.bak deleted file mode 100644 index 05b0461cc5fa7..0000000000000 --- a/CNAME.bak +++ /dev/null @@ -1 +0,0 @@ -shaolingweb.cn From 01fc44fd806a841d7444b7f3930563a76f292742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=9B=E9=99=80=2ERML?= Date: Sun, 26 Jun 2016 21:45:03 +0800 Subject: [PATCH 14/14] x --- _posts/2014-3-3-Hello-World.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/_posts/2014-3-3-Hello-World.md b/_posts/2014-3-3-Hello-World.md index eb6c0a306cdee..3b71094bf2782 100644 --- a/_posts/2014-3-3-Hello-World.md +++ b/_posts/2014-3-3-Hello-World.md @@ -2,7 +2,10 @@ layout: post title:博文目录 --- - - -#刚刚开始 + + - java +importnew(http://www.importnew.com) + + + -[github Pages和Jekyll入门](http://www.ruanyifeng.com/blog/2012/08/blogging_with_jekyll.html)