directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1642824 - in /directory/site/trunk/content/apacheds: ./ advanced-ug/
Date Tue, 02 Dec 2014 08:54:56 GMT
Author: elecharny
Date: Tue Dec  2 08:54:56 2014
New Revision: 1642824

URL: http://svn.apache.org/r1642824
Log:
Merged the Debian and RPM installation layout pages

Added:
    directory/site/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.mdtext
      - copied, changed from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.1-debian-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.mdtext
      - copied, changed from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.3-macosx-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.mdtext
      - copied, changed from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.4-windows-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.mdtext
      - copied, changed from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.5-generic-installation-layout.mdtext
Removed:
    directory/site/trunk/content/apacheds/advanced-ug/2.2.1-debian-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.2.2-rpm-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.2.3-macosx-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.2.4-windows-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.2.5-generic-installation-layout.mdtext
Modified:
    directory/site/trunk/content/apacheds/advanced-ug/2.2-installation-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-ug/2.3-instance-layout.mdtext
    directory/site/trunk/content/apacheds/advanced-user-guide.mdtext

Modified: directory/site/trunk/content/apacheds/advanced-ug/2.2-installation-layout.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/advanced-ug/2.2-installation-layout.mdtext?rev=1642824&r1=1642823&r2=1642824&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/advanced-ug/2.2-installation-layout.mdtext (original)
+++ directory/site/trunk/content/apacheds/advanced-ug/2.2-installation-layout.mdtext Tue Dec
 2 08:54:56 2014
@@ -30,8 +30,7 @@ The following chapters will describe the
 
 Note that the installation will differ with the target OS. We currently support :
 
-* ![debian](images/debian.png)[2.2.1 - Debian Installation Layout](2.2.1-debian-installation-layout.html)
-* ![RPM](images/rpm.png)[2.2.2 - RPM Installation Layout](2.2.2-rpm-installation-layout.html)
-* ![MacOSX](images/mac.png)[2.2.3 - MacOSX Installation Layout](2.2.3-macosx-installation-layout.html)
-* ![Windows](images/windows.png)[2.2.4 - Windows Installation Layout](2.2.4-windows-installation-layout.html)
-* [2.2.5 - Generic Installation Layout](2.2.5-generic-installation-layout.html)
+* ![Linux](images/linux.png)[2.2.1 - Linux Installation Layout](2.2.1-linux-installation-layout.html)
+* ![MacOSX](images/mac.png)[2.2.2 - MacOSX Installation Layout](2.2.2-macosx-installation-layout.html)
+* ![Windows](images/windows.png)[2.2.3 - Windows Installation Layout](2.2.3-windows-installation-layout.html)
+* ![Generic](images/generic.png)[2.2.4 - Generic Installation Layout](2.2.4-generic-installation-layout.html)

Copied: directory/site/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.mdtext
(from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.1-debian-installation-layout.mdtext)
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.mdtext?p2=directory/site/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.mdtext&p1=directory/site/trunk/content/apacheds/advanced-ug/2.2.1-debian-installation-layout.mdtext&r1=1642549&r2=1642824&rev=1642824&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/advanced-ug/2.2.1-debian-installation-layout.mdtext
(original)
+++ directory/site/trunk/content/apacheds/advanced-ug/2.2.1-linux-installation-layout.mdtext
Tue Dec  2 08:54:56 2014
@@ -1,10 +1,10 @@
-Title: 2.2.1 - Debian Installation Layout
+Title: 2.2.1 - Linux Installation Layout
 NavPrev: 2.2-installation-layout.html
 NavPrevText: 2.2 - Installation Layout
 NavUp: 2.2-installation-layout.html
 NavUpText: 2.2 - Installation Layout
-NavNext: 2.2.2-rpm-installation-layout.html
-NavNextText: 2.2.2 - RPM Installation Layout
+NavNext: 2.2.2-macosx-installation-layout.html
+NavNextText: 2.2.2 - MacOSX Installation Layout
 Notice: 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
@@ -22,9 +22,9 @@ Notice: Licensed to the Apache Software 
     specific language governing permissions and limitations
     under the License.
 
-# 2.2.1 - ![debian](images/debian.png)Debian Installation Layout
+# 2.2.1 - ![Linux](images/linux.png)Linux Installation Layout
 
-When you installed ApacheDS on your debian machine, it created various directories on your
disk. Typically, we need to store :
+When you installed ApacheDS on your Linux machine, it created various directories on your
disk. Typically, we need to store :
 
 * the binaries
 * the server configuration files
@@ -33,13 +33,15 @@ When you installed ApacheDS on your debi
 
 We will describe in this chapter the global layout and the various files and their meaning
and use. 
 
+The Linux installer comes into two flavors : a ![debian](images/debian.png)Debian installer
or a ![RPM](images/rpm.png)RPM installer.
 
-## ![debian](images/debian.png) Debian Standard layout
 
