[icinga-checkins] icinga.org: icinga-doc/master: some typos

git at icinga.org git at icinga.org
Tue Mar 15 23:08:05 CET 2011


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

Author: Wolfgang <wnd at gmx.net>
Date:   Fri Mar  4 20:39:56 2011 +0100

some typos

---

 en/icinga-web-config.xml  |   18 +++++++++---------
 en/icinga-web-scratch.xml |   16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/en/icinga-web-config.xml b/en/icinga-web-config.xml
index ed62e5c..8f62ad8 100644
--- a/en/icinga-web-config.xml
+++ b/en/icinga-web-config.xml
@@ -60,7 +60,7 @@ app/modules/AppKit/
 
   <para><emphasis role="bold">app/config</emphasis></para>
 
-  <para>Here you find the global configuration files for e.g. the Web session, the Icinga web path and the database informations.</para>
+  <para>Here you find the global configuration files for e.g. the Web session, the Icinga web path and the database information.</para>
 
   <para>The main interesting files:</para>
 
@@ -70,7 +70,7 @@ app/modules/AppKit/
     </listitem>
 
     <listitem>
-      <para>factories.xml - holds the config for your web session, e.g. the session_cookie_lifetime- parameter</para>
+      <para>factories.xml - holds the config for your web session, e.g. the session_cookie_lifetime-parameter</para>
     </listitem>
 
     <listitem>
@@ -95,7 +95,7 @@ app/modules/AppKit/
 
   <para>Example: Change the default timezone for &name-web;</para>
 
-  <para>If the time(zone) in &name-web; differs to your system time(zone), please check the date.timezone entry in
+  <para>If the time(zone) in &name-web; differs from your system time(zone), please check the date.timezone entry in
   app/modules/AppKit/config/module.xml (e.g. 'Europe/Berlin')</para>
 
   <programlisting>#> vi app/modules/AppKit/config/module.xml
@@ -143,14 +143,14 @@ app/modules/AppKit/
   <para>You can also duplicate the provider to provide more authentication bases. You can split the auth into authentication and authorising
   parts if you want. If you have new providers, please share them and let the auth database grow!</para>
 
-  <para>Please store your costum authentication configuration in auth.site.xml !</para>
+  <para>Please store your custom authentication configuration in auth.site.xml !</para>
 
   <para><emphasis role="bold">app/modules/Cronks</emphasis></para>
 
-  <para>All the cronks are implemented there: Grids, iframes. All of them are simple html sites which holds ExtJS component codes. If you
+  <para>All the cronks are implemented there: Grids, iframes. All of them are simple html sites which hold ExtJS component codes. If you
   need to add a new cronk, this module is your friend.</para>
 
-  <para>If you want to develop a new Cronk take a look at <link
+  <para>If you want to develop a new cronk take a look at <link
   xlink:href="https://dev.icinga.org/projects/icinga-development/wiki/HowToDevelopCronks">HowToDevelopCronks</link></para>
 
   <para>To change the configuration, go to the Cronks module.</para>
@@ -217,7 +217,7 @@ autoload.xml  config_handlers.xml  cronks.xml  module.xml  validators.xml</progr
 
     <listitem>
       <para>Your specific &name-web; configuration settings like api, authentication and database settings can be set in
