svn commit: r937171 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html

[bu...@apache.org]

Author: buildbot
Date: Thu Jan 22 00:57:00 2015
New Revision: 937171

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jan 22 00:57:00 2015
@@ -1 +1 @@
-1652053
+1653725

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html Thu Jan 22 00:57:00 2015
@@ -105,6 +105,8 @@
 <li><code>org.osgi.framework.startlevel.beginning</code> - The initial start level of the framework once it starts execution; the default value is 1.</li>
 <li><code>felix.startlevel.bundle</code> - The default start level for newly installed bundles; the default value is 1.</li>
 <li><code>felix.service.urlhandlers</code> - Flag to indicate whether to activate the URL Handlers service for the framework instance; the default value is <code>true</code>. Activating the URL Handlers service will result in the <code>URL.setURLStreamHandlerFactory()</code> and <code>URLConnection.setContentHandlerFactory()</code> being called.</li>
+<li><code>felix.native.processor.alias.&lt;procName&gt;</code> - An alias for resolving native processor requirements new with R6.  This can be used to add new or override existing processors.  The <procName> represents the key for the processor architecture such as x86-64 (which may not contain spaces) then the property value is a comma delimited list of aliases such as x86_64,amd64.  EX felix.native.processor.alias.x86-64=x86_64,amd64</li>
+<li><code>felix.native.osname.alias.&lt;osName&gt;</code> - An alias for resolving native operating system requirements new with R6.  This can be used to add new or override existing operating systems.  The <osName> represents the key for the operating system such as windows7 (which may not contain spaces) then the property value is a comma delimited list of aliases such as Windows 7,win32.  EX felix.native.osname.alias.windows7=Windows 7,win32</li>
 </ul>
 <h2 id="launcher-configuration-properties">Launcher configuration properties</h2>
 <p>The following configuration properties are for the launcher:</p>
@@ -136,7 +138,7 @@
 <h2 id="feedback">Feedback</h2>
 <p>Subscribe to the Felix users mailing list by sending a message to <a href="">users-subscribe@felix.apache.org</a>; after subscribing, email questions or feedback to [users@felix.apache.org|mailto:users@felix.apache.org].</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1520598 by rickhall on Fri, 6 Sep 2013 15:24:09 +0000
+        Rev. 1653725 by bob on Thu, 22 Jan 2015 00:56:25 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project