Merge pull request ezsystems#60 from ezsystems/EZEE-1489-install.md-u…

…pdate

EZEE-1489 - install.md update

INSTALL.md

@@ -8,7 +8,7 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation
 
 
 ## Terms for future reference:
-  * `/<root-dir>/`: The filesystem path where eZ Studio is installed in.
+  * `/<root-dir>/`: The filesystem path where eZ Platform Enterprise Edition is installed in.
     Examples: `/home/myuser/www/` or `/var/sites/<project-name>/`
   * cli: command line interface. For *Linux/BSD/OS X* specific commands, use of `bash` or similar is assumed.
 
@@ -21,13 +21,13 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation
   - Create Database: Installation will ask you for credentials/details for which database to use, example with mysql:
     `CREATE DATABASE <database> CHARACTER SET utf8;` *Note: Right now installer only supports MySQL and MariaDB, Postgres support will be (re)added in one of the upcoming releases.*
   - Set php.ini memory_limit=256M before running commands below
-  - *Optional:* You can also setup Solr to be used by eZ Studio and take note of the url it is accessible on
+  - *Optional:* You can also setup Solr to be used by eZ Platform Enterprise Edition and take note of the url it is accessible on
 
 ## Install
 
-1. **Install/Extract eZ Studio**<a name="install-1-extract"></a>:
+1. **Install/Extract eZ Platform Enterprise Edition**<a name="install-1-extract"></a>:
 
-    There are two ways to install eZ Studio described below, what is common is that you should make sure
+    There are two ways to install eZ Platform Enterprise Edition described below, what is common is that you should make sure
     relevant settings are generated into `app/config/parameters.yml` as a result of this step.
 
     `parameters.yml` contains settings for your database, mail system, and optionally [Solr](http://lucene.apache.org/solr/)
@@ -36,7 +36,7 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation
     A. **Extract archive** (tar/zip)
 
        Download archive from [support.ez.no/Downloads](https://support.ez.no/Downloads/), __not from GitHub__ *(those are for composer)*.
-       Extract the eZ Studio archive to a directory, then execute post install scripts:
+       Extract the eZ Enterprise Edition archive to a directory, then execute post install scripts:
 
        *Note: The post install scripts will ask you to fill in some settings, including database settings.*
 
@@ -48,21 +48,21 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation
 
     B. **Install via Composer**
 
-     If you have a eZ Enterprise Subscription and [have setup composer authentication tokens](https://doc.ez.no/display/TECHDOC/Using+Composer), you can get eZ Studio using composer with the following commands:
+     If you have a eZ Enterprise Subscription and [have setup composer authentication tokens](https://doc.ez.no/display/DEVELOPER/Using+Composer), you can get eZ  using composer with the following commands:
 
      *Note: composer will take its time to download all libraries and when done you will be asked to fill in some settings, including database settings.*
 
        ```bash
        $ curl -sS https://getcomposer.org/installer | php
        $ php -d memory_limit=-1 composer.phar create-project --no-dev ezsystems/ezplatform-ee
-       $ cd /ezstudio/
+       $ cd /ezplatform-ee/
        ```
 
      Arguments *(also see `php composer.phar create-project -h`)*:
        - `<package>`: Distribution to install, `ezsystems/ezplatform` is a clean installs of eZ Platform, others:
         - `ezsystems/ezplatform-demo`: Adds a demo site as an example of eZ Platform web site.
-        - `ezsystems/ezstudio`: Commercial flavour that adds additional capabilities, see [ezstudio.com](http://ezstudio.com/).
-       - `<directory>`: Folder to extract to, if omitted same as package name so in example: `ezstudio`.
+        - `ezsystems/ezplatform-ee`: Commercial flavour that adds additional capabilities, see [ez.no/Products/eZ-Platform-Enterprise-Edition](https://ez.no/Products/eZ-Platform-Enterprise-Edition).
+       - `<directory>`: Folder to extract to, if omitted same as package name so in example: `ezplatform-ee`.
        - `<version>`: Optional, *when omitted you'll get latest stable*. Examples:
         - `~1.3.0`: To pick latests 1.3 release, to pick latests 1.x release use `~1.3`.
         - `v1.1.0` : To pick a specific tag, could also have been `v1.0.0-rc1`
@@ -152,13 +152,13 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation
 
 3. **Run installation command**<a name="install-4-db-setup"></a>:
 
-    You may now complete the eZ Studio installation with ezplatform:install command, example of use:
+    You may now complete the eZ Platform Enterprise Edition installation with ezplatform:install command, example of use:
 
     ```bash
     $ php -d memory_limit=-1 app/console ezplatform:install --env=prod studio-clean
     ```
 
-    **Note**: Password for the generated `admin` user is `publish`, this name and password is needed when you would like to login to backend UI. Future versions will prompt you for a unique password during installation.
+    **Note**: Password for the generated `admin` user is `publish`, this name and password is needed when you would like to login to backend UI.
 
 
 4. **Configure a VirtualHost**<a name="install-3-vhost"></a>:
@@ -167,10 +167,10 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation
     Configure virtual host by either taking examples from [Nginx](doc/nginx) or [Apache2](doc/apache2) documentation,
     or by using provided script to generate from templates, for help see `./bin/vhost.sh -h`, example:
     ```bash
-    ./bin/vhost.sh --basedir=/var/www/ezstudio \
+    ./bin/vhost.sh --basedir=/var/www/ezplatform-ee \
       --template-file=doc/apache2/vhost.template \
-      --host-name=ezstudio \
-      | sudo tee /etc/apache2/sites-enabled/ezstudio.conf > /dev/null
+      --host-name=ezplatform-ee \
+      | sudo tee /etc/apache2/sites-enabled/ezplatform-ee.conf > /dev/null
     ```
     Check and adapt the generated vhost config, and then restart Apache or Nginx.
 

app/config/parameters.yml.dist

@@ -8,6 +8,6 @@ parameters:
     database_driver: pdo_mysql
     database_host: localhost
     database_port: ~
-    database_name: ezstudio
+    database_name: ezplatform_ee
     database_user: root
     database_password: