From 5d3888d2a1ec7f7ef655a1e6e119ce14fb4432c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mat=C3=A8rne?= <jhm@apache.org>
Date: Wed, 10 Jun 2015 08:48:33 +0200
Subject: [PATCH] Bug 53808: fix links in the manual

---
 manual/Tasks/makeurl.html                     |  8 +++-----
 manual/Tasks/setproxy.html                    |  8 +++-----
 manual/Tasks/subant.html                      |  8 +++-----
 manual/Tasks/tempfile.html                    |  8 +++-----
 manual/developlist.html                       |  4 ++--
 manual/stylesheets/antmanual.css              | 20 -------------------
 .../tutorial-tasks-filesets-properties.html   |  6 +++---
 manual/using.html                             |  3 +--
 8 files changed, 18 insertions(+), 47 deletions(-)
 delete mode 100644 manual/stylesheets/antmanual.css
diff --git a/manual/Tasks/makeurl.html b/manual/Tasks/makeurl.html
index bef63e28d..b20f94a1e 100644
--- a/manual/Tasks/makeurl.html
+++ b/manual/Tasks/makeurl.html
@@ -18,8 +18,7 @@
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
-  <title>Makeurl
- Task</title>
+  <title>Makeurl Task</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76"
@@ -32,13 +31,12 @@
     <td>
       <table border="0" width="100%"><tr>
           <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Makeurl
- Task</strong></font>
+            <font size="+3" face="arial,helvetica,sanserif"><strong>Makeurl Task</strong></font>
           </td>
           <td>
             <!-- PROJECT LOGO -->
             <a href="http://ant.apache.org/">
-              <img src="../../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0"/>
+              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0"/>
             </a>
           </td>
       </tr></table>
diff --git a/manual/Tasks/setproxy.html b/manual/Tasks/setproxy.html
index 60aa984e7..245924ce8 100644
--- a/manual/Tasks/setproxy.html
+++ b/manual/Tasks/setproxy.html
@@ -18,8 +18,7 @@
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
-  <title>Setproxy
- Task</title>
+  <title>Setproxy Task</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76"
@@ -32,14 +31,13 @@
     <td>
       <table border="0" width="100%"><tr>
           <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Setproxy
- Task</strong></font>
+            <font size="+3" face="arial,helvetica,sanserif"><strong>Setproxy Task</strong></font>
             <br><font face="arial,helvetica,sanserif">Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites.</font>
           </td>
           <td>
             <!-- PROJECT LOGO -->
             <a href="http://ant.apache.org/">
-              <img src="../../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
+              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
             </a>
           </td>
       </tr></table>
diff --git a/manual/Tasks/subant.html b/manual/Tasks/subant.html
index f3c23ee2b..424bb67ef 100644
--- a/manual/Tasks/subant.html
+++ b/manual/Tasks/subant.html
@@ -18,8 +18,7 @@
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
-  <title>Subant
- Task</title>
+  <title>Subant Task</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76"
@@ -32,14 +31,13 @@
     <td>
       <table border="0" width="100%"><tr>
           <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Subant
- Task</strong></font>
+            <font size="+3" face="arial,helvetica,sanserif"><strong>Subant Task</strong></font>
             <br><font face="arial,helvetica,sanserif">Calls a given target for all defined sub-builds.</font>
           </td>
           <td>
             <!-- PROJECT LOGO -->
             <a href="http://ant.apache.org/">
-              <img src="../../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
+              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
             </a>
           </td>
       </tr></table>
diff --git a/manual/Tasks/tempfile.html b/manual/Tasks/tempfile.html
index 28f8404ea..1be00d07f 100644
--- a/manual/Tasks/tempfile.html
+++ b/manual/Tasks/tempfile.html
@@ -18,8 +18,7 @@
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
-  <title>Tempfile
- Task</title>
+  <title>Tempfile Task</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76"
@@ -32,14 +31,13 @@
     <td>
       <table border="0" width="100%"><tr>
           <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Tempfile
- Task</strong></font>
+            <font size="+3" face="arial,helvetica,sanserif"><strong>Tempfile  Task</strong></font>
             <br><font face="arial,helvetica,sanserif">This task sets a property to the name of a temporary file.</font>
           </td>
           <td>
             <!-- PROJECT LOGO -->
             <a href="http://ant.apache.org/">
