From 8181a0423fc221418b0e53dd2ab19d61110f93a8 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Tue, 3 Nov 2015 20:53:29 -0800
Subject: [PATCH] Fix some small issues with the CentOS/Fedora instructions.

---
 README.md | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0ecb6c2461..2da5eb8f61 100644
--- a/README.md
+++ b/README.md
@@ -233,6 +233,8 @@ Now continue with the "All systems" instructions below.
 
 On Fedora 22 (experimental):
 
+These instructions are experimental and may have bugs; patches welcome!
+
 ```
 sudo dnf install libffi-devel memcached rabbitmq-server openldap-devel python-devel redis postgresql-server postgresql-devel postgresql libmemcached-devel freetype-devel
 wget https://launchpad.net/~tabbott/+archive/ubuntu/zulip/+files/tsearch-extras_0.1.3.tar.gz
@@ -255,9 +257,16 @@ host    all             all             127.0.0.1/32            md5
 
 # Start the services
 sudo systemctl start redis memcached rabbitmq-server postgresql
+
+# Enable automatic service startup after the system startup
+sudo systemctl enable redis rabbitmq-server memcached postgresql
 ```
 
-On CentOS 7 (Core):
+Now continue with the All Systems instructions below.
+
+On CentOS 7 Core (experimental):
+
+These instructions are experimental and may have bugs; patches welcome!
 
 ```
 # Add user zulip to the system (not necessary if you configured zulip as the administrator
@@ -285,15 +294,15 @@ zlib-devel nodejs
 
 # We need these packages to compile tsearch-extras
 sudo yum groupinstall "Development Tools"
- 
+
 cd && wget https://launchpad.net/~tabbott/+archive/ubuntu/zulip/+files/tsearch-extras_0.1.3.tar.gz
 tar xvzf tsearch-extras_0.1.3.tar.gz
 cd ts2
 make -j $(nproc)
 sudo make install
 
-# Now create the missing dictionary files
-sudo touch /usr/share/pgsql/tsearch_data/zulip_english.stop
+# Hack around missing dictionary files -- need to fix this to get
+# the proper dictionaries from what in debian is the hunspell-en-us package.
 sudo touch /usr/share/pgsql/tsearch_data/english.stop
 sudo touch /usr/share/pgsql/tsearch_data/en_us.dict
 sudo touch /usr/share/pgsql/tsearch_data/en_us.affix
@@ -323,11 +332,10 @@ sudo systemctl start redis rabbitmq-server memcached postgresql
 
 # Enable automatic service startup after the system startup
 sudo systemctl enable redis rabbitmq-server memcached postgresql
-
-# Recompile pillow with freetype support (required for build_emoji script)
-sudo pip uninstall pillow; sudo pip install pillow
 ```
 
+Now continue with the All Systems instructions below.
+
 All Systems:
 
 ```