get minor update

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index da3ca082c4c77808cfb7547c75ff56373d156b19..580ea3cb90f92302f4ad1ff336fd8e82cf2930e5 100644 (file)
--- a/Mediawiki_Setup_Guide
+++ b/Mediawiki_Setup_Guide
@@ -1,6 +1,6 @@
 == Introduction ==
 
-'''tldr''': For Gnu/Linux (with a bit of Debian bias), a more concise, holistic and automated install than the official Mediawiki docs. Do some initial configuration then download this page and run it, or execute it as you read the well written documentation.
+'''tldr''': For Gnu/Linux (with a bit of Debian bias), a more concise, holistic and automated install than the official Mediawiki docs. Do some initial configuration then download this page and run it, or execute it as you read.
 
 ''' Goals / Why use this guide? '''
 
@@ -604,8 +604,6 @@ else
     # todo, php5-curl equivalent on fedora
     yum -y install texlive-cjk ghostscript ImageMagick texlive ocaml
 fi
-dir=$(dirname $(php -r 'echo(php_ini_loaded_file());'))/../apache2/conf.d
-ln -sf ../../mods-available/curl.ini $dir
 service apache2 restart
 
 cd $mw/extensions/Math/math; make # makes texvc
@@ -1061,7 +1059,7 @@ One issue is that mediawiki.org needs a lot of organizing, deleting, and verifyi
 
 '''Bash here documents, EOF vs 'EOF' '''
 
-Here documents are used throughout this page, some people may not be aware of a small but important syntax. When the delimiter is quoted, as in <<'EOF', then the contents of the here document are exactly verbatim. Otherwise $ and ` are expanded as in bash, and must be quoted by \, which itself must then also be quoted to be used literally.
+Here documents are used throughout this page, some people may not be aware of a small but important syntax. When the delimiter is quoted, as in <<'EOF', then the contents of the here document are exactly verbatim. Otherwise $ and ` are expanded as in bash, and must be escaped by prefixing them with \, which itself must then also be escaped to be used literally.
 
 
 ''' Mediawiki automation tools survey 7/2014 '''

diff --git a/mw-setup-script b/mw-setup-script
index cae3ca46e47a63f2005fc1f792353dc1bf831174..12f0c45316fef8397baa22ca00f48cf55c209616 100755 (executable)
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -313,8 +313,6 @@ else
     # todo, php5-curl equivalent on fedora
     yum -y install texlive-cjk ghostscript ImageMagick texlive ocaml
 fi
-dir=$(dirname $(php -r 'echo(php_ini_loaded_file());'))/../apache2/conf.d
-ln -sf ../../mods-available/curl.ini $dir
 service apache2 restart
 
 cd $mw/extensions/Math/math; make # makes texvc