-On debian, the installation will be done in _/opt_, and the daemon script will be in _/etc/init.d_.
Here are the created directories :
+## ![Linux](images/linux.png) Linux Standard layout
+
+On Linux, the installation will be done in _/opt_, and the daemon script will be in _/etc/init.d_.
Here are the created directories :
 
 <PRE>
-  /opt
+  /opt/apacheds-<version>/
     |
     +-- bin/
     |    |
@@ -66,7 +68,7 @@ On debian, the installation will be done
     +-- LICENSE
 </PRE>
 
-## ![debian](images/debian.png) Starting ther server
+## ![Linux](images/linux.png)! Starting ther server
 
 THere are three ways to start the server :
 
@@ -102,11 +104,11 @@ Starting the server using the _apacheds_
 
 In any case, we start the _apacheds_ script, which strats the _wrapper_ executable, which
itself starts the serveur.
 
-### ![debian](images/debian.png) bin directory
+### ![Linux](images/linux.png) bin directory
 
 The _bin_ directory contains the binary used to launch the server. The _apacheds_ script
starts the _wrapper_ executable, using the configuration file _wrapper.conf_.
 
-### ![debian](images/debian.png) conf directory
+### ![Linux](images/linux.png)conf directory
 
 This directory contain the wrapper configuration file. This is a description of its content.
The _%INSTANCE_DIRECTORY%_ parameter is taken from the _apacheds_ 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 _wrapper.java.maxmemory_ one, if needed.
 
@@ -129,6 +131,6 @@ This directory contain the wrapper confi
 |wrapper.startup.timeout|The maximum delay allowed for the server to start|120 secs|
 
 
-### ![debian](images/debian.png) lib directory
+### ![Linux](images/linux.png) lib directory
 
 This directory contains the third party library the server needs. You should not have to
change anything there.
\ No newline at end of file

Copied: directory/site/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.mdtext
(from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.3-macosx-installation-layout.mdtext)
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.mdtext?p2=directory/site/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.mdtext&p1=directory/site/trunk/content/apacheds/advanced-ug/2.2.3-macosx-installation-layout.mdtext&r1=1642549&r2=1642824&rev=1642824&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/advanced-ug/2.2.3-macosx-installation-layout.mdtext
(original)
+++ directory/site/trunk/content/apacheds/advanced-ug/2.2.2-macosx-installation-layout.mdtext
Tue Dec  2 08:54:56 2014
@@ -1,10 +1,10 @@
-Title: 2.2.3 - MacOSX Installation Layout
-NavPrev: 2.2.2-rpm-installation-layout.html
-NavPrevText: 2.2.2 - RPM Installation Layout
+Title: 2.2.2 - MacOSX Installation Layout
+NavPrev: 2.2.1-linux-installation-layout.html
+NavPrevText: 2.2.1 - Linux Installation Layout
 NavUp: 2.2-installation-layout.html
 NavUpText: 2.2 - Installation Layout
-NavNext: 2.2.4-windows-installation-layout.html
-NavNextText: 2.2.4 - Windows Installation Layout
+NavNext: 2.2.3-windows-installation-layout.html
+NavNextText: 2.2.3 - Windows Installation Layout
 Notice: 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
@@ -22,6 +22,6 @@ Notice: Licensed to the Apache Software 
     specific language governing permissions and limitations
     under the License.
 
-# 2.2.3 - ![maMacOSXcosx](images/mac.png)MacOSX Installation Layout
+# 2.2.2 - ![maMacOSXcosx](images/mac.png)MacOSX Installation Layout
 
 TODO...

Copied: directory/site/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.mdtext
(from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.4-windows-installation-layout.mdtext)
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.mdtext?p2=directory/site/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.mdtext&p1=directory/site/trunk/content/apacheds/advanced-ug/2.2.4-windows-installation-layout.mdtext&r1=1642549&r2=1642824&rev=1642824&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/advanced-ug/2.2.4-windows-installation-layout.mdtext
(original)
+++ directory/site/trunk/content/apacheds/advanced-ug/2.2.3-windows-installation-layout.mdtext
Tue Dec  2 08:54:56 2014
@@ -1,10 +1,10 @@
-Title: 2.2.4 - Windows Installation Layout
-NavPrev: 2.2.3-macosx-installation-layout.html
-NavPrevText: 2.2.3 - MacOSX Installation Layout
+Title: 2.2.3 - Windows Installation Layout
+NavPrev: 2.2.2-macosx-installation-layout.html
+NavPrevText: 2.2.2 - MacOSX Installation Layout
 NavUp: 2.2-installation-layout.html
 NavUpText: 2.2 - Installation Layout
-NavNext: 2.2.5-generic-installation-layout.html
-NavNextText: 2.2.5 - Generic Installation Layout
+NavNext: 2.2.4-generic-installation-layout.html
+NavNextText: 2.2.4 - Generic Installation Layout
 Notice: 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
@@ -22,6 +22,6 @@ Notice: Licensed to the Apache Software 
     specific language governing permissions and limitations
     under the License.
 
-# 2.2.4 - ![windows](images/windows.png)Windows Installation Layout
+# 2.2.3 - ![windows](images/windows.png)Windows Installation Layout
 
 TODO...

