svn commit: r1599909 - in /sling/site/trunk/content: documentation/bundles/osgi-installer.mdtext site/.htaccess

[dk...@apache.org]

Author: dklco
Date: Wed Jun  4 05:31:41 2014
New Revision: 1599909

URL: http://svn.apache.org/r1599909
Log:
Migrating the /documentation/bundles/osgi-installer page over since I noticed a big missing image

Modified:
    sling/site/trunk/content/documentation/bundles/osgi-installer.mdtext
    sling/site/trunk/content/site/.htaccess

Modified: sling/site/trunk/content/documentation/bundles/osgi-installer.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/osgi-installer.mdtext?rev=1599909&r1=1599908&r2=1599909&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/bundles/osgi-installer.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/osgi-installer.mdtext Wed Jun  4 05:31:41 2014
@@ -1,11 +1,10 @@
-translation_pending: true
 Title: OSGi Installer
 
 # Overview
 
 The OSGi installer is a central service for handling installs, updates and uninstall of "artifacts". By default, the installer supports bundles and has an extension for handling configurations for the OSGi configuration admin.
 
-!Slide14.jpg|border=1!
+![Apache Sling OSGI Installer Diagram](/documentation/bundles/Slide14.jpg)
 
 The OSGi installer itself is "just" the central service managing the tasks and states of the artifacts. The artifacts can be provided through various providers, e.g. through a file system provider reading artifacts from configured directories or the jcr provider reading artifacts from a JCR repository.
 
@@ -43,4 +42,4 @@ During development, SNAPSHOT versions sh
 
 ## Configuration Handling
 
-In general the OSGi installer installs the configuration with the highes priority. For example in combination with the JCR installer provider, a configuration from */apps* is preferred over a configuration for the same service from */libs*.
+In general the OSGi installer installs the configuration with the highest priority. For example in combination with the JCR installer provider, a configuration from */apps* is preferred over a configuration for the same service from */libs*.

Modified: sling/site/trunk/content/site/.htaccess
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/site/.htaccess?rev=1599909&r1=1599908&r2=1599909&view=diff
==============================================================================
--- sling/site/trunk/content/site/.htaccess (original)
+++ sling/site/trunk/content/site/.htaccess Wed Jun  4 05:31:41 2014
@@ -76,3 +76,4 @@ Redirect Permanent /site/release-managem
 Redirect Permanent /site/scheduler-service-commons-scheduler.htm /documentation/bundles/scheduler-service-commons-scheduler.html
 Redirect Permanent /site/dependency-management.html /documentation/development/dependency-management.html
 Redirect Permanent /site/issue-tracker.html /documentation/development/issue-tracker.html
+Redirect Permanent /site/osgi-installer.html /documentation/bundles/osgi-installer.html
\ No newline at end of file