diff --git a/website/publish/domain_name.rst b/website/publish/domain_name.rst
index 1cd85ac18..a881f17dd 100644
--- a/website/publish/domain_name.rst
+++ b/website/publish/domain_name.rst
@@ -1,21 +1,53 @@
=============================
-How to set my own domain name
+How to use my own domain name
=============================
-These steps briefly explain how to link your company’s registered domain
-(e.g. www.yourcompany.com) to your Odoo instance. Once someone types your
-company’s domain, they are immediately directed to Odoo (i.e. yourcompany.odoo.com).
+By default, your Odoo Online instance and website have a *.odoo.com* domain name,
+for both the URL and the emails.
+But you can change to a custom one (e.g. www.yourcompany.com).
-* Check its availability or see who currently owns it at https://www.whois.net/.
-* Buy your domain name at a provider. See recommended providers here:
- http://www.mytipshub.com/top-ten-best-domain-registrar/.
+What is a good domain name
+==========================
+Your website address is as important to your branding as the name of your
+business or organization, so put some thought into changing it for a proper
+domain. Here are some tips:
-* Access your Odoo.com account from your homepage.
+- Simple and obvious
+- Easy to remember and spell
+- The shorter the better
+- Avoid special characters
+- Aim for a .com and/or your country extension
+
+Read more: `How to Choose a Domain Name for Maximum SEO `__
+
+How to buy a domain name
+========================
+Buy your domain name at a popular registrar:
+
+- `GoDaddy `__
+- `Namecheap `__
+- `OVH `__
+
+.. note:: Steps to buy a domain name are pretty much straight forward.
+ In case of issue, check out those easy tutorials:
+
+ - `GoDaddy `__
+ - `Namecheap `__
+
+ Feel free to buy an email server to have email addresses using your domain name.
+ However don't buy any extra service to create or host your website.
+ This is Odoo's job!
+
+How to apply my domain name to my Odoo instance
+===============================================
+First let's authorize the redirection (yourcompany.com -> yourcompany.odoo.com):
+
+* Open your Odoo.com account from your homepage.
.. image:: media/domain_name01.png
:align: center
-* Access the *Manage Databases* page.
+* Go to the *Manage Databases* page.
.. image:: media/domain_name02.png
:align: center
@@ -25,15 +57,41 @@ company’s domain, they are immediately directed to Odoo (i.e. yourcompany.odoo
.. image:: media/domain_name03.png
:align: center
-* A database domain prompt will appear. Type your custom domain (e.g. www.yourcompany.com)
- and press *Add*. Then click *OK*.
+* A database domain prompt will appear. Enter your custom domain
+ (e.g. www.yourcompany.com).
-* Go to your domain manager’s website and search for the DNS Zones management page.
-* Create a CNAME record that points your domain (e.g. www.yourcompany.com) to your
- Odoo database (yourcompany.odoo.com). Please reference your domain manager for
- specific directions on how to complete this task.
+.. image:: media/domain_name04.png
+ :align: center
+
+We can now apply the redirection from your domain name's manager account:
+
+* Log in to your account and search for the DNS Zones management page.
+
+* Create a CNAME record *www.yourdomain.com* pointing to *mywebsite.odoo.com*.
+ If you want to use the naked domain (e.g. yourdomain.com), you need to redirect
+ *yourdomain.com* to *www.yourdomain.com*.
+
+.. note:: Here are some specific guidelines to create a CNAME record:
+
+ - `GoDaddy `__
+ - `Namecheap `__
+ - `OVH `__
+
+How to enable SSL (HTTPS) for my Odoo instance
+==============================================
+
+To enable SSL, please use a third-party CDN service provider
+such as CloudFlare.com.
+
.. seealso::
- * :doc:`../../getting_started/documentation`
+ * :doc:`../../discuss/email_servers`
+
+
+
+
+
+
+
diff --git a/website/publish/media/domain_name01.png b/website/publish/media/domain_name01.png
index c1b13b127..e5fa65d94 100644
Binary files a/website/publish/media/domain_name01.png and b/website/publish/media/domain_name01.png differ
diff --git a/website/publish/media/domain_name02.png b/website/publish/media/domain_name02.png
index b1bdf7e1a..98acea816 100644
Binary files a/website/publish/media/domain_name02.png and b/website/publish/media/domain_name02.png differ
diff --git a/website/publish/media/domain_name03.png b/website/publish/media/domain_name03.png
index 3e2ec7367..c8e4c2f76 100644
Binary files a/website/publish/media/domain_name03.png and b/website/publish/media/domain_name03.png differ
diff --git a/website/publish/media/domain_name04.png b/website/publish/media/domain_name04.png
new file mode 100644
index 000000000..9b9671768
Binary files /dev/null and b/website/publish/media/domain_name04.png differ