[icinga-checkins] icinga.org: icinga-doc/master: 'make install-webconf-auth' is optional

git at icinga.org git at icinga.org
Mon May 6 22:16:20 CEST 2013


Module: icinga-doc
Branch: master
Commit: 9f59e32e2e9ff3cf0613060483017e82675ce6c2
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=9f59e32e2e9ff3cf0613060483017e82675ce6c2

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Sat Apr 20 15:35:14 2013 +0200

'make install-webconf-auth' is optional

refs #3964

---

 de/quickstart-icinga-freebsd.xml   |    2 +-
 de/quickstart-icinga.xml           |    2 +-
 de/quickstart-idoutils-freebsd.xml |    2 +-
 de/quickstart-idoutils.xml         |    2 +-
 en/quickstart-icinga-freebsd.xml   |    2 +-
 en/quickstart-icinga.xml           |    2 +-
 en/quickstart-idoutils-freebsd.xml |    2 +-
 en/quickstart-idoutils.xml         |    2 +-
 en/upgrading.xml                   |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/de/quickstart-icinga-freebsd.xml b/de/quickstart-icinga-freebsd.xml
index 92eda52..1eeaeff 100644
--- a/de/quickstart-icinga-freebsd.xml
+++ b/de/quickstart-icinga-freebsd.xml
@@ -216,7 +216,7 @@
   <programlisting> # make install-webconf</programlisting>
 
   <note>
-    <para>Ab &name-icinga; 1.9 installiert dieser Befehl zusätzlich die Datei <filename>htpasswd.users</filename>, die Anmeldeinformationen
+    <para>Ab &name-icinga; 1.9 installiert der Befehl 'make install-webconf-auth' zusätzlich die Datei <filename>htpasswd.users</filename>, die Anmeldeinformationen
     für den Benutzer <emphasis>icingaadmin</emphasis> enthält, so dass Sie den nächsten Schritt überspringen können. Das Passwort lautet
     <emphasis>icingaadmin</emphasis>.</para>
   </note>
diff --git a/de/quickstart-icinga.xml b/de/quickstart-icinga.xml
index 8f48b1d..dca77f6 100644
--- a/de/quickstart-icinga.xml
+++ b/de/quickstart-icinga.xml
@@ -296,7 +296,7 @@
     <programlisting> #> make install-webconf</programlisting>
 
     <note>
-      <para>Ab &name-icinga; 1.9 installiert dieser Befehl zusätzlich die Datei <filename>htpasswd.users</filename>, die
+      <para>Ab &name-icinga; 1.9 installiert der Befehl 'make install-webconf-auth' zusätzlich die Datei <filename>htpasswd.users</filename>, die
       Anmeldeinformationen für den Benutzer <emphasis>icingaadmin</emphasis> enthält, so dass Sie den nächsten Schritt überspringen können.
       Das Passwort lautet <emphasis>icingaadmin</emphasis>.</para>
     </note>
diff --git a/de/quickstart-idoutils-freebsd.xml b/de/quickstart-idoutils-freebsd.xml
index 91ff9a6..b84746d 100644
--- a/de/quickstart-idoutils-freebsd.xml
+++ b/de/quickstart-idoutils-freebsd.xml
@@ -404,7 +404,7 @@
  #> gmake install-webconf</programlisting>
 
   <note>
-    <para>Ab &name-icinga; 1.9 installiert dieser Befehl zusätzlich die Datei <filename>htpasswd.users</filename>, die Anmeldeinformationen
+    <para>Ab &name-icinga; 1.9 installiert der Befehl 'make install-webconf-auth' zusätzlich die Datei <filename>htpasswd.users</filename>, die Anmeldeinformationen
     für den Benutzer <emphasis>icingaadmin</emphasis> enthält, so dass Sie den nächsten Schritt überspringen können. Das Passwort lautet
     <emphasis>icingaadmin</emphasis>.</para>
   </note>
diff --git a/de/quickstart-idoutils.xml b/de/quickstart-idoutils.xml
index 1786438..880537b 100644
--- a/de/quickstart-idoutils.xml
+++ b/de/quickstart-idoutils.xml
@@ -736,7 +736,7 @@
  #> make install-webconf</programlisting>
 
     <note>
-      <para>Ab &name-icinga; 1.9 installiert dieser Befehl zusätzlich die Datei <filename>htpasswd.users</filename>, die
+      <para>Ab &name-icinga; 1.9 installiert der Befehl 'make install-webconf-auth' zusätzlich die Datei <filename>htpasswd.users</filename>, die
       Anmeldeinformationen für den Benutzer <emphasis>icingaadmin</emphasis> enthält, so dass Sie den nächsten Schritt überspringen können.
       Das Passwort lautet <emphasis>icingaadmin</emphasis>.</para>
     </note>
