add and update post, add _drafts

vgist · Jun 12, 2020 · 16a3230 · 16a3230
1 parent 8ff2d97
commit 16a3230
Show file tree

Hide file tree

Showing 148 changed files with 1,698 additions and 925 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/CNAME b/CNAME
@@ -1 +1 @@
-havee.me
+havee.me
diff --git a/README.md b/README.md
@@ -1,10 +1,8 @@
-[![Build Status](https://travis-ci.org/iHavee/iHavee.github.io.svg?branch=sources)](https://travis-ci.org/iHavee/iHavee.github.io)
-
 ### Generic
 
-#### require:
+#### Requirement:
 
-- jekyll >= 3.0.3
+- jekyll >= 3.9.0
 - jekyll-paginate >= 1.1.0
 
 #### Create new post
@@ -17,7 +15,7 @@
 
     rake page name='about.html'
 
-#### Define your color
+#### Define colour
 
 Edit the file:  `assets/_sass/_custom.scss`
 
@@ -36,7 +34,6 @@ Then, follow tips to do
     docker exec -ti jekyll rake post title='A Title'
     or
     docker exec -ti jekyll rake post title="A Title" [date="2012-02-09"] [tags=[tag1,tag2]] [category="category"]
-    ...
 
 #### License
 

diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,6 @@
 # Site settings
 title: "Havee's Space"
-url: "//havee.me"
+url: "https://havee.me"
 paginate: 5
 author:
     name: Havee
@@ -11,17 +11,16 @@ author:
     facebook:
     googleplus:
     weibo:
-atom_path: /atom.xml
 rss_path: /rss.xml
 
 # Build settings
 kramdown:
     input: GFM
 permalink: /:categories/:year-:month/:title.html
-gems: [jekyll-paginate]
+plugins: [jekyll-paginate]
 exclude: [Gemfile, Gemfile.lock, qrsync, Rakefile, README.md, docker-compose.yml]
 assets_path: /assets
-cdn: "//cdn.09hd.com"
+cdn:
 sass:
     sass_dir: assets/_sass
     style: :compressed
@@ -47,7 +46,7 @@ comments:
 # 网站统计
 analytics:
     baidu:
-        siteid: 625169d97c95b10732a31bbe33aa305d        # 百度统计 js 代码后的字符串
+        siteid:         # 百度统计 js 代码后的字符串
 webmaster:
     baidu:
         verify: BvD3CNBzK6

diff --git a/_data/blogroll.json b/_data/blogroll.json
@@ -12,11 +12,7 @@
         "url": "//blog.woodelf.org"
     },
     {
-        "title": "Don't forget your dreams!",
-        "url": "http://www.李森辉.cn"
-    },
-    {
-        "title": "天道总司",
-        "url": "http://zhaoyuxiang.cn"
+        "title": "华米兹之家",
+        "url": "//zhaoyuxiang.cn"
     }
 ]
diff --git a/...3-07-04-add-baidu-analytics-for-jekyll.md → _drafts/add-baidu-analytics-for-jekyll.md b/...3-07-04-add-baidu-analytics-for-jekyll.md → _drafts/add-baidu-analytics-for-jekyll.md
diff --git a/...65065-on-windows-and-linux-dual-system.md → ...65065-on-windows-and-linux-dual-system.md b/...65065-on-windows-and-linux-dual-system.md → ...65065-on-windows-and-linux-dual-system.md
diff --git a/_posts/2012-03-28-ccal-2-5-3.md → _drafts/ccal-2-5-3.md b/_posts/2012-03-28-ccal-2-5-3.md → _drafts/ccal-2-5-3.md
@@ -5,7 +5,7 @@ category: Linux
 tags: [ccal, Gentoo, Ebuild, Packager]
 ---
 
-![Ccal]({{ site.cdn }}/images/2012/03/ccal.png "ccal")
+![Ccal](/cdn/images/2012/03/ccal.png "ccal")
 
 2012 年 3 月 4 日，从 2.5.2 到 2.5.3 的改动：
 

