summaryrefslogtreecommitdiff
path: root/doc/install/database_mysql.md
diff options
context:
space:
mode:
authorJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-11 11:46:08 +0200
committerJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-11 11:46:08 +0200
commitbf0de1a500e7a9aecc7c8bbf623ad39b75c6433b (patch)
tree382df65e2b17c91e03278d58bce8dce0129a6a7b /doc/install/database_mysql.md
parentb18d1c2786c2a385d6b797734a1afad7a01ddf35 (diff)
parent78ec7d9c9d156fe556d165c1c096bf5534d62d25 (diff)
downloadgitlab-ce-bf0de1a500e7a9aecc7c8bbf623ad39b75c6433b.tar.gz
Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring
Diffstat (limited to 'doc/install/database_mysql.md')
-rw-r--r--doc/install/database_mysql.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/install/database_mysql.md b/doc/install/database_mysql.md
index 270ad3b0b86..ae68fd007ab 100644
--- a/doc/install/database_mysql.md
+++ b/doc/install/database_mysql.md
@@ -1,4 +1,4 @@
-# Database Mysql
+# Database MySQL
## Note
@@ -12,16 +12,16 @@ We do not recommend using MySQL due to various issues. For example, case [(in)se
# Ensure you have MySQL version 5.5.14 or later
mysql --version
- # Pick a database root password (can be anything), type it and press enter
- # Retype the database root password and press enter
+ # Pick a MySQL root password (can be anything), type it and press enter
+ # Retype the MySQL root password and press enter
- # Secure your installation.
+ # Secure your installation
sudo mysql_secure_installation
# Login to MySQL
mysql -u root -p
- # Type the database root password
+ # Type the MySQL root password
# Create a user for GitLab
# do not type the 'mysql>', this is part of the prompt