From 5eb9e638c01604ac5bc8462a57253d3a481b2ff3 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 10 May 2016 12:21:55 -0400 Subject: [PATCH] Update README.md and fixed some grammar errors --- README.md | 10 ++++++---- ols1clk.sh | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5e3af580..08fe1374 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,17 @@ ols1clk can be run in the following way: When run with no options, ols1clk will install OpenLiteSpeed with the default settings and values. ####Possible Options: -* **-a**, **--adminpassword ADMINPASSWORD:** used to set the webAdmin password for OpenLiteSpeed. +* **-a**, **--adminpassword [-- webAdminPassword]:** used to set the webAdmin password for OpenLiteSpeed instead of a random one. + * If you omit **[-- webAdminPassword]**, ols1clk will prompt you to provide this password during installation. * **-e**, **--email EMAIL:** to set the email of the administrator. * **-w**, **--wordpress:** set to install and setup wordpress. * **--wordpresspath WORDPRESSPATH:** to use an existing wordpress installation instead of a new wordpress install. -* **-r**, **--rootpassworddb ROOTPASSWORD:** to set the mysql server root password. +* **-r**, **--rootpassworddb [-- mysqlRootPassword]:** to set the mysql server root password instead of using a random one. + * If you omit **[-- mysqlRootPassword]**, ols1clk will prompt you to provide this password during installation. * **-d**, **--databasename DATABASENAME:** to set the database name to be used by wordpress. * **-u**, **--usernamedb DBUSERNAME:** to set the username of wordpress in mysql. -* **-p**, **--passworddb DBPASSWORD:** to set the password of wordpress in mysql. +* **-p**, **--passworddb [-- databasePassword]:** to set the password of wordpress in mysql instead of using a random one. + * If you omit **[-- databasePassword]**, ols1clk will prompt you to provide this password during installation. * **-l**, **--listenport WORDPRESSPORT:** to set the listener port, default is 80. * **--uninstall:** to uninstall OpenLiteSpeed and remove installation directory * **--purgeall:** to uninstall OpenLiteSpeed, remove installation directory, and purge all data in mysql. @@ -33,4 +36,3 @@ Get in Touch OpenLiteSpeed has a [Google Group](https://groups.google.com/forum/#!forum/openlitespeed-development). If you find a bug, want to request new features, or just want to talk about OpenLiteSpeed, this is the place to do it. - diff --git a/ols1clk.sh b/ols1clk.sh index 15865f34..1df93b12 100755 --- a/ols1clk.sh +++ b/ols1clk.sh @@ -645,16 +645,16 @@ function usage { echoGreen "Usage: $0 [options] [options] ..." echoGreen "Options:" - echoGreen " -a, --adminpassword [-- webAdminPassword], to set the webAdmin password for openlitespeed instead a random one." + echoGreen " -a, --adminpassword [-- webAdminPassword], to set the webAdmin password for openlitespeed instead of using a random one." echoGreen " If you omit [-- webAdminPassword], ols1clk will prompt you to provide this password during installation." echoGreen " -e, --email EMAIL, to set the email of the administrator." echoGreen " -w, --wordpress, set to install and setup wordpress." echoGreen " --wordpresspath WORDPRESSPATH, to use an existing wordpress installation instead of a new wordpress install." - echoGreen " -r, --rootpassworddb [-- mysqlRootPassword], to set the mysql server root password instead a random one." + echoGreen " -r, --rootpassworddb [-- mysqlRootPassword], to set the mysql server root password instead of using a random one." echoGreen " If you omit [-- mysqlRootPassword], ols1clk will prompt you to provide this password during installation." echoGreen " -d, --databasename DATABASENAME, to set the database name to be used by wordpress." echoGreen " -u, --usernamedb DBUSERNAME, to set the username of wordpress in mysql." - echoGreen " -p, --passworddb [-- databasePassword], to set the password of the table used by wordpress in mysql instead a random one." + echoGreen " -p, --passworddb [-- databasePassword], to set the password of the table used by wordpress in mysql instead of using a random one." echoGreen " If you omit [-- databasePassword], ols1clk will prompt you to provide this password during installation." echoGreen " -l, --listenport WORDPRESSPORT, to set the listener port, default is 80." echoGreen " --uninstall, to uninstall OpenLiteSpeed and remove installation directory."