-              <img src="../../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
+              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
             </a>
           </td>
       </tr></table>
diff --git a/manual/developlist.html b/manual/developlist.html
index 3235c835a..1bbdc4e26 100644
--- a/manual/developlist.html
+++ b/manual/developlist.html
@@ -30,8 +30,8 @@
 <h3>Developing with Apache Ant</h3>
 
 <ul class="inlinelist">
-<li><a href="../ant_in_anger.html">Ant in Anger</a></li>
-<li><a href="../ant_task_guidelines.html">Ant Task Guidelines</a></li>
+<li><a href="http://ant.apache.org/ant_in_anger.html">Ant in Anger</a> <small>(online)</small></li>
+<li><a href="http://ant.apache.org/ant_task_guidelines.html">Ant Task Guidelines</a> <small>(online)</small></li>
 <li><a href="develop.html#writingowntask">Writing Your Own Task</a></li>
 <li><a href="base_task_classes.html">Tasks Designed for Extension</a></li>
 <li><a href="develop.html#buildevents">Build Events</a></li>
diff --git a/manual/stylesheets/antmanual.css b/manual/stylesheets/antmanual.css
deleted file mode 100644
index 049b2eda6..000000000
--- a/manual/stylesheets/antmanual.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 
- *  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.
- * 
- */
-body {
-    background-image:url(/images/beta.png)
-}
diff --git a/manual/tutorial-tasks-filesets-properties.html b/manual/tutorial-tasks-filesets-properties.html
index fdbe1be5b..3a36e7ef0 100644
--- a/manual/tutorial-tasks-filesets-properties.html
+++ b/manual/tutorial-tasks-filesets-properties.html
@@ -713,7 +713,7 @@ If we decide to contribute our task, we should do some things:<ul>
 <li>create a patch file</li>
 <li>publishing that patch file</li>
 </ul>
-The <a href="../ant_task_guidelines.html">Ant Task Guidelines [6]</a> support additional
+The <a href="http://ant.apache.org/ant_task_guidelines.html">Ant Task Guidelines [6]</a> support additional
 information on that.</p>
 
 <p>Now we will check the "Checklist before submitting a new task" described in that guideline.
@@ -864,7 +864,7 @@ and run <tt>ant test</tt> (like above).</p>
 
 <h3>Checkstyle</h3>
 <p>There are many things we have to ensure. Indentation with 4 spaces, blanks here and there, ...
-(all described in the <a href="../ant_task_guidelines.html">Ant Task Guidelines [6]</a> which
+(all described in the <a href="http://ant.apache.org/ant_task_guidelines.html">Ant Task Guidelines [6]</a> which
 includes the <a href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html">Sun code style
 [9]</a>). Because there are so many things we would be happy to have a tool for do the checks.
 There is one: checkstyle. Checkstyle is available at <a href="http://checkstyle.sourceforge.net/">
@@ -904,7 +904,7 @@ cvs access). As a result we get a file <i> TODO </i>.</p>
 
 
 <h3>Publish the task</h3>
-<p>Finally we publish that archive. As described in the <a href="../ant_task_guidelines.html">
+<p>Finally we publish that archive. As described in the <a href="http://ant.apache.org/ant_task_guidelines.html">
 Ant Task Guidelines [7]</a> we can post it on the developer mailinglist or we create a BugZilla
 entry. For both we need some information:</p>
 
diff --git a/manual/using.html b/manual/using.html
index 4adb38bf9..d3b9a5678 100644
--- a/manual/using.html
+++ b/manual/using.html
@@ -568,8 +568,7 @@ For the declaration there are several ways:
 If you need a special function, you should
 <ol>
   <li>have a look at this manual, because Ant provides lot of tasks</li>
-  <li>have a look at the external task page in the <a href="../external.html">manual</a>
-      (or better <a href="http://ant.apache.org/external.html">online</a>)</li>
+  <li>have a look at the external task page <a href="http://ant.apache.org/external.html">online</a></li>
   <li>have a look at the external task <a href="http://wiki.apache.org/ant/AntExternalTaskdefs">wiki 
       page</a></li>
   <li>ask on the <a href="http://ant.apache.org/mail.html#User%20List">Ant user</a> list</li>