-      app/modules/Appkit(/Cronks/Web)/config/*.site.xml- Files and will be used in the first place. They won't get overwritten during the
+      app/modules/Appkit(/Cronks/Web)/config/*.site.xml files and will be used in the first place. They won't get overwritten during the
       next upgrade process.</para>
 
       <para>These files already exist and you're free to use them for your specific settings:</para>
@@ -250,7 +250,7 @@ autoload.xml  config_handlers.xml  cronks.xml  module.xml  validators.xml</progr
 
       <para>app/modules/Cronks/data/xml/grid/icinga-host-template.xml</para>
 
-      <para>....</para>
+      <para>...</para>
 
       <para><emphasis role="bold">and the TO's:</emphasis></para>
 
@@ -278,7 +278,7 @@ autoload.xml  config_handlers.xml  cronks.xml  module.xml  validators.xml</progr
 
   <programlisting>#> /icinga-web/bin/clearcache.sh</programlisting>
 
-  <para>You need more informations? Please have a look at our <link
+  <para>You need more information? Please have a look at our <link
   xlink:href="https://dev.icinga.org/projects/icinga-development/wiki/">Development Wiki.</link></para>
 
   <indexterm zone="icinga-web-config">
diff --git a/en/icinga-web-scratch.xml b/en/icinga-web-scratch.xml
index d636fbe..42ec7fc 100644
--- a/en/icinga-web-scratch.xml
+++ b/en/icinga-web-scratch.xml
@@ -18,8 +18,8 @@
   the module architecture, please check out the development wiki of Icinga Web: <link
   xlink:href="https://dev.icinga.org/projects/icinga-development/wiki#24-Icinga-Web">&name-icingawiki;</link></para>
 
-  <para>This installation guide describes the installation of &name-web; with &name-mysql; as used database. &name-web; also supports
-  &name-oracle; and &name-postgres; as used database backends.</para>
+  <para>This installation guide describes the installation of &name-web; with &name-mysql; as underlying database. &name-web; also supports
+  &name-oracle; and &name-postgres; as database backends.</para>
 
   <orderedlist>
     <listitem>
@@ -126,16 +126,16 @@
 
       <programlisting> #> make install-apache-config</programlisting>
 
-      <para>If you don't need an alias, you can alternatively use the old behavior setting a symlink instead: <programlisting> #> make install-javascript</programlisting></para>
+      <para>If you don't need an alias, you can alternatively use the old behaviour setting a symlink instead: <programlisting> #> make install-javascript</programlisting></para>
 
       <para>Make reports after install:</para>
 
       <programlisting> #> make install-done
 
- Installation if icinga-web succeeded.
+ Installation of icinga-web succeeded.
  Please check the new Apache2 configuration (etc/apache2/icinga-web.conf).</programlisting>
 
-      <para>Other usefull target: <programlisting> #> make icinga-reset-password</programlisting> Reset password for any account on
+      <para>Other useful target: <programlisting> #> make icinga-reset-password</programlisting> Reset password for any account on
       icinga-web.</para>
     </listitem>
 
@@ -407,7 +407,7 @@
 
       <para>Edit your .htaccess in /usr/local/icinga-web/pub:</para>
 
-      <para>At line 14, change the RewriteBase direction to suit your needs:<programlisting> DirectoryIndex index.php
+      <para>At line 14, change the RewriteBase direction to suit to your needs:<programlisting> DirectoryIndex index.php
 
  Options -MultiViews -Indexes +FollowSymLinks
  Order allow,deny
@@ -452,7 +452,7 @@
  #</IfModule></programlisting></para>
 
       <para>Go to the webservers configuration directory. Look if the created config by <emphasis role="bold">make
-      install-apache-config</emphasis> suit to your configuration. Or create new aliases (maybe in /etc/apache2/conf.d/icinga-web.conf)
+      install-apache-config</emphasis> suits to your configuration. Or create new aliases (maybe in /etc/apache2/conf.d/icinga-web.conf)
       :</para>
 
       <para><programlisting>#> cat /etc/apache2/icinga-web.conf
@@ -607,7 +607,7 @@ Alias /icinga-web /usr/local/icinga-web/pub
       <para>* Empty Icinga Web? => If mod_rewrite is enabled and 'index.php' appears in the request url the portal does not work. Try to
       remove the index.php from your url and everything should work</para>
 
-      <para>* Login possible but Icinga Web keeps loading data....</para>
+      <para>* Login possible but Icinga Web keeps loading data...</para>
 
       <para>* Request failed, Ressource /icinga-web/appkit/ext/application State could not be loaded - is the url correct? => mod_rewrite
       enabled ?</para>





More information about the icinga-checkins mailing list