rename to runtime configuration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1413146 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-docs/src/site/apt/adminguide/configuration.apt b/archiva-docs/src/site/apt/adminguide/configuration.apt
index 65a20b76d523d711ae81edd64bdef358fba42e47..7986fcb0f69c125770db2725b8e2ba3191d8b785 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/configuration.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration.apt
@@ -48,5 +48,7 @@ Runtime Configuration of Apache Archiva
 
     * {{{./ui-configuration.html} UI configuration}}
 
+    * {{{./runtime-configuration.html} Runtime configuration}}
+
     []
 

diff --git a/archiva-docs/src/site/apt/adminguide/runtime-configuration.apt b/archiva-docs/src/site/apt/adminguide/runtime-configuration.apt
new file mode 100644 (file)
index 0000000..aee9396
--- /dev/null
+++ b/archiva-docs/src/site/apt/adminguide/runtime-configuration.apt
@@ -0,0 +1,30 @@
+ ------
+ Apache Archiva Runtime Configuration
+ ------
+ Olivier Lamy
+ ------
+ 2012-11-24
+ ------
+
+~~ 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.                                                              
+
+Apache Archiva User Manager Implementation
+
+  Since 1.4-M4, you can choose to switch User Manager Implementation you are using dynamically.
+
+[../images/user-manager-impl.png]
\ No newline at end of file

diff --git a/archiva-docs/src/site/apt/adminguide/users-manager-implementation.apt b/archiva-docs/src/site/apt/adminguide/users-manager-implementation.apt
deleted file mode 100644 (file)
index 57dae26..0000000
--- a/archiva-docs/src/site/apt/adminguide/users-manager-implementation.apt
+++ /dev/null
@@ -1,30 +0,0 @@
- ------
- Apache Archiva User Manager Implementation
- ------
- Olivier Lamy
- ------
- 2012-11-24
- ------
-
-~~ 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.                                                              
-
-Apache Archiva User Manager Implementation
-
-  Since 1.4-M4, you can choose to switch User Manager Implementation you are using dynamically.
-
-[../images/user-manager-impl.png]
\ No newline at end of file

diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index dd8e36679c268cc97f98f2d251d64d189bc751c2..12eb35e1fee7e10d7a1056bff72e586bc513d496 100644 (file)
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -109,6 +109,7 @@
         <item name="Staging Repositories"     href="/adminguide/staging-repositories.html"/>
         <item name="Appearance Configuration" href="/adminguide/appearance-configuration.html"/>
         <item name="UI Configuration"         href="/adminguide/ui-configuration.html"/>
+        <item name="Runtime Configuration"    href="/adminguide/runtime-configuration.html"/>
       </item>
       <item name="REST Apis"                    href="/adminguide/webservices/rest.html"/>