diff --git a/.../2013-02-05-colleagues-encounter-thief.md → _drafts/colleagues-encounter-thief.md b/.../2013-02-05-colleagues-encounter-thief.md → _drafts/colleagues-encounter-thief.md
diff --git a/_posts/2011-08-11-ctrl-alt-bksp-tty.md → _drafts/ctrl-alt-bksp-tty.md b/_posts/2011-08-11-ctrl-alt-bksp-tty.md → _drafts/ctrl-alt-bksp-tty.md
diff --git a/_posts/2011-11-03-deadbeef-gb18030.md → _drafts/deadbeef-gb18030.md b/_posts/2011-11-03-deadbeef-gb18030.md → _drafts/deadbeef-gb18030.md
@@ -5,7 +5,7 @@ category: Linux
 tags: [DeadBeef, Patch]
 ---
 
-![DeadBeef]({{ site.cdn }}/images/2011/11/deadbeef.png "DeadBeef")
+![DeadBeef](/cdn/images/2011/11/deadbeef.png "DeadBeef")
 
 用了 linux 平台的同学自然知道，音乐的 id 信息与 windows 平台有些不兼容，这是由于大陆 M$ windows 平台采用的是 gb2312 编码，而 linux 采用的是 UTF-8 编码，由此，在 linux 下播放 windows 平台下的音乐文件，id 信息自然就乱码了。
 

diff --git a/...14-03-14-domain-redirect-by-javascript.md → _drafts/domain-redirect-by-javascript.md b/...14-03-14-domain-redirect-by-javascript.md → _drafts/domain-redirect-by-javascript.md
@@ -38,13 +38,13 @@ JavaScript:
 
 测试 JavaScript 时，可以直接使用浏览器的控制台，譬如 Firefox 中 Web开发者中的 web控制台，就可以使用
 
-![Web Console]({{ site.cdn }}/images/2014/03/web-console.png)
+![Web Console](/cdn/images/2014/03/web-console.png)
 
-![Javascript]({{ site.cdn }}/images/2014/03/javascript.png)
+![Javascript](/cdn/images/2014/03/javascript.png)
 
 打开 Firefox 的web控制台，可以随心所欲的输入测试，更棒的是，还有自动补全，不怕打错
 
-![Completion]({{ site.cdn }}/images/2014/03/completion.png)
+![Completion](/cdn/images/2014/03/completion.png)
 
     print(window.location.host);
     "havee.me"

diff --git a/_posts/2013-08-31-domain-transfers.md → _drafts/domain-transfers.md b/_posts/2013-08-31-domain-transfers.md → _drafts/domain-transfers.md
diff --git a/...-04-10-dual-boot-windows-81-and-gentoo.md → _drafts/dual-boot-windows-81-and-gentoo.md b/...-04-10-dual-boot-windows-81-and-gentoo.md → _drafts/dual-boot-windows-81-and-gentoo.md
diff --git a/...9-10-fontconfig-version-bump-to-2-10-1.md → _drafts/fontconfig-version-bump-to-2-10-1.md b/...9-10-fontconfig-version-bump-to-2-10-1.md → _drafts/fontconfig-version-bump-to-2-10-1.md
diff --git a/_posts/2012-05-23-gcc-ofast.md → _drafts/gcc-ofast.md b/_posts/2012-05-23-gcc-ofast.md → _drafts/gcc-ofast.md
diff --git a/_posts/2015-06-08-gentoo-overlay.md → _drafts/gentoo-overlay.md b/_posts/2015-06-08-gentoo-overlay.md → _drafts/gentoo-overlay.md
@@ -16,7 +16,7 @@ layman 是 Gentoo 下的一款管理第三方 overlay 工具，通过 layman 可
 具体需要开启哪些 use flag，完全是根据各 overlay 用哪种工具维护的，譬如 git、cvs、subversion、mercurial 等等。
 
 <!-- more -->
-layman 的配置非常方便，几乎不用介入修改。譬如作为中文区用户，安装 layman 以后，都会增加一个 overlay：
+layman 的配置非常方便，几乎不用介入修改。譬如作为中文区用户，安装 layman 以后，基本都会增加一个 overlay：
 
     layman -f -a gentoo-zh
 
@@ -56,23 +56,24 @@ sync-uri = git://github.com/microcai/gentoo-zh.git
 
 对于 app-portage/layman-2.3.0 之前升级上来的用户而言，如果之前就添加了各个 overlay，那么通过 `layman-updater -R` 重建一下即可。
 
