From c4646a69ccdc55d0fa2dd63ea61ca47c6edb6e30 Mon Sep 17 00:00:00 2001 From: Jon Scott Stevens Date: Thu, 26 Apr 2001 21:22:25 +0000 Subject: [PATCH] for some reason, Ant isn't using the jakarta-site2 site.vsl file. so, this change brings it in line with the current file. cleaned up the project.xml file rebuilt the site worked around the issue in Velocity with parsing #$id PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268971 13f79535-47bb-0310-9956-ffa450edef68 --- webpage/docs/antnews.html | 56 ++------------------ webpage/docs/external.html | 76 +++++---------------------- webpage/docs/faq.html | 74 +++++--------------------- webpage/docs/index.html | 64 +++------------------- webpage/xdocs/stylesheets/faq.vsl | 3 +- webpage/xdocs/stylesheets/project.xml | 45 +--------------- webpage/xdocs/stylesheets/site.vsl | 4 +- 7 files changed, 45 insertions(+), 277 deletions(-) diff --git a/webpage/docs/antnews.html b/webpage/docs/antnews.html index 545147a09..b092ccb40 100644 --- a/webpage/docs/antnews.html +++ b/webpage/docs/antnews.html @@ -34,6 +34,8 @@

Ant

-

Other Projects

- -

Misc

- @@ -126,7 +78,7 @@
- Ant 2.0 Requirements + Ant 2.0 Requirements
@@ -174,7 +126,7 @@ @@ -126,7 +78,7 @@
- Ant 1.3 Released + Ant 1.3 Released
diff --git a/webpage/docs/external.html b/webpage/docs/external.html index 1a0fc0c60..fe6a8174b 100644 --- a/webpage/docs/external.html +++ b/webpage/docs/external.html @@ -34,6 +34,8 @@

Ant

-

Other Projects

- -

Misc

-
- External Resources for Ant + External Resources for Ant
@@ -144,7 +96,7 @@
- Tasks + Tasks
@@ -152,7 +104,7 @@
- AJC + AJC
@@ -224,7 +176,7 @@
- Anakia + Anakia
@@ -295,7 +247,7 @@
- Configure + Configure
@@ -371,7 +323,7 @@
- J2ME Ant Tasks + J2ME Ant Tasks
@@ -445,7 +397,7 @@
- IDE/Editor Integration + IDE/Editor Integration
@@ -453,7 +405,7 @@
- AntRunner + AntRunner
@@ -523,7 +475,7 @@
- AntWork + AntWork
@@ -593,7 +545,7 @@
- NetBeans / Forte for Java + NetBeans / Forte for Java
@@ -666,7 +618,7 @@
- Other + Other
@@ -674,7 +626,7 @@ @@ -140,7 +92,7 @@
- CruiseControl + CruiseControl
diff --git a/webpage/docs/faq.html b/webpage/docs/faq.html index 444a6ed4c..a124402ff 100644 --- a/webpage/docs/faq.html +++ b/webpage/docs/faq.html @@ -34,6 +34,8 @@

Ant

-

Other Projects

- -

Misc

-
@@ -188,20 +140,20 @@
-

Ant'distibution contains file names which are longer +

Ant's distibution contains file names that are longer than 100 characters, which is not supported by the standard - tar file format. Several different implementations of tar use + tar file format. Several different implementations of tar use different and incompatible ways to work around this restriction.

-

Ant' <tar> task can create tar archives that use +

Ant's <tar> task can create tar archives that use the GNU tar extension, and this has been used when putting - together the distribution. If you are using a different - version of tar (for example the one shipping with Solaris), + together the distribution. If you are using a different + version of tar (for example, the one shipping with Solaris), you cannot use it to extract the archive.

The solution is to either install GNU tar, which can be found here or use the zip archive instead (you can extract it using - jar cf).

+ jar xf).

@@ -256,9 +208,9 @@
-

will literally include the contents of common.xml where - you've placed the &common; entity.

-

In combination with a DTD this would look like this:

+

will literally include the contents of common.xml where + you've placed the &common; entity.

+

In combination with a DTD, this would look like this:

diff --git a/webpage/docs/index.html b/webpage/docs/index.html index 6303a8299..548a131ce 100644 --- a/webpage/docs/index.html +++ b/webpage/docs/index.html @@ -34,6 +34,8 @@

Ant

-

Other Projects

- -

Misc

- @@ -126,7 +78,7 @@
- Ant + Ant
@@ -173,7 +125,7 @@ on.
- Documentation + Documentation
@@ -191,7 +143,7 @@ Comprehensive documentation is included in the source and binary distribtions.
- Latest Release + Latest Release
@@ -213,7 +165,7 @@ Comprehensive documentation is included in the source and binary distribtions.
- Nightly Builds + Nightly Builds
@@ -228,7 +180,7 @@ Comprehensive documentation is included in the source and binary distribtions.
- Towards Ant2 + Towards Ant2
@@ -243,7 +195,7 @@ Comprehensive documentation is included in the source and binary distribtions.
- Get Involved + Get Involved
diff --git a/webpage/xdocs/stylesheets/faq.vsl b/webpage/xdocs/stylesheets/faq.vsl index 7d5e4fd84..2aa61af96 100644 --- a/webpage/xdocs/stylesheets/faq.vsl +++ b/webpage/xdocs/stylesheets/faq.vsl @@ -12,6 +12,7 @@ #set ($subbannerfg = "#ffffff") #set ($tablethbg = "#039acc") #set ($tabletdbg = "#a0ddf0") + #set ($pound = "#" ) #faqs() @@ -40,7 +41,7 @@ #macro (subtoc $faq) #set ($id = $faq.getAttributeValue("id")) -
  • +
  • $xmlout.outputString($faq.getChild("question"))
    • #end diff --git a/webpage/xdocs/stylesheets/project.xml b/webpage/xdocs/stylesheets/project.xml index 1bf1cc3f7..0303b3451 100644 --- a/webpage/xdocs/stylesheets/project.xml +++ b/webpage/xdocs/stylesheets/project.xml @@ -11,6 +11,8 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webpage/xdocs/stylesheets/site.vsl b/webpage/xdocs/stylesheets/site.vsl index 0e06c605e..925e8c9c8 100644 --- a/webpage/xdocs/stylesheets/site.vsl +++ b/webpage/xdocs/stylesheets/site.vsl @@ -23,7 +23,7 @@
    - $subsection.getAttributeValue("name") + $subsection.getAttributeValue("name")
    @@ -48,7 +48,7 @@
    - $section.getAttributeValue("name") + $section.getAttributeValue("name")