From 5f4fd13f8766c05a614f94b9d5fcdcd9cdc7d8a7 Mon Sep 17 00:00:00 2001 From: Jonathan Robie Date: Wed, 23 Jun 2010 14:38:17 +0000 Subject: Fixed scripts that referred to README instead of README.txt. Changes to web site template and content. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@957222 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/INSTALL | 2 +- qpid/cpp/INSTALL-WINDOWS | 2 +- qpid/cpp/Makefile.am | 2 +- qpid/cpp/docs/api/header.html | 37 ++++++---------------- qpid/cpp/examples/xml-exchange/Makefile.am | 2 +- qpid/doc/book/src/schemas.xml | 2 ++ qpid/doc/website/content/documentation.html | 36 ++++++++++----------- qpid/doc/website/content/getting_started.html | 12 +++---- qpid/doc/website/content/qpid_integrated_with.html | 2 +- qpid/doc/website/template/style.css | 6 ++-- qpid/doc/website/template/template.html | 12 +++---- 11 files changed, 49 insertions(+), 66 deletions(-) diff --git a/qpid/cpp/INSTALL b/qpid/cpp/INSTALL index 9977c13201..9afe4740a3 100644 --- a/qpid/cpp/INSTALL +++ b/qpid/cpp/INSTALL @@ -330,7 +330,7 @@ for qpid code outside the qpid/sys namespace should remain stable. 6. Tests ======== -See src/tests/README for details. +See src/tests/README.txt for details. 7. Doxygen diff --git a/qpid/cpp/INSTALL-WINDOWS b/qpid/cpp/INSTALL-WINDOWS index 195fc303d8..964d644a7a 100644 --- a/qpid/cpp/INSTALL-WINDOWS +++ b/qpid/cpp/INSTALL-WINDOWS @@ -125,7 +125,7 @@ Now follow instruction for building from a source distribution in step (3). 5. Tests ======== -See src/tests/README for details. +See src/tests/README.txt for details. 6. Doxygen diff --git a/qpid/cpp/Makefile.am b/qpid/cpp/Makefile.am index 5c475946a0..7cd022fb08 100644 --- a/qpid/cpp/Makefile.am +++ b/qpid/cpp/Makefile.am @@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = 1.9.2 foreign ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ - LICENSE NOTICE README SSL RELEASE_NOTES DESIGN \ + LICENSE NOTICE README.txt SSL RELEASE_NOTES DESIGN \ xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \ packaging/NSIS QPID_VERSION.txt diff --git a/qpid/cpp/docs/api/header.html b/qpid/cpp/docs/api/header.html index 9c85c54000..883410ce25 100644 --- a/qpid/cpp/docs/api/header.html +++ b/qpid/cpp/docs/api/header.html @@ -19,32 +19,13 @@ --> - - -$title - - - - - - - - - - Apache Qpid C++ API - - - - - - - - - - -
- Apache Qpid - AMQP Messaging for Java JMS, C++, Python, Ruby, and .NET - - Apache Qpid Documentation -
+
+
+Qpid C++ API Reference
+
+ +Generated on $datetime for $projectname by doxygen $doxygenversion +
+ + diff --git a/qpid/cpp/examples/xml-exchange/Makefile.am b/qpid/cpp/examples/xml-exchange/Makefile.am index e91cec370d..9001e3fa61 100644 --- a/qpid/cpp/examples/xml-exchange/Makefile.am +++ b/qpid/cpp/examples/xml-exchange/Makefile.am @@ -33,7 +33,7 @@ listener_SOURCES=listener.cpp listener_LDADD=$(CLIENT_LIB) EXTRA_DIST= \ - README \ + README.txt \ CMakeLists.txt examples_DATA= \ diff --git a/qpid/doc/book/src/schemas.xml b/qpid/doc/book/src/schemas.xml index 3d927b726b..d0bec81aed 100644 --- a/qpid/doc/book/src/schemas.xml +++ b/qpid/doc/book/src/schemas.xml @@ -21,6 +21,8 @@ --> + + diff --git a/qpid/doc/website/content/documentation.html b/qpid/doc/website/content/documentation.html index 7c30078fe6..c5099120cb 100644 --- a/qpid/doc/website/content/documentation.html +++ b/qpid/doc/website/content/documentation.html @@ -1,31 +1,31 @@

