From 4db72503e6fdc29a90c26ce3e7c2aea640796daa Mon Sep 17 00:00:00 2001
From: zhaohaibin <zhaohaibin007@gmail.com>
Date: Tue, 16 Jul 2013 07:16:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

31行"/etc/rsyncd/rsyncd.conf"修改为"/etc/rsyncd.conf"，和56行内容相匹配
---
 ebook/12.4.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebook/12.4.md b/ebook/12.4.md
index a418b4e5..fe8dda54 100644
--- a/ebook/12.4.md
+++ b/ebook/12.4.md
@@ -28,7 +28,7 @@ rsync主要有以下三个配置文件rsyncd.conf(主配置文件)、rsyncd.secr
 
 - 服务端开启：
 
-		#/usr/bin/rsync --daemon  --config=/etc/rsyncd/rsyncd.conf
+		#/usr/bin/rsync --daemon  --config=/etc/rsyncd.conf
 
 	--daemon参数方式，是让rsync以服务器模式运行。把rsync加入开机启动
 

From 5978862db385c0d246ff74ce391524812ffda26b Mon Sep 17 00:00:00 2001
From: zhaohaibin <zhaohaibin007@gmail.com>
Date: Tue, 16 Jul 2013 07:20:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?supervisord.conf=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将126行supervisor.sock修改为supervisord.sock，和138行相匹配。
---
 ebook/12.3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebook/12.3.md b/ebook/12.3.md
index 44de4504..6e77e104 100644
--- a/ebook/12.3.md
+++ b/ebook/12.3.md
@@ -123,7 +123,7 @@ Supervisord默认的配置文件路径为/etc/supervisord.conf，通过文本编
 
 	;/etc/supervisord.conf
 	[unix_http_server]
-	file = /var/run/supervisor.sock
+	file = /var/run/supervisord.sock
 	chmod = 0777
 	chown= root:root