-很多 Gentoo user 喜欢自己维护一个个人的 overlay，添加进去也很方便，譬如我的：
+很多 Gentoo user 喜欢自己维护一个个人的 overlay，添加进去也很方便：
 
-    layman -o https://raw.githubusercontent.com/Ihavee/overlay/master/repositories.xml -f -a Havee
+    layman -o https://raw.githubusercontent.com/user/overlay-name/master/repositories.xml -f -a overlay-name
 
 当然 repositories.xml 必须包含如下的基本信息：
 
 ```xml
 <?xml version="1.0" ?>
 <repositories version="1.0">
     <repo priority="50" quality="experimental" status="unofficial">
-    <name>Havee</name>
-    <description>Havee's gentoo overlay</description>
-    <homepage>http://github.com/Ihavee/overlay</homepage>
+    <name>overlay name</name>
+    <description>personal overlay</description>
+    <homepage>http://github.com/user/overlay-name</homepage>
     <owner>
-        <email>[email protected]</email>
+        <email>[email protected]</email>
+        <name>user</name>
     </owner>
-    <source type="git">git://github.com/Ihavee/overlay.git</source>
+    <source type="git">git://github.com/user/overlay-name.git</source>
     </repo>
 </repositories>
 ```

diff --git a/...liases-causing-permission-denied-error.md → ...liases-causing-permission-denied-error.md b/...liases-causing-permission-denied-error.md → ...liases-causing-permission-denied-error.md
diff --git a/_posts/2013-07-16-gossip.md → _drafts/gossip.md b/_posts/2013-07-16-gossip.md → _drafts/gossip.md
diff --git a/_posts/2010-07-14-ie-hack.md → _drafts/ie-hack.md b/_posts/2010-07-14-ie-hack.md → _drafts/ie-hack.md
diff --git a/...14-12-15-it-is-time-to-ignore-pagerank.md → _drafts/it-is-time-to-ignore-pagerank.md b/...14-12-15-it-is-time-to-ignore-pagerank.md → _drafts/it-is-time-to-ignore-pagerank.md
@@ -7,7 +7,7 @@ tags: [Google]
 
 2014 年 11 月 24 日，Google 官方发言人 John Mueller 再 Video Hangouts 中表示，Google 已经决定放弃 PageRank，同时，也建议各位 SEO 不要再采用 PageRank 作为参考。其实 John Mueller 早在去年，就曾表示今后不太可能更新 PageRank。
 
-![John Mueller]({{ site.cdn }}/images/2014/12/John Mueller.png)
+![John Mueller](/cdn/images/2014/12/John Mueller.png)
 
 <!-- more -->
 >I wouldn't use PageRank or links as a metric. We've last updated PageRank more than a year ago (as far as I recall) and have no plans to do further updates. Think about what you want users to do on your site, and consider an appropriate metric for that. http://googlewebmastercentral.blogspot.ch/2011/06/beyond-pagerank-graduating-to.html

diff --git a/...oomla-administrator-password-hack-anti.md → ...oomla-administrator-password-hack-anti.md b/...oomla-administrator-password-hack-anti.md → ...oomla-administrator-password-hack-anti.md
diff --git a/...-08-05-linux-headers-causing-ppp-error.md → _drafts/linux-headers-causing-ppp-error.md b/...-08-05-linux-headers-causing-ppp-error.md → _drafts/linux-headers-causing-ppp-error.md
diff --git a/...rating-from-mysql-to-mariadb-on-gentoo.md → ...rating-from-mysql-to-mariadb-on-gentoo.md b/...rating-from-mysql-to-mariadb-on-gentoo.md → ...rating-from-mysql-to-mariadb-on-gentoo.md
diff --git a/_posts/2011-12-14-moral-track.md → _drafts/moral-track.md b/_posts/2011-12-14-moral-track.md → _drafts/moral-track.md
diff --git a/...13-01-21-mount-the-data-disk-on-aliyun.md → _drafts/mount-the-data-disk-on-aliyun.md b/...13-01-21-mount-the-data-disk-on-aliyun.md → _drafts/mount-the-data-disk-on-aliyun.md
diff --git a/_posts/2009-12-08-mozplugger.md → _drafts/mozplugger.md b/_posts/2009-12-08-mozplugger.md → _drafts/mozplugger.md
diff --git a/_posts/2011-10-29-mupdf.md → _drafts/mupdf.md b/_posts/2011-10-29-mupdf.md → _drafts/mupdf.md
@@ -5,7 +5,7 @@ category: Linux
 tags: [MuPDF]
 ---
 