Qpid Documentation

-

Documentation for Qpid 0.6 (development branch)

+

Documentation for Qpid 0.7 (development branch)

-

Documentation for Qpid 0.5 (stable)

+

Documentation for Qpid 0.6 (stable)

This documentation was converted from the Wiki and organized into book form. The archives contain the @@ -35,19 +35,19 @@

  • Getting Started

  • AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)

    - PDF | - HTML

    • + HTML

  • AMQP Messaging Broker (Java implemementation)

    -

    PDF | - HTML

    • -

  • For programming examples and documentation for Qpid 0.5, + HTML

    • +

  • For programming examples and documentation for Qpid 0.6, see the Getting Started page.

  • API Reference Documentation

    -

    C++: HTML | qpid-cpp-doxygen-0.5.html.tar.gz

    -

    Python: HTML | qpid-python-epydoc-0.5.html.tar.gz

    • +

    C++: HTML | qpid-cpp-doxygen-0.6.html.tar.gz

    +

    Python: HTML | qpid-python-epydoc-0.6.html.tar.gz

    Documentation Archives

    @@ -61,7 +61,7 @@

    Qpid Wiki

    diff --git a/qpid/doc/website/content/getting_started.html b/qpid/doc/website/content/getting_started.html index fce75fb211..c2de831176 100644 --- a/qpid/doc/website/content/getting_started.html +++ b/qpid/doc/website/content/getting_started.html @@ -1,15 +1,15 @@

    Getting Started with Apache Qpid

    To get started with Apache Qpid, follow the steps below.

    - +
    1. Download the software Download
    2. Start a broker.
    3. Run an example program from the downloaded software, or from the following URLs (these are svn URLs, which you can use to browse the examples or check them out): @@ -44,7 +44,7 @@
      4. @@ -56,7 +56,7 @@
    4. Get your Questions Answered diff --git a/qpid/doc/website/content/qpid_integrated_with.html b/qpid/doc/website/content/qpid_integrated_with.html index aa0f71c92e..541c8cac68 100644 --- a/qpid/doc/website/content/qpid_integrated_with.html +++ b/qpid/doc/website/content/qpid_integrated_with.html @@ -3,7 +3,7 @@

      AMQP integrations

        -
      • HermesJMS - The integration of Hermes JMS with Qpid
        • +
      • HermesJMS - The integration of Hermes JMS with Qpid
      • Twisted AMQP - https://launchpad.net/txamqp
      • Apache Camel - http://activemq.apache.org/camel/amqp.html
      • Apache Axis2 Java - http://wso2.org/library/3663
        • diff --git a/qpid/doc/website/template/style.css b/qpid/doc/website/template/style.css index efa4ca3220..a241836155 100644 --- a/qpid/doc/website/template/style.css +++ b/qpid/doc/website/template/style.css @@ -176,21 +176,21 @@ body { width:196px; float:left; padding:10px 15px 10px 15px; -# margin-left:0px; + margin-left:0px; } .feature_box_column2 { width:196px; float:left; padding:10px 15px 10px 15px; -# margin-left:0px; + margin-left:0px; } .feature_box_column3 { width:196px; float:left; padding:10px 15px 10px 15px; -# margin-left:0px; + margin-left:0px; } diff --git a/qpid/doc/website/template/template.html b/qpid/doc/website/template/template.html index e9986075be..54fa7fb15c 100644 --- a/qpid/doc/website/template/template.html +++ b/qpid/doc/website/template/template.html @@ -46,7 +46,7 @@
      • Getting Started
      • License
        • -
      • FAQ
        • +
      • FAQ
    @@ -55,8 +55,8 @@

    Documentation

    @@ -66,10 +66,10 @@

    Community