diff --git a/en/quickstart-icinga-freebsd.xml b/en/quickstart-icinga-freebsd.xml
index 2aad25f..4aaa998 100644
--- a/en/quickstart-icinga-freebsd.xml
+++ b/en/quickstart-icinga-freebsd.xml
@@ -209,7 +209,7 @@
   <programlisting> #> make install-webconf</programlisting>
 
   <note>
-    <para>Starting with &name-icinga; 1.9 this command additionally installs the file <filename>htpasswd.users</filename> which contains
+    <para>Starting with &name-icinga; 1.9 the command 'make install-webconf-auth' additionally installs the file <filename>htpasswd.users</filename> which contains
     credentials for the user <emphasis>icingaadmin</emphasis> so you can skip the following step. The password is
     <emphasis>icingaadmin</emphasis>.</para>
   </note>
diff --git a/en/quickstart-icinga.xml b/en/quickstart-icinga.xml
index 225ae3d..6314e16 100644
--- a/en/quickstart-icinga.xml
+++ b/en/quickstart-icinga.xml
@@ -299,7 +299,7 @@
     <programlisting> #> make install-webconf</programlisting>
 
     <note>
-      <para>Starting with &name-icinga; 1.9 this command additionally installs the file <filename>htpasswd.users</filename> which contains
+      <para>Starting with &name-icinga; 1.9 thecommand 'make install-webconf-auth' additionally installs the file <filename>htpasswd.users</filename> which contains
       credentials for the user <emphasis>icingaadmin</emphasis> so you can skip the following step. The password is
       <emphasis>icingaadmin</emphasis>.</para>
     </note>
diff --git a/en/quickstart-idoutils-freebsd.xml b/en/quickstart-idoutils-freebsd.xml
index 1282e82..36bf25c 100644
--- a/en/quickstart-idoutils-freebsd.xml
+++ b/en/quickstart-idoutils-freebsd.xml
@@ -407,7 +407,7 @@
   <screen> #> make install-webconf</screen>
 
   <note>
-    <para>Starting with &name-icinga; 1.9 this command additionally installs the file <filename>htpasswd.users</filename> which contains
+    <para>Starting with &name-icinga; 1.9 the command 'make install-webconf-auth' additionally installs the file <filename>htpasswd.users</filename> which contains
     credentials for the user <emphasis>icingaadmin</emphasis> so you can skip the following step. The password is
     <emphasis>icingaadmin</emphasis>.</para>
   </note>
diff --git a/en/quickstart-idoutils.xml b/en/quickstart-idoutils.xml
index e3f836a..4ffb410 100644
--- a/en/quickstart-idoutils.xml
+++ b/en/quickstart-idoutils.xml
@@ -736,7 +736,7 @@
     <screen> #> make install-webconf</screen>
 
     <note>
-      <para>Starting with &name-icinga; 1.9 this command additionally installs the file <filename>htpasswd.users</filename> which contains
+      <para>Starting with &name-icinga; 1.9 the command 'make install-webconf-auth' additionally installs the file <filename>htpasswd.users</filename> which contains
       credentials for the user <emphasis>icingaadmin</emphasis> so you can skip the following step. The password is
       <emphasis>icingaadmin</emphasis>.</para>
     </note>
diff --git a/en/upgrading.xml b/en/upgrading.xml
index 51954cd..273be60 100644
--- a/en/upgrading.xml
+++ b/en/upgrading.xml
@@ -67,7 +67,7 @@
     Get the latest Icinga version from <link xlink:href="http://www.icinga.org/">&url-icinga;</link> and extract it. Then run configure like
     you did with the old version. <programlisting> #> ./configure --with-command-group=icinga-cmd --enable-idoutils</programlisting>
     Compile the source. <programlisting> #> make all</programlisting> Please make sure that you don't overwrite your configs - always
-    make a backup! Don't use <code>make install-config</code> and/or <code>make install-webconf</code> if you want to manually diff the
+    make a backup! Don't use <code>make install-config</code> and/or <code>make install-webconf</code> and/or <code>make install-webconf-auth</code>if you want to manually diff the
     config files. <programlisting> #> make install install-base install-cgis install-html install-init \
     install-commandmode install-idoutils</programlisting> or decide what you want to upgrade by just typing 'make' which shows all available
     options. Check your config and restart Icinga. <programlisting> #> /etc/init.d/icinga checkconfig





More information about the icinga-checkins mailing list