-![MuPDF]({{ site.cdn }}/images/2011/10/Mupdf.png "Mupdf")
+![MuPDF](/cdn/images/2011/10/Mupdf.png "Mupdf")
 
 <!-- more -->
 

diff --git a/_posts/2011-12-14-on-the-us-dollar.md → _drafts/on-the-us-dollar.md b/_posts/2011-12-14-on-the-us-dollar.md → _drafts/on-the-us-dollar.md
diff --git a/...04-14-phpmyadmin-configuration-storage.md → _drafts/phpmyadmin-configuration-storage.md b/...04-14-phpmyadmin-configuration-storage.md → _drafts/phpmyadmin-configuration-storage.md
diff --git a/_posts/2014-11-23-public-dns-records.md → _drafts/public-dns-records.md b/_posts/2014-11-23-public-dns-records.md → _drafts/public-dns-records.md
diff --git a/_posts/2013-07-27-reverse-proxy-domain.md → _drafts/reverse-proxy-domain.md b/_posts/2013-07-27-reverse-proxy-domain.md → _drafts/reverse-proxy-domain.md
diff --git a/...2-06-15-run-php-with-fastcgi-on-gentoo.md → _drafts/run-php-with-fastcgi-on-gentoo.md b/...2-06-15-run-php-with-fastcgi-on-gentoo.md → _drafts/run-php-with-fastcgi-on-gentoo.md
diff --git a/...g-up-a-custom-domain-with-github-pages.md → ...g-up-a-custom-domain-with-github-pages.md b/...g-up-a-custom-domain-with-github-pages.md → ...g-up-a-custom-domain-with-github-pages.md
diff --git a/...on-not-animated-with-firefox-on-gentoo.md → ...on-not-animated-with-firefox-on-gentoo.md b/...on-not-animated-with-firefox-on-gentoo.md → ...on-not-animated-with-firefox-on-gentoo.md
@@ -11,7 +11,7 @@ tags: [Firefox]
 
 <!-- more -->
 
-Archlinux 的 bug report 上的解决方案是在 userChrome.css 中替换个 loading.png 的图片，下载图片 [firefox-loading]({{ site.cdn }}/images/2014/06/firefox-loading.png)，并置入 Firefox 的 profiles 下的 chrome 文件夹中。
+Archlinux 的 bug report 上的解决方案是在 userChrome.css 中替换个 loading.png 的图片，下载图片 [firefox-loading](/cdn/images/2014/06/firefox-loading.png)，并置入 Firefox 的 profiles 下的 chrome 文件夹中。
 
 编辑 userChrome.css 文件，添加如下：
 

diff --git a/_posts/2011-12-14-talk-about-sub-prime.md → _drafts/talk-about-sub-prime.md b/_posts/2011-12-14-talk-about-sub-prime.md → _drafts/talk-about-sub-prime.md
diff --git a/_posts/2011-12-14-tencent-and-360.md → _drafts/tencent-and-360.md b/_posts/2011-12-14-tencent-and-360.md → _drafts/tencent-and-360.md
diff --git a/_posts/2010-09-01-uchome-anti-ri.md → _drafts/uchome-anti-ri.md b/_posts/2010-09-01-uchome-anti-ri.md → _drafts/uchome-anti-ri.md
@@ -5,7 +5,7 @@ category: Internet
 tags: [UChome, RI, Usage]
 ---
 
-![uchome]({{ site.cdn }}/images/2010/09/uchome.png "uchome")
+![uchome](/cdn/images/2010/09/uchome.png "uchome")
 
 被注册机盯上了怎么办，特别是像 uchome 这样的 SNS 网站，批量注册一大堆用户，全部发些垃圾内容，整个网站一会就被弄的不成样。
 
