simplify menu

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

diff --git a/archiva-docs/src/site/apt/adminguide/web-services.apt b/archiva-docs/src/site/apt/adminguide/web-services.apt
deleted file mode 100644 (file)
index b077dcb..0000000
--- a/archiva-docs/src/site/apt/adminguide/web-services.apt
+++ /dev/null
@@ -1,35 +0,0 @@
- ------
- Using Archiva Web Services
- ------
- Maria Odea Ching
- Olivier Lamy
- ------
- 2011-09-16
- ------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/guides/mini/guide-apt-format.html
-
-Using Archiva Web Services
-
-  Starting version 1.4, you can now use REST services : More details : {{{./webservices/rest.html} Archiva REST Services}}
-
-  Note: Since 1.4-M3 xmlrpc services has been removed.
-

diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index f275bef2cf27e52f53ddf279f1778fd24c52e5a6..dd8e36679c268cc97f98f2d251d64d189bc751c2 100644 (file)
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -110,9 +110,8 @@
         <item name="Appearance Configuration" href="/adminguide/appearance-configuration.html"/>
         <item name="UI Configuration"         href="/adminguide/ui-configuration.html"/>
       </item>
-      <item name="Web Services"              href="/adminguide/web-services.html" collapse="true">
-        <item name="REST"                    href="/adminguide/webservices/rest.html"/>
-      </item>
+      <item name="REST Apis"                    href="/adminguide/webservices/rest.html"/>
+
       <item name="Configuration Files"       href="/adminguide/configuration-files.html" />
       <item name="Log Files"                 href="/adminguide/logging.html" collapse="true">
         <item name="Archiva Logs"            href="/adminguide/archiva-logs.html" />