directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1404205 - in /directory/site/trunk/content/apacheds/basic-ug: 2.2.2-more-search-options.mdtext 3.2-basic-authorization.mdtext 3.3-enabling-ssl.mdtext
Date Wed, 31 Oct 2012 15:29:57 GMT
Author: pamarcelot
Date: Wed Oct 31 15:29:56 2012
New Revision: 1404205

URL: http://svn.apache.org/viewvc?rev=1404205&view=rev
Log:
Converted tables from HTML to Markdown.

Modified:
    directory/site/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.mdtext
    directory/site/trunk/content/apacheds/basic-ug/3.2-basic-authorization.mdtext
    directory/site/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.mdtext

Modified: directory/site/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.mdtext?rev=1404205&r1=1404204&r2=1404205&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.mdtext (original)
+++ directory/site/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.mdtext Wed Oct
31 15:29:56 2012
@@ -42,65 +42,23 @@ A filter is a set of nodes connected wit
 
 Here is the list of possible connectors :
 
-<div class="table-wrap">
-	<table class="confluenceTable">
-		<tbody>
-			<tr>
-				<th class="confluenceTh"> Connector </th>
-				<th class="confluenceTh"> Description </th>
-				<th class="confluenceTh"> Example </th>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> And </td>
-				<td class="confluenceTd">  All the nodes should be evaluated to true </td>
-				<td class="confluenceTd"> (&(objectClass=person)(cn=acme)) </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> Or </td>
-				<td class="confluenceTd"> At least one of the node should be evaluated to true</td>
-				<td class="confluenceTd"> (|(objectClass=person)(cn=acme)) </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> Not </td>
-				<td class="confluenceTd"> select the entries that does not evaluate to true for
this filter </td>
-				<td class="confluenceTd"> (!(objectClass=person))</td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+| Connector | Description | Example |
+|:-:|---|:-:|
+| And | All the nodes should be evaluated to true | (&(objectClass=person)(cn=acme))
|
+| Or | At least one of the node should be evaluated to true | (&#124;(objectClass=person)(cn=acme))
|
+| Not | Select the entries that does not evaluate to true for this filter | (!(objectClass=person))
|
 
 Each node proceeds a check on the attributeType and value provided in the filter. For instance,
the **"(o=sevenseas)"** filter tells the server to look for all teh entries whcih have an
"organization" atribute with a value of **"sevenseas"**. Here are the various kind of filters
you can use :
 
-<div class="table-wrap">
-	<table class="confluenceTable">
-		<tbody>
-			<tr>
-				<th class="confluenceTh">Filter</th>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> = (Equality)</td>
-			</tr>
-			<tr>
-				<td class="confluenceTd">Substring</td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> &gt;= </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> &lt;= </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> =* (Present) </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> ~= (ApproxMatch)</td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> extensibleMatch </td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+| Filter |
+|:-:|
+| = (Equality) |
+| Substring |
+| >= |
+| <= |
+| =* (Present) |
+| ~= (ApproxMatch) |
+| extensibleMatch |
 
 ## Scope
 

Modified: directory/site/trunk/content/apacheds/basic-ug/3.2-basic-authorization.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/basic-ug/3.2-basic-authorization.mdtext?rev=1404205&r1=1404204&r2=1404205&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/basic-ug/3.2-basic-authorization.mdtext (original)
+++ directory/site/trunk/content/apacheds/basic-ug/3.2-basic-authorization.mdtext Wed Oct
31 15:29:56 2012
@@ -147,7 +147,7 @@ As an appetizer for the stunning ACI sub
 
 The authorization (ACI) subsystem is disabled by default. You have to enable it using the
_Apache Directory Studio_ configuration editor :
 
-![Enable access control)(enable-access-control.png)]
+![Enable access control](images/enable-access-control.png)
 
 A restart of the server is necessary for this change to take effect. 
 

Modified: directory/site/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.mdtext?rev=1404205&r1=1404204&r2=1404205&view=diff
==============================================================================
--- directory/site/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.mdtext (original)
+++ directory/site/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.mdtext Wed Oct 31 15:29:56
2012
@@ -80,52 +80,15 @@ We will do it the last way (self-signed)
 
 First it is necessary to create a key pair (public/private key) for your server, _zanzibar_