@@ -120,6 +120,6 @@ ajaxget(’r_checkmail.php?mail=’+mail+’&time=’+new Date().getTime()+’&a
 
 #### 修改完以上步骤后，把压缩包的 `r_checkmail.php` 和 `phpmailer` 全都放到你的 `uchome` 根目录下
 
-下载：[codefile]({{ site.cdn }}/images/2010/09/codefile.zip)
+下载：[codefile](/cdn/images/2010/09/codefile.zip)
 
-转自：[被注册机困扰的问题 - uchome吧](http://www.uchome8.com/127)
+转自：被注册机困扰的问题 - uchome吧 (链接已失效)
diff --git a/_posts/2010-02-10-ulimit.md → _drafts/ulimit.md b/_posts/2010-02-10-ulimit.md → _drafts/ulimit.md
diff --git a/...s/2012-06-08-update-filesystem-on-arch.md → _drafts/update-filesystem-on-arch.md b/...s/2012-06-08-update-filesystem-on-arch.md → _drafts/update-filesystem-on-arch.md
diff --git a/_posts/2014-02-25-update-to-mac-os-x-1092.md → _drafts/update-to-mac-os-x-1092.md b/_posts/2014-02-25-update-to-mac-os-x-1092.md → _drafts/update-to-mac-os-x-1092.md
@@ -5,7 +5,7 @@ category: Mac
 tags: [SSL]
 ---
 
-![00]({{ site.cdn }}/images/2014/02/update0.png)
+![00](/cdn/images/2014/02/update0.png)
 
 OS X 10.9.2 在经过 7 个测试版后，终于迎来了正式版，在 SSL 安全漏洞引起大家恐慌的时候，苹果适时的退出了更新。不过在 App Store 里面还没有更新提示，可以直接到苹果官网去[下载](http://support.apple.com/kb/DL1725?viewlocale=zh_CN)。
 
@@ -31,16 +31,16 @@ OS X 10.9.2 在经过 7 个测试版后，终于迎来了正式版，在 SSL 安
 发布日期：2014-2-25
 文件大小：859.7 MB
 
-![01]({{ site.cdn }}/images/2014/02/update1.png)
+![01](/cdn/images/2014/02/update1.png)
 
-![02]({{ site.cdn }}/images/2014/02/update2.png)
+![02](/cdn/images/2014/02/update2.png)
 
-![03]({{ site.cdn }}/images/2014/02/update3.png)
+![03](/cdn/images/2014/02/update3.png)
 
-![04]({{ site.cdn }}/images/2014/02/update4.png)
+![04](/cdn/images/2014/02/update4.png)
 
-![05]({{ site.cdn }}/images/2014/02/update5.png)
+![05](/cdn/images/2014/02/update5.png)
 
-![06]({{ site.cdn }}/images/2014/02/update6.png)
+![06](/cdn/images/2014/02/update6.png)
 
-![07]({{ site.cdn }}/images/2014/02/update7.png)
+![07](/cdn/images/2014/02/update7.png)
diff --git a/...-upgrade-github-pages-site-to-jekyll-3.md → .../upgrade-github-pages-site-to-jekyll-3.md b/...-upgrade-github-pages-site-to-jekyll-3.md → .../upgrade-github-pages-site-to-jekyll-3.md
diff --git a/...-use-telnet-to-test-smtp-communication.md → .../use-telnet-to-test-smtp-communication.md b/...-use-telnet-to-test-smtp-communication.md → .../use-telnet-to-test-smtp-communication.md
diff --git a/_posts/2012-06-29-version-bump-to-grub-2.md → _drafts/version-bump-to-grub-2.md b/_posts/2012-06-29-version-bump-to-grub-2.md → _drafts/version-bump-to-grub-2.md
diff --git a/_posts/2013-10-11-vim-colorscheme.md → _drafts/vim-colorscheme.md b/_posts/2013-10-11-vim-colorscheme.md → _drafts/vim-colorscheme.md
@@ -49,13 +49,13 @@ endif
 
 以下是我 **vim & gvim** 的一些截图：
 
-![VIM]({{ site.cdn }}/images/2013/10/vim.png "VIM")
+![VIM](/cdn/images/2013/10/vim.png "VIM")
 
-![GVIM]({{ site.cdn }}/images/2013/10/gvim.png "GVIM")
+![GVIM](/cdn/images/2013/10/gvim.png "GVIM")
 
-![VIM with NerdTree]({{ site.cdn }}/images/2013/10/vim-nerdtree.png "VIM with NerdTree")
+![VIM with NerdTree](/cdn/images/2013/10/vim-nerdtree.png "VIM with NerdTree")
 
-![GVIM with NerdTree]({{ site.cdn }}/images/2013/10/gvim-nerdtree.png "GVIM with NerdTree")
+![GVIM with NerdTree](/cdn/images/2013/10/gvim-nerdtree.png "GVIM with NerdTree")
 
-你也可以直接 clone 我的配置[https://github.com/Ihavee/.vim](https://github.com/Ihavee/.vim)
+你也可以直接 clone 我的配置<https://github.com/vgist/vimrc>
 
diff --git a/_posts/2011-08-05-vim-status-bar.md → _drafts/vim-status-bar.md b/_posts/2011-08-05-vim-status-bar.md → _drafts/vim-status-bar.md
@@ -5,7 +5,7 @@ category: Linux
 tags: [Vim, Usage, Configuration]
 ---
 
-![utf8-bomb]({{ site.cdn }}/images/2011/08/utf8-bomb.png "utf8-bomb")
+![utf8-bomb](/cdn/images/2011/08/utf8-bomb.png "utf8-bomb")
 
 玩无损音乐，其中接触到 `.cue` 的索引文件，由于 windows 与 linux 默认的文件编码差异，导致我本地的 `.cue` 全部转为 utf-8 编码，但是如此则共享给其他 PT fans 时，出现了问题。
 

diff --git a/...011-08-09-virtualbox-sound-card-gentoo.md → _drafts/virtualbox-sound-card-gentoo.md b/...011-08-09-virtualbox-sound-card-gentoo.md → _drafts/virtualbox-sound-card-gentoo.md
diff --git a/...014-05-08-vmware-workstation-on-gentoo.md → _drafts/vmware-workstation-on-gentoo.md b/...014-05-08-vmware-workstation-on-gentoo.md → _drafts/vmware-workstation-on-gentoo.md
@@ -29,7 +29,7 @@ Gentoo 的 Portage 系统本身就有 VMware Player 的 ebuild，安装很简单
 
 安装说明，打 3 个补丁，再 patch 一下 ebuild，随后顺利安装。
 
-![Windows 8.1 on VMware]({{ site.cdn }}/images/2014/05/vmware-windows.png)
+![Windows 8.1 on VMware](/cdn/images/2014/05/vmware-windows.png)
 
 当然，期间因为 ati 闭源驱动更新，重新编译下 kernel。由于我的显卡是 radeon hd 7850，芯片代号为 **PITCAIRN**，于是
 

diff --git a/_posts/2011-06-02-vsftpd-chroot-wrong.md → _drafts/vsftpd-chroot-wrong.md b/_posts/2011-06-02-vsftpd-chroot-wrong.md → _drafts/vsftpd-chroot-wrong.md
diff --git a/_posts/2011-12-14-wisdom-and-iq.md → _drafts/wisdom-and-iq.md b/_posts/2011-12-14-wisdom-and-iq.md → _drafts/wisdom-and-iq.md
diff --git a/_drafts/without-saving-bash-history.md b/_drafts/without-saving-bash-history.md
@@ -0,0 +1,42 @@
+---
+layout: post
+title: "不要记录 bash 操作历史"
+category: Linux
+tags: [Bash]
+---
+
+很多时候，我们可能不想记录某一个登陆进程中的 bash 操作历史。
+
+譬如，你在教学过程中，演示一些危险的 shell 操作，而被系统记录；譬如，我们偶尔进行一些不可描述的操作时，我们当然不想这次的操作被记录，所以我们想清除这次的登陆操作。
+
+原因很多，可能正经，可能不正经。下面是具体的一些方法。
+
+#### 移除当前进程的操作历史，保留之前历史
+
+##### 变量 HISTFILE
+
+    unset HISTFILE; exit
+
+<!-- more -->
+
+##### 杀掉 console
+
+    kill -9 $$
+
+#### 彻底移除所有历史
+
+##### history 选项
+
+    history -c; history -w; exit
+
+##### 变量 HISTSIZE
+
+    HISTSIZE=0; exit
+
+##### 删除 history 记录的文件
+
+    rm -f $HISTFILE; unset HISTFILE; exit
+    or
+    cat /dev/null > ~/.bash_history; exit
+
+当然，一般人，也用不到清除操作历史。
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,4 +1,4 @@
 <footer class="footer text-center">
-  <p>&copy; {{ site.time | date: '%Y' }} <a href="{{ site.url }}" title="{{ site.description }}">{{ site.author.name }}</a>. 由 <a href="//jekyllrb.com/" title="Transform your plain text into static websites and blogs.">Jekyll</a> 与 <a href="//getbootstrap.com/" title="Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.">Bootstrap</a> 强力驱动</p>
-  <p>文章以 <a href="//creativecommons.org/licenses/by/3.0/" title="CC BY 3.0 License">the CC BY 3.0</a> 许可发布</p>
+  <p>&copy; {{ site.time | date: '%Y' }} <a href="{{ site.url }}" title="{{ site.description }}">{{ site.author.name }}</a>. with help from <a href="//jekyllrb.com/" title="Transform your plain text into static websites and blogs.">Jekyll</a> and <a href="//getbootstrap.com/" title="Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.">Bootstrap</a></p>
+  <p>Articles are licensed under <a href="//creativecommons.org/licenses/by/3.0/" title="CC BY 3.0 License">the CC BY 3.0</a></p>
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
@@ -18,8 +18,7 @@
   <link rel="stylesheet" href="{{ site.assets_path }}/css/style.css" media="all">
 
   <!-- atom & rss feed -->
-  <link href="{{ site.rss_path }}" type="application/rss+xml" rel="alternate" title="{{ site.title }} RSS Feed">
-  <link href="{{ site.atom_path }}" type="application/atom+xml" rel="alternate" title="{{ site.title }} ATOM Feed">
+  <link rel="alternate" type="application/rss+xml" href="{{ site.rss_path | prepend: site.url }}" title="{{ site.title }} RSS Feed">
 
   {% if site.webmaster.baidu.verify %}<meta name="baidu-site-verification" content="{{ site.webmaster.baidu.verify }}" />{% endif %}
   {% if site.webmaster.google.verify %}<meta name="google-site-verification" content="{{ site.webmaster.google.verify }}" />{% endif %}

diff --git a/_includes/header.html b/_includes/header.html
@@ -13,10 +13,10 @@
   </button>
   <div class="title"><a title="{{ site.title }}" href="/">{{ site.title }}</a></div>
   <ul class="nav navbar-nav collapse navbar-collapse bs-navbar-collapse navbar-right">
-    <li><a href="{{ '/archive.html' }}" title="文章归档"><span class='fa fa-archive fa-2x'></span></a></li>
-    <li><a href="{{ '/categories.html' }}" title="分类目录" rel="nofollow"><span class='fa fa-navicon fa-2x'></span></a></li>
-    <li><a href="{{ '/tags.html' }}" title="标签" rel="nofollow"><span class='fa fa-tags fa-2x'></span></a></li>
-    <li><a href="{{ '/about.html' }}" title="关于"><span class='fa fa-user fa-2x'></span></a></li>
+    <li><a href="{{ '/archive.html' }}" title="Archive"><span class='fa fa-archive fa-2x'></span></a></li>
+    <li><a href="{{ '/categories.html' }}" title="Categories" rel="nofollow"><span class='fa fa-navicon fa-2x'></span></a></li>
+    <li><a href="{{ '/tags.html' }}" title="Tags" rel="nofollow"><span class='fa fa-tags fa-2x'></span></a></li>
+    <li><a href="{{ '/about.html' }}" title="About"><span class='fa fa-user fa-2x'></span></a></li>
     {% if site.author.github %}
     <li><a href="https://github.com/{{ site.author.github }}" target="_blank" title="Github" rel="nofollow"><span class='fa fa-github fa-2x'></span></a></li>
     {% endif %}
@@ -33,6 +33,6 @@
     <li><a href="http://weibo.com/{{ site.author.weibo }}" target="_blank" title="微博" rel="nofollow"><span class="fa fa-weibo fa-2x"></span></a></li>
     {% endif %}
 
-    <li><a href="{{ '/rss.xml' }}" target="_blank" title="订阅" rel="nofollow"><span class='fa fa-rss fa-2x'></span></a></li>
+    <li><a href="{{ site.rss_path | prepend: site.url }}" target="_blank" title="订阅" rel="nofollow"><span class='fa fa-rss fa-2x'></span></a></li>
   </ul>
 </header>