Copied: directory/site/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.mdtext
(from r1642549, directory/site/trunk/content/apacheds/advanced-ug/2.2.5-generic-installation-layout.mdtext)
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.mdtext?p2=directory/site/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.mdtext&p1=directory/site/trunk/content/apacheds/advanced-ug/2.2.5-generic-installation-layout.mdtext&r1=1642549&r2=1642824&rev=1642824&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/advanced-ug/2.2.5-generic-installation-layout.mdtext
(original)
+++ directory/site/trunk/content/apacheds/advanced-ug/2.2.4-generic-installation-layout.mdtext
Tue Dec  2 08:54:56 2014
@@ -1,6 +1,6 @@
-Title: 2.2.5 - Generic Installation Layout
-NavPrev: 2.2.4-windows-installation-layout.html
-NavPrevText: 2.2.4 - Windows Installation Layout
+Title: 2.2.4 - Generic Installation Layout
+NavPrev: 2.2.3-windows-installation-layout.html
+NavPrevText: 2.2.3 - Windows Installation Layout
 NavUp: 2.2-installation-layout.html
 NavUpText: 2.2 - Installation Layout
 NavNext: 2.3-instance-layout.html
@@ -22,6 +22,6 @@ Notice: Licensed to the Apache Software 
     specific language governing permissions and limitations
     under the License.
 
-# 2.2.5 - Generic Installation Layout
+# 2.2.4 - ![Generic](images/generic.png)Generic Installation Layout
 
 TODO...

Modified: directory/site/trunk/content/apacheds/advanced-ug/2.3-instance-layout.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/advanced-ug/2.3-instance-layout.mdtext?rev=1642824&r1=1642823&r2=1642824&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/advanced-ug/2.3-instance-layout.mdtext (original)
+++ directory/site/trunk/content/apacheds/advanced-ug/2.3-instance-layout.mdtext Tue Dec 
2 08:54:56 2014
@@ -1,6 +1,6 @@
 Title: 2.3 - Instance Layout
-NavPrev: 2.2.5-generic-installation-layout.html
-NavPrevText: 2.2.5 - Generic Installation Layout
+NavPrev: 2.2.4-generic-installation-layout.html
+NavPrevText: 2.2.4 - Generic Installation Layout
 NavUp: 2-server-config.html
 NavUpText: 2 - Server Configuration
 NavNext: 2.3.1-debian-instance-layout.html

Modified: directory/site/trunk/content/apacheds/advanced-user-guide.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/advanced-user-guide.mdtext?rev=1642824&r1=1642823&r2=1642824&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/advanced-user-guide.mdtext (original)
+++ directory/site/trunk/content/apacheds/advanced-user-guide.mdtext Tue Dec  2 08:54:56 2014
@@ -34,11 +34,10 @@ This guide get you a deep further into A
 * [2. Server Configuration](advanced-ug/2-server-config.html)
     * [2.1 - Configuration Description](advanced-ug/2.1-config-description.html)
     * [2.2 - Installation Layout](advanced-ug/2.2-installation-layout.html)
-        * ![debian](advanced-ug/images/debian.png)[2.2.1 - Debian Installation Layout](advanced-ug/2.2.1-debian-installation-layout.html)
-        * ![RPM](advanced-ug/images/rpm.png)[2.2.2 - RPM Installation Layout](advanced-ug/2.2.2-rpm-installation-layout.html)
-        * ![MacOSX](advanced-ug/images/mac.png)[2.2.3 - MacOSX Installation Layout](advanced-ug/2.2.3-macosx-installation-layout.html)
-        * ![Windows](advanced-ug/images/windows.png)[2.2.4 - Windows Installation Layout](advanced-ug/2.2.4-windows-installation-layout.html)
-        * [2.2.5 - Generic Installation Layout](advanced-ug/2.2.5-generic-installation-layout.html)
+        * ![Linux](advanced-ug/images/linux.png)[2.2.1 - Linux Installation Layout](advanced-ug/2.2.1-linux-installation-layout.html)
+        * ![MacOSX](advanced-ug/images/mac.png)[2.2.2 - MacOSX Installation Layout](advanced-ug/2.2.2-macosx-installation-layout.html)
+        * ![Windows](advanced-ug/images/windows.png)[2.2.3 - Windows Installation Layout](advanced-ug/2.2.3-windows-installation-layout.html)
+        * [![Generic](advanced-ug/images/generic.png)2.2.4 - Generic Installation Layout](advanced-ug/2.2.4-generic-installation-layout.html)
     * [2.3 - Instance Layout](advanced-ug/2.3-instance-layout.html)
         * ![debian](advanced-ug/images/debian.png)[2.3.1 - Debian instance Layout](advanced-ug/2.3.1-debian-instance-layout.html)
         * ![RPM](advanced-ug/images/rpm.png)[2.3.2 - RPM instance Layout](advanced-ug/2.3.2-rpm-instance-layout.html)



Mime
View raw message