in our case.  One option is to use the JDK tool _keytool_ for this task. In the following
example, we use these options
 
-<div class="table-wrap">
-	<table class="confluenceTable">
-		<tbody>
-			<tr>
-				<th class="confluenceTh"> Option </th>
-				<th class="confluenceTh"> value </th>
-				<th class="confluenceTh"> Description </th>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> -genkey </td>
-				<td class="confluenceTd">&nbsp;</td>
-				<td class="confluenceTd"> command to generate a key pair </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> -keyalg </td>
-				<td class="confluenceTd"> "RSA" </td>
-				<td class="confluenceTd"> algorithm to be used to generate the key pair,  in our
case, default is "DSA" </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> -dname </td>
-				<td class="confluenceTd"> "cn=zanzibar, ou=ApacheDS, o=ASF, c=US" </td>
-				<td class="confluenceTd"> the X.500 Distinguished Name to be associated with alias,
used as the issuer and subject fields in the self-signed certificate </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> -alias </td>
-				<td class="confluenceTd"> zanzibar </td>
-				<td class="confluenceTd"> name to refer the entry within the keystore  </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> -keystore </td>
-				<td class="confluenceTd"> zanzibar.ks </td>
-				<td class="confluenceTd">  keystore file location </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> -storepass </td>
-				<td class="confluenceTd"> secret </td>
-				<td class="confluenceTd">  password used to protect the integrity of the keystore
</td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> -validity </td>
-				<td class="confluenceTd"> 730 </td>
-				<td class="confluenceTd"> number of days for which the certificate should be considered
valid, default is 90 </td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+| Command Option | Value | Description |
+|:-:|:-:|---|
+| -genkey | - | Command to generate a key pair |
+| -keyalg | "RSA" | Algorithm to be used to generate the key pair,  in our case, default
is "DSA" |
+| -dname | "cn=zanzibar, ou=ApacheDS, o=ASF, c=US" | The X.500 Distinguished Name to be associated
with alias, used as the issuer and subject fields in the self-signed certificate |
+| -alias | zanzibar | Name to refer the entry within the keystore |
+| -keystore | zanzibar.ks | Keystore file location |
+| -storepass | secret | Password used to protect the integrity of the keystore |
+| -validity | 730 | Number of days for which the certificate should be considered valid,
default is 90 |
 
 Learn more about keytool at the [manpage](http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html).
 
@@ -158,40 +121,14 @@ Enabling SSL in Apache Directory Server 
 
 ![Keystore Configuration](images/keystore-configuration.png)
 
-
 The following properties were used :
 
-<div class="table-wrap">
-	<table class="confluenceTable">
-		<tbody>
-			<tr>
-				<th class="confluenceTh"> Property</th>
-				<th class="confluenceTh"> default value </th>
-				<th class="confluenceTh"> Description </th>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> keystoreFile </td>
-				<td class="confluenceTd"> none </td>
-				<td class="confluenceTd"> path of the X509 (or JKS) certificate file for LDAPS
</td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> certificatePassword </td>
-				<td class="confluenceTd"> changeit</td>
-				<td class="confluenceTd"> password which is used to load the LDAPS certificate
file </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> port </td>
-				<td class="confluenceTd"> 10636 </td>
-				<td class="confluenceTd"> LDAPS TCP/IP port number to listen to </td>
-			</tr>
-			<tr>
-				<td class="confluenceTd"> enableSSL </td>
-				<td class="confluenceTd"> true </td>
-				<td class="confluenceTd"> sets if SSL is enabled or not </td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+| Property | Default Value | Description |
+|:-:|:-:|---|
+| keystoreFile | none | Path of the X509 (or JKS) certificate file for LDAPS |
+| certificatePassword | changeit | Password which is used to load the LDAPS certificate file
|
+| port | 10636 | LDAPS TCP/IP port number to listen to |
+| enableSSL | true | Sets if SSL is enabled or not |
 
 After modification of the configuration, the server has to be restarted in order to take
effect.
 



Mime
View raw message