You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bu...@apache.org on 2014/12/02 09:55:21 UTC
svn commit: r931304 - in /websites/staging/directory/trunk/content: ./
apacheds/ apacheds/advanced-ug/ apacheds/advanced-ug/images/
Author: buildbot
Date: Tue Dec 2 08:55:20 2014
New Revision: 931304
Log:
Staging update by buildbot for directory
Added:
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/images/mac.png (with props)
Removed:
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.1-debian-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.2-rpm-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.3-macosx-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.4-windows-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.5-generic-installation-layout.html
Modified:
websites/staging/directory/trunk/content/ (props changed)
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2-installation-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-ug/2.3-instance-layout.html
websites/staging/directory/trunk/content/apacheds/advanced-user-guide.html
Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec 2 08:55:20 2014
@@ -1 +1 @@
-1642819
+1642824
Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2-installation-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2-installation-layout.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2-installation-layout.html Tue Dec 2 08:55:20 2014
@@ -168,11 +168,10 @@
<p>The following chapters will describe the installation layout for the various OS we support :</p>
<p>Note that the installation will differ with the target OS. We currently support :</p>
<ul>
-<li><img alt="debian" src="images/debian.png" /><a href="2.2.1-debian-installation-layout.html">2.2.1 - Debian Installation Layout</a></li>
-<li><img alt="RPM" src="images/rpm.png" /><a href="2.2.2-rpm-installation-layout.html">2.2.2 - RPM Installation Layout</a></li>
-<li><img alt="MacOSX" src="images/mac.png" /><a href="2.2.3-macosx-installation-layout.html">2.2.3 - MacOSX Installation Layout</a></li>
-<li><img alt="Windows" src="images/windows.png" /><a href="2.2.4-windows-installation-layout.html">2.2.4 - Windows Installation Layout</a></li>
-<li><a href="2.2.5-generic-installation-layout.html">2.2.5 - Generic Installation Layout</a></li>
+<li><img alt="Linux" src="images/linux.png" /><a href="2.2.1-linux-installation-layout.html">2.2.1 - Linux Installation Layout</a></li>
+<li><img alt="MacOSX" src="images/mac.png" /><a href="2.2.2-macosx-installation-layout.html">2.2.2 - MacOSX Installation Layout</a></li>
+<li><img alt="Windows" src="images/windows.png" /><a href="2.2.3-windows-installation-layout.html">2.2.3 - Windows Installation Layout</a></li>
+<li><img alt="Generic" src="images/generic.png" /><a href="2.2.4-generic-installation-layout.html">2.2.4 - Generic Installation Layout</a></li>
</ul>
Added: websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.html Tue Dec 2 08:55:20 2014
@@ -0,0 +1,358 @@
+<!DOCTYPE html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+ <head>
+ <title>2.2.1 - Linux Installation Layout — Apache Directory</title>
+
+ <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+ <link href="./../../css/green.css" rel="stylesheet" type="text/css">
+
+
+ <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+
+ <!-- Google Analytics -->
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ _uacct = "UA-1358462-1";
+ urchinTracker();
+ </script>
+ </head>
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="subProjectsNavBar">
+ <a href="./../../">
+
+ Apache Directory Project
+
+ </a>
+ |
+ <a href="./../../apacheds">
+
+ <STRONG>ApacheDS</STRONG>
+
+ </a>
+ |
+ <a href="./../../studio">
+
+ Apache Directory Studio
+
+ </a>
+ |
+ <a href="./../../api">
+
+ Apache LDAP API
+
+ </a>
+ |
+ <a href="./../../mavibot">
+
+ Mavibot
+
+ </a>
+ |
+ <a href="./../../escimo">
+
+ eSCIMo
+
+ </a>
+ |
+ <a href="./../../fortress">
+
+ Fortress
+
+ </a>
+ </div><!-- subProjectsNavBar -->
+ </div><!-- header -->
+ <div id="content">
+ <div id="leftColumn">
+
+<div id="navigation">
+
+ <!--ul>
+ <li>
+ <a href="http://bit.ly/1n9YlQT" target="_blank">
+ <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+ </a>
+ </li>
+ </ul-->
+ <h5>ApacheDS 2.0</h5>
+ <ul>
+ <li><a href="./../../apacheds/">Home</a></li>
+ <li><a href="./../../apacheds/news.html">News</a></li>
+ <li><a href="./../../apacheds/features.html">Features</a></li>
+ </ul>
+ <h5>Downloads</h5>
+ <ul>
+ <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M19</a> <img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+ <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+ </ul>
+ <h5>Documentation</h5>
+ <ul>
+ <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+ <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+ <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+ <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+ <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/xref">Cross-Reference</a></li>
+ </ul>
+
+
+ <h5>Support</h5>
+ <ul>
+ <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists & IRC</a></li>
+ <li><a href="./../../sources.html">Sources</a></li>
+ <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+ <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+ </ul>
+ <h5>Community</h5>
+ <ul>
+ <li><a href="./../../contribute.html">How to Contribute</a></li>
+ <li><a href="./../../team.html">Team</a></li>
+ <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+ <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+ </ul>
+ <h5>About Apache</h5>
+ <ul>
+ <li><a href="http://www.apache.org/">Apache</a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ </ul>
+
+</div><!-- navigation -->
+
+ </div><!-- leftColumn -->
+ <div id="rightColumn">
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.2.2-macosx-installation-layout.html">2.2.2 - MacOSX Installation Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+<h1 id="221-linux-installation-layout">2.2.1 - <img alt="Linux" src="images/linux.png" />Linux Installation Layout</h1>
+<p>When you installed ApacheDS on your Linux machine, it created various directories on your disk. Typically, we need to store :</p>
+<ul>
+<li>the binaries</li>
+<li>the server configuration files</li>
+<li>the license files</li>
+<li>the dependencies</li>
+</ul>
+<p>We will describe in this chapter the global layout and the various files and their meaning and use. </p>
+<p>The Linux installer comes into two flavors : a <img alt="debian" src="images/debian.png" />Debian installer or a <img alt="RPM" src="images/rpm.png" />RPM installer.</p>
+<h2 id="linux-standard-layout"><img alt="Linux" src="images/linux.png" /> Linux Standard layout</h2>
+<p>On Linux, the installation will be done in <em>/opt</em>, and the daemon script will be in <em>/etc/init.d</em>. Here are the created directories :</p>
+<PRE>
+ /opt/apacheds-<version>/
+ |
+ +-- bin/
+ | |
+ | +-- apacheds*
+ | |
+ | +-- wrapper*
+ |
+ +-- conf/
+ | |
+ | +-- wrapper.conf
+ |
+ +-- lib/
+ | |
+ | +-- apacheds-service-<version>.jar
+ | |
+ | +-- apacheds-wrapper-<version>.jar
+ | |
+ | +-- libwrapper.so
+ | |
+ | +-- wrapper-3.2.3.jar
+ |
+ +-- NOTICE
+ |
+ +-- LICENSE
+</PRE>
+
+<h2 id="starting-ther-server"><img alt="Linux" src="images/linux.png" />! Starting ther server</h2>
+<p>THere are three ways to start the server :</p>
+<ul>
+<li>as a daemon : in this case, the server is automatically started when the machine is started.</li>
+<li>starting the daemon from /etc/init.d manually</li>
+<li>starting the server from /opt/apacheds-<version>/bin</li>
+</ul>
+<p>The most convenient is obviously to let the server starts <em>apacheDS</em> automatically when the server is started. It's enough to launch this command once the installation has been done :</p>
+<div class="codehilite"><pre>$ <span class="n">sudo</span> <span class="n">su</span>
+$ <span class="n">cd</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span>
+$ <span class="n">update</span><span class="o">-</span><span class="n">rc</span><span class="p">.</span><span class="n">d</span> <span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="n">defaults</span>
+<span class="n">Adding</span> <span class="n">system</span> <span class="n">startup</span> <span class="k">for</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="p">...</span>
+<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">rc0</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">K20apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="o">-></span> <span class="p">.</span><span class="o">./</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span>
+<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">rc1</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">K20apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="o">-></span> <span class="p">.</span><span class="o">./</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span>
+<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">rc6</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">K20apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="o">-></span> <span class="p">.</span><span class="o">./</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span>
+<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">rc2</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">S20apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="o">-></span> <span class="p">.</span><span class="o">./</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span>
+<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">rc3</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">S20apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="o">-></span> <span class="p">.</span><span class="o">./</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span>
+<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">rc4</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">S20apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="o">-></span> <span class="p">.</span><span class="o">./</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span>
+<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">rc5</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">S20apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="o">-></span> <span class="p">.</span><span class="o">./</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span>
+</pre></div>
+
+
+<p>Otherwise, starting the server using option 2 is all about typing this command line :</p>
+<div class="codehilite"><pre>$ <span class="n">sudo</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">-</span><span class="n">default</span> <span class="n">start</span>
+</pre></div>
+
+
+<p>This will start the default instance. Would you like to have more than one instance of the server installed, then you'll have to modify this script.</p>
+<p>Starting the server using the <em>apacheds</em> script requires that you provide a third parameter : the instance to run.</p>
+<div class="codehilite"><pre>$ <span class="n">sudo</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">apacheds</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M20</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">apacheds</span> <span class="n">start</span> <span class="n">default</span>
+</pre></div>
+
+
+<p>In any case, we start the <em>apacheds</em> script, which strats the <em>wrapper</em> executable, which itself starts the serveur.</p>
+<h3 id="bin-directory"><img alt="Linux" src="images/linux.png" /> bin directory</h3>
+<p>The <em>bin</em> directory contains the binary used to launch the server. The <em>apacheds</em> script starts the <em>wrapper</em> executable, using the configuration file <em>wrapper.conf</em>.</p>
+<h3 id="conf-directory"><img alt="Linux" src="images/linux.png" />conf directory</h3>
+<p>This directory contain the wrapper configuration file. This is a description of its content. The <em>%INSTANCE_DIRECTORY%</em> parameter is taken from the <em>apacheds</em> script, it refers to the isnance location. Out of all those parameters, it's likely that the one you may want to change is the <em>wrapper.java.maxmemory</em> one, if needed.</p>
+<table>
+<thead>
+<tr>
+<th>parameter</th>
+<th>Description</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>wrapper.java.additional.1</td>
+<td>The first parameter passed to the JVM</td>
+<td>-Dlog4j.configuration=file:///%INSTANCE_DIRECTORY%/conf/log4j.properties</td>
+</tr>
+<tr>
+<td>wrapper.java.additional.2</td>
+<td>The <em>var</em> directory</td>
+<td>-Dapacheds.var.dir=%INSTANCE_DIRECTORY%</td>
+</tr>
+<tr>
+<td>wrapper.java.additional.3</td>
+<td>The <em>log</em> directory</td>
+<td>-Dapacheds.log.dir=%INSTANCE_DIRECTORY%/log</td>
+</tr>
+<tr>
+<td>wrapper.java.additional.4</td>
+<td>The <em>run</em> directory</td>
+<td>-Dapacheds.run.dir=%INSTANCE_DIRECTORY%/run</td>
+</tr>
+<tr>
+<td>wrapper.java.additional.5</td>
+<td>The server instance</td>
+<td>-Dapacheds.instance=%INSTANCE%</td>
+</tr>
+<tr>
+<td>wrapper.java.initmemory</td>
+<td>The minimal memory to use</td>
+<td>No default value</td>
+</tr>
+<tr>
+<td>wrapper.java.maxmemory</td>
+<td>The maximal memory to use</td>
+<td>No default value</td>
+</tr>
+<tr>
+<td>wrapper.java.maxmemory</td>
+<td>The -Xmx JVM parameter</td>
+<td>2048m</td>
+</tr>
+<tr>
+<td>wrapper.console.loglevel</td>
+<td>The wrapper log level</td>
+<td>INFO</td>
+</tr>
+<tr>
+<td>wrapper.logfile</td>
+<td>The wrapper log file</td>
+<td>%INSTANCE_DIRECTORY%/log/wrapper.log</td>
+</tr>
+<tr>
+<td>wrapper.logfile.maxsize</td>
+<td>The wrapper log maximal size</td>
+<td>1m</td>
+</tr>
+<tr>
+<td>wrapper.logfile.maxfiles</td>
+<td>The number of wrapper log file we kep on disk</td>
+<td>5</td>
+</tr>
+<tr>
+<td>wrapper.ping.timeout</td>
+<td>The delay after which we will consider the server as stalled</td>
+<td>240s (4 mins)</td>
+</tr>
+<tr>
+<td>wrapper.startup.timeout</td>
+<td>The maximum delay allowed for the server to start</td>
+<td>120 secs</td>
+</tr>
+</tbody>
+</table>
+<h3 id="lib-directory"><img alt="Linux" src="images/linux.png" /> lib directory</h3>
+<p>This directory contains the third party library the server needs. You should not have to change anything there.</p>
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.2.2-macosx-installation-layout.html">2.2.2 - MacOSX Installation Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+ </div><!-- rightColumn -->
+ <div id="endContent"></div>
+ </div><!-- content -->
+ <div id="footer">© 2003-2014, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+ Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse,
+ Apache EnMasse, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+ </div>
+ </div><!-- container -->
+ </body>
+</html>
\ No newline at end of file
Added: websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.html Tue Dec 2 08:55:20 2014
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+ <head>
+ <title>2.2.2 - MacOSX Installation Layout — Apache Directory</title>
+
+ <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+ <link href="./../../css/green.css" rel="stylesheet" type="text/css">
+
+
+ <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+
+ <!-- Google Analytics -->
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ _uacct = "UA-1358462-1";
+ urchinTracker();
+ </script>
+ </head>
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="subProjectsNavBar">
+ <a href="./../../">
+
+ Apache Directory Project
+
+ </a>
+ |
+ <a href="./../../apacheds">
+
+ <STRONG>ApacheDS</STRONG>
+
+ </a>
+ |
+ <a href="./../../studio">
+
+ Apache Directory Studio
+
+ </a>
+ |
+ <a href="./../../api">
+
+ Apache LDAP API
+
+ </a>
+ |
+ <a href="./../../mavibot">
+
+ Mavibot
+
+ </a>
+ |
+ <a href="./../../escimo">
+
+ eSCIMo
+
+ </a>
+ |
+ <a href="./../../fortress">
+
+ Fortress
+
+ </a>
+ </div><!-- subProjectsNavBar -->
+ </div><!-- header -->
+ <div id="content">
+ <div id="leftColumn">
+
+<div id="navigation">
+
+ <!--ul>
+ <li>
+ <a href="http://bit.ly/1n9YlQT" target="_blank">
+ <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+ </a>
+ </li>
+ </ul-->
+ <h5>ApacheDS 2.0</h5>
+ <ul>
+ <li><a href="./../../apacheds/">Home</a></li>
+ <li><a href="./../../apacheds/news.html">News</a></li>
+ <li><a href="./../../apacheds/features.html">Features</a></li>
+ </ul>
+ <h5>Downloads</h5>
+ <ul>
+ <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M19</a> <img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+ <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+ </ul>
+ <h5>Documentation</h5>
+ <ul>
+ <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+ <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+ <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+ <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+ <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/xref">Cross-Reference</a></li>
+ </ul>
+
+
+ <h5>Support</h5>
+ <ul>
+ <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists & IRC</a></li>
+ <li><a href="./../../sources.html">Sources</a></li>
+ <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+ <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+ </ul>
+ <h5>Community</h5>
+ <ul>
+ <li><a href="./../../contribute.html">How to Contribute</a></li>
+ <li><a href="./../../team.html">Team</a></li>
+ <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+ <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+ </ul>
+ <h5>About Apache</h5>
+ <ul>
+ <li><a href="http://www.apache.org/">Apache</a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ </ul>
+
+</div><!-- navigation -->
+
+ </div><!-- leftColumn -->
+ <div id="rightColumn">
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2.1-linux-installation-layout.html">2.2.1 - Linux Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.2.3-windows-installation-layout.html">2.2.3 - Windows Installation Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+<h1 id="222-macosx-installation-layout">2.2.2 - <img alt="maMacOSXcosx" src="images/mac.png" />MacOSX Installation Layout</h1>
+<p>TODO...</p>
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2.1-linux-installation-layout.html">2.2.1 - Linux Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.2.3-windows-installation-layout.html">2.2.3 - Windows Installation Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+ </div><!-- rightColumn -->
+ <div id="endContent"></div>
+ </div><!-- content -->
+ <div id="footer">© 2003-2014, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+ Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse,
+ Apache EnMasse, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+ </div>
+ </div><!-- container -->
+ </body>
+</html>
\ No newline at end of file
Added: websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.html Tue Dec 2 08:55:20 2014
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+ <head>
+ <title>2.2.3 - Windows Installation Layout — Apache Directory</title>
+
+ <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+ <link href="./../../css/green.css" rel="stylesheet" type="text/css">
+
+
+ <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+
+ <!-- Google Analytics -->
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ _uacct = "UA-1358462-1";
+ urchinTracker();
+ </script>
+ </head>
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="subProjectsNavBar">
+ <a href="./../../">
+
+ Apache Directory Project
+
+ </a>
+ |
+ <a href="./../../apacheds">
+
+ <STRONG>ApacheDS</STRONG>
+
+ </a>
+ |
+ <a href="./../../studio">
+
+ Apache Directory Studio
+
+ </a>
+ |
+ <a href="./../../api">
+
+ Apache LDAP API
+
+ </a>
+ |
+ <a href="./../../mavibot">
+
+ Mavibot
+
+ </a>
+ |
+ <a href="./../../escimo">
+
+ eSCIMo
+
+ </a>
+ |
+ <a href="./../../fortress">
+
+ Fortress
+
+ </a>
+ </div><!-- subProjectsNavBar -->
+ </div><!-- header -->
+ <div id="content">
+ <div id="leftColumn">
+
+<div id="navigation">
+
+ <!--ul>
+ <li>
+ <a href="http://bit.ly/1n9YlQT" target="_blank">
+ <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+ </a>
+ </li>
+ </ul-->
+ <h5>ApacheDS 2.0</h5>
+ <ul>
+ <li><a href="./../../apacheds/">Home</a></li>
+ <li><a href="./../../apacheds/news.html">News</a></li>
+ <li><a href="./../../apacheds/features.html">Features</a></li>
+ </ul>
+ <h5>Downloads</h5>
+ <ul>
+ <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M19</a> <img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+ <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+ </ul>
+ <h5>Documentation</h5>
+ <ul>
+ <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+ <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+ <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+ <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+ <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/xref">Cross-Reference</a></li>
+ </ul>
+
+
+ <h5>Support</h5>
+ <ul>
+ <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists & IRC</a></li>
+ <li><a href="./../../sources.html">Sources</a></li>
+ <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+ <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+ </ul>
+ <h5>Community</h5>
+ <ul>
+ <li><a href="./../../contribute.html">How to Contribute</a></li>
+ <li><a href="./../../team.html">Team</a></li>
+ <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+ <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+ </ul>
+ <h5>About Apache</h5>
+ <ul>
+ <li><a href="http://www.apache.org/">Apache</a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ </ul>
+
+</div><!-- navigation -->
+
+ </div><!-- leftColumn -->
+ <div id="rightColumn">
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2.2-macosx-installation-layout.html">2.2.2 - MacOSX Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.2.4-generic-installation-layout.html">2.2.4 - Generic Installation Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+<h1 id="223-windows-installation-layout">2.2.3 - <img alt="windows" src="images/windows.png" />Windows Installation Layout</h1>
+<p>TODO...</p>
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2.2-macosx-installation-layout.html">2.2.2 - MacOSX Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.2.4-generic-installation-layout.html">2.2.4 - Generic Installation Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+ </div><!-- rightColumn -->
+ <div id="endContent"></div>
+ </div><!-- content -->
+ <div id="footer">© 2003-2014, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+ Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse,
+ Apache EnMasse, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+ </div>
+ </div><!-- container -->
+ </body>
+</html>
\ No newline at end of file
Added: websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.html Tue Dec 2 08:55:20 2014
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+ <head>
+ <title>2.2.4 - Generic Installation Layout — Apache Directory</title>
+
+ <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+ <link href="./../../css/green.css" rel="stylesheet" type="text/css">
+
+
+ <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+
+ <!-- Google Analytics -->
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ _uacct = "UA-1358462-1";
+ urchinTracker();
+ </script>
+ </head>
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="subProjectsNavBar">
+ <a href="./../../">
+
+ Apache Directory Project
+
+ </a>
+ |
+ <a href="./../../apacheds">
+
+ <STRONG>ApacheDS</STRONG>
+
+ </a>
+ |
+ <a href="./../../studio">
+
+ Apache Directory Studio
+
+ </a>
+ |
+ <a href="./../../api">
+
+ Apache LDAP API
+
+ </a>
+ |
+ <a href="./../../mavibot">
+
+ Mavibot
+
+ </a>
+ |
+ <a href="./../../escimo">
+
+ eSCIMo
+
+ </a>
+ |
+ <a href="./../../fortress">
+
+ Fortress
+
+ </a>
+ </div><!-- subProjectsNavBar -->
+ </div><!-- header -->
+ <div id="content">
+ <div id="leftColumn">
+
+<div id="navigation">
+
+ <!--ul>
+ <li>
+ <a href="http://bit.ly/1n9YlQT" target="_blank">
+ <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+ </a>
+ </li>
+ </ul-->
+ <h5>ApacheDS 2.0</h5>
+ <ul>
+ <li><a href="./../../apacheds/">Home</a></li>
+ <li><a href="./../../apacheds/news.html">News</a></li>
+ <li><a href="./../../apacheds/features.html">Features</a></li>
+ </ul>
+ <h5>Downloads</h5>
+ <ul>
+ <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M19</a> <img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+ <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+ </ul>
+ <h5>Documentation</h5>
+ <ul>
+ <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+ <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+ <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+ <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+ <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
+ <li><a href="./../../apacheds/gen-docs/latest/xref">Cross-Reference</a></li>
+ </ul>
+
+
+ <h5>Support</h5>
+ <ul>
+ <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists & IRC</a></li>
+ <li><a href="./../../sources.html">Sources</a></li>
+ <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+ <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+ </ul>
+ <h5>Community</h5>
+ <ul>
+ <li><a href="./../../contribute.html">How to Contribute</a></li>
+ <li><a href="./../../team.html">Team</a></li>
+ <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+ <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+ </ul>
+ <h5>About Apache</h5>
+ <ul>
+ <li><a href="http://www.apache.org/">Apache</a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ </ul>
+
+</div><!-- navigation -->
+
+ </div><!-- leftColumn -->
+ <div id="rightColumn">
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2.3-windows-installation-layout.html">2.2.3 - Windows Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.3-instance-layout.html">2.3 - Instance Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+<h1 id="224-generic-installation-layout">2.2.4 - <img alt="Generic" src="images/generic.png" />Generic Installation Layout</h1>
+<p>TODO...</p>
+
+
+ <div class="nav">
+ <div class="nav_prev">
+
+ <a href="2.2.3-windows-installation-layout.html">2.2.3 - Windows Installation Layout</a>
+
+ </div>
+ <div class="nav_up">
+
+ <a href="2.2-installation-layout.html">2.2 - Installation Layout</a>
+
+ </div>
+ <div class="nav_next">
+
+ <a href="2.3-instance-layout.html">2.3 - Instance Layout</a>
+
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+
+ </div><!-- rightColumn -->
+ <div id="endContent"></div>
+ </div><!-- content -->
+ <div id="footer">© 2003-2014, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+ Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse,
+ Apache EnMasse, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+ </div>
+ </div><!-- container -->
+ </body>
+</html>
\ No newline at end of file
Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/2.3-instance-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/2.3-instance-layout.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/2.3-instance-layout.html Tue Dec 2 08:55:20 2014
@@ -146,7 +146,7 @@
<div class="nav">
<div class="nav_prev">
- <a href="2.2.5-generic-installation-layout.html">2.2.5 - Generic Installation Layout</a>
+ <a href="2.2.4-generic-installation-layout.html">2.2.4 - Generic Installation Layout</a>
</div>
<div class="nav_up">
@@ -232,7 +232,7 @@
<div class="nav">
<div class="nav_prev">
- <a href="2.2.5-generic-installation-layout.html">2.2.5 - Generic Installation Layout</a>
+ <a href="2.2.4-generic-installation-layout.html">2.2.4 - Generic Installation Layout</a>
</div>
<div class="nav_up">
Added: websites/staging/directory/trunk/content/apacheds/advanced-ug/images/mac.png
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/directory/trunk/content/apacheds/advanced-ug/images/mac.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: websites/staging/directory/trunk/content/apacheds/advanced-user-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-user-guide.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-user-guide.html Tue Dec 2 08:55:20 2014
@@ -165,11 +165,10 @@
<li><a href="advanced-ug/2-server-config.html">2. Server Configuration</a><ul>
<li><a href="advanced-ug/2.1-config-description.html">2.1 - Configuration Description</a></li>
<li><a href="advanced-ug/2.2-installation-layout.html">2.2 - Installation Layout</a><ul>
-<li><img alt="debian" src="advanced-ug/images/debian.png" /><a href="advanced-ug/2.2.1-debian-installation-layout.html">2.2.1 - Debian Installation Layout</a></li>
-<li><img alt="RPM" src="advanced-ug/images/rpm.png" /><a href="advanced-ug/2.2.2-rpm-installation-layout.html">2.2.2 - RPM Installation Layout</a></li>
-<li><img alt="MacOSX" src="advanced-ug/images/mac.png" /><a href="advanced-ug/2.2.3-macosx-installation-layout.html">2.2.3 - MacOSX Installation Layout</a></li>
-<li><img alt="Windows" src="advanced-ug/images/windows.png" /><a href="advanced-ug/2.2.4-windows-installation-layout.html">2.2.4 - Windows Installation Layout</a></li>
-<li><a href="advanced-ug/2.2.5-generic-installation-layout.html">2.2.5 - Generic Installation Layout</a></li>
+<li><img alt="Linux" src="advanced-ug/images/linux.png" /><a href="advanced-ug/2.2.1-linux-installation-layout.html">2.2.1 - Linux Installation Layout</a></li>
+<li><img alt="MacOSX" src="advanced-ug/images/mac.png" /><a href="advanced-ug/2.2.2-macosx-installation-layout.html">2.2.2 - MacOSX Installation Layout</a></li>
+<li><img alt="Windows" src="advanced-ug/images/windows.png" /><a href="advanced-ug/2.2.3-windows-installation-layout.html">2.2.3 - Windows Installation Layout</a></li>
+<li><a href="advanced-ug/2.2.4-generic-installation-layout.html"><img alt="Generic" src="advanced-ug/images/generic.png" />2.2.4 - Generic Installation Layout</a></li>
</ul>
</li>
<li><a href="advanced-ug/2.3-instance-layout.html">2.3 - Instance Layout</a><ul>