From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Tue, 13 Jan 2015 19:42:42 +0000 (+0100)
Subject: Documentation: Update Icinga Web 2 uri to /icingaweb2
X-Git-Tag: v2.3.0~386
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4e63de893be143ee324cbc98718147006dcc0fa;p=icinga2

Documentation: Update Icinga Web 2 uri to /icingaweb2

fixes #8201
---

diff --git a/doc/2-getting-started.md b/doc/2-getting-started.md
index a4977fc63..68595cba1 100644
--- a/doc/2-getting-started.md
+++ b/doc/2-getting-started.md
@@ -471,7 +471,7 @@ will be used by notification apply rules in [notifications.conf](notifications-c
 If you've installed [Icinga Web 2](#setting-up-icingaweb2) you can
 uncomment the http vhost attributes and relaod Icinga 2. The apply
 rules in [services.conf](#services.conf) will automatically
-generate a new service checking the `/icingaweb` URI using the `http`
+generate a new service checking the `/icingaweb2` URI using the `http`
 check.
 
     /*
@@ -508,7 +508,7 @@ check.
       }
       /* Uncomment if you've sucessfully installed Icinga Web 2. */
       //vars.http_vhosts["Icinga Web 2"] = {
-      //  http_uri = "/icingaweb"
+      //  http_uri = "/icingaweb2"
       //}
 
       /* Define disks and attributes for service apply rules in `services.conf`. */
@@ -1360,12 +1360,12 @@ In order for commands to work you will need to [setup the external command pipe]
 web-based setup wizard which will guide you through the entire setup process.
 
 Generate the Webserver configuration and a setup token using its local cli
-and proceed with the web setup when accessing `/icingaweb` after reloading
+and proceed with the web setup when accessing `/icingaweb2` after reloading
 your webserver configuration.
 
-Please consult the installation documentation shipped with `Icinga Web 2` for
-further instructions on how to install Icinga Web 2 and to configure
-backends, resources and instances manually.
+Please consult the [installation documentation](https://github.com/Icinga/icingaweb2/blob/master/doc/installation.md)
+shipped with `Icinga Web 2` for further instructions on how to install
+`Icinga Web 2` and to configure backends, resources and instances manually.
 
 Check the [Icinga website](http://www.icinga.org) for release announcements
 and packages.
diff --git a/etc/icinga2/conf.d/hosts.conf b/etc/icinga2/conf.d/hosts.conf
index 83f1e34ee..5ff1f9b61 100644
--- a/etc/icinga2/conf.d/hosts.conf
+++ b/etc/icinga2/conf.d/hosts.conf
@@ -32,7 +32,7 @@ object Host NodeName {
   }
   /* Uncomment if you've sucessfully installed Icinga Web 2. */
   //vars.http_vhosts["Icinga Web 2"] = {
-  //  http_uri = "/icingaweb"
+  //  http_uri = "/icingaweb2"
   //}
 
   /* Define disks and attributes for service apply rules in `services.conf`. */
diff --git a/etc/icinga2/conf.d/win32/hosts.conf b/etc/icinga2/conf.d/win32/hosts.conf
index 95f39f0d5..990d07c47 100644
--- a/etc/icinga2/conf.d/win32/hosts.conf
+++ b/etc/icinga2/conf.d/win32/hosts.conf
@@ -32,7 +32,7 @@ object Host NodeName {
   }
   /* Uncomment if you've sucessfully installed Icinga Web 2. */
   //vars.http_vhosts["Icinga Web 2"] = {
-  //  http_uri = "/icingaweb"
+  //  http_uri = "/icingaweb2"
   //}
 
   /* Define disks and attributes for service apply rules in `services.conf`. */