1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-09 15:21:02 +03:00
Commit Graph

210 Commits

Author SHA1 Message Date
Christophe Jaillet
10d302435c Fix a parsing error when using Ant 1.9.13 without the external Xerces (2.9.0) and Xalan (2.7.1).
The error is: "filter-expr(funcall(current, []), [pred(=(step("attribute", 39), literal-expr(section)))])'. Cause: Erreur lors de la vérification du type de l'expression 'filter-expr(funcall(current, []), [pred(=(step("attribute", 39), literal-expr(section)))])"

This takes us 1 step closer to use Ant 1.9+ and remove Xerces and Xalan from the build chain.


Patch tested with the current doc build chain (Ant 1.6.5 + Xerces + Xalan) on the 2.4.x branch.
Even if actually we don't have any "<Foo>" and "Foo" directives, I've checked that the doc is built correctly in such a case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1854677 13f79535-47bb-0310-9956-ffa450edef68
2019-03-03 07:26:10 +00:00
Christophe Jaillet
1b4b07429f Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1853616 13f79535-47bb-0310-9956-ffa450edef68
2019-02-15 07:30:59 +00:00
Christophe Jaillet
aebde8b3af Add some additional tests to report badly formatted synopsis.
Comment-out these tests because of the noise it generates, but leave it there, if useful for s.o.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1853615 13f79535-47bb-0310-9956-ffa450edef68
2019-02-15 07:25:54 +00:00
Christophe Jaillet
99a954ba31 Quireference extract the default value of a directive from the <default> of the corresponding <directivesynopsis> block.
The current implementation  expects <default> to be formated like:
directive_name default_value

If the directive name is not there, no default value can be extracted and it is missing in the quickreference table.

This commit adds a basic check to see if the formating looks correct. It catches cases where the directive name is  omited or is misspelled.

If it generates too much noise, feel free to revert or improve :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1852285 13f79535-47bb-0310-9956-ffa450edef68
2019-01-27 13:49:29 +00:00
Christophe Jaillet
4a18262c34 Give a littlet breath before the permalink
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1851168 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 13:50:26 +00:00
Rainer Jung
7a1524fb16 Happy New Year 2019
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850098 13f79535-47bb-0310-9956-ffa450edef68
2019-01-01 12:07:58 +00:00
André Malo
165ee80c6a ran build bootstrap and rebuild transformation. sorry for the noise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1843205 13f79535-47bb-0310-9956-ffa450edef68
2018-10-08 21:09:09 +00:00
Luis Gil
4ae9d65af7 Spanish html doc files : UTF-8 encoding in order to get rid of HTML entities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842566 13f79535-47bb-0310-9956-ffa450edef68
2018-10-01 21:12:38 +00:00
Lucien Gentis
a92100ebe1 French html doc files : UTF-8 encoding in order to get rid of HTML entities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842386 13f79535-47bb-0310-9956-ffa450edef68
2018-09-30 15:02:28 +00:00
Christophe Jaillet
3221cc06aa The XSLT Saxon engine warns about some "Ambiguous rule matches".
Use priority to remove the ambiguity.

The only rational for choosing "3" and "4" for these priorities, is that "4" is related to <h4> tags, and 3=4-1 for the previous level.

Tested with the actual Xalan XSL engine:
   ./build.sh all
with and without the change.
Outputs are exactly the same.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842165 13f79535-47bb-0310-9956-ffa450edef68
2018-09-27 20:44:08 +00:00
Christophe Jaillet
695c187293 Revert r1842160
Some rules to help me detect un-needed links to directives, or missing ones were sent by error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842164 13f79535-47bb-0310-9956-ffa450edef68
2018-09-27 20:42:24 +00:00
Christophe Jaillet
4260a8a8ab The XSLT Saxon engine warns about some "Ambiguous rule matches".
Use priority to remove the ambiguity.

The only rational for choosing "3" and "4" for these priorities, is that "4" is related to <h4> tags, and 3=4-1 for the previous level.

Tested with the actual Xalan XSL engine:
   ./build.sh all
with and without the change.
Outputs are exactly the same.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842160 13f79535-47bb-0310-9956-ffa450edef68
2018-09-27 20:26:59 +00:00
Christophe Jaillet
2702dc8d9f The XSLT Saxon engine warns that match="@*" will return only attribute nodes, which can't have any attributes or child.
So simplify the xsl rules accordingly.

Tested with the actual Xalan XSL engine:
   ./build.sh all
with and without the change.
Outputs are exactly the same.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842146 13f79535-47bb-0310-9956-ffa450edef68
2018-09-27 19:18:51 +00:00
Joe Orton
e0ce3428d4 Render <code> in bold in man pages, matching commonly used style in
both help2man and the standard DocBook XSL stylesheets for man output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1834470 13f79535-47bb-0310-9956-ffa450edef68
2018-06-27 07:24:39 +00:00
Christophe Jaillet
2f4de8e407 Align the regex with the one used in 2.4.x which gives nicer results.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828841 13f79535-47bb-0310-9956-ffa450edef68
2018-04-10 18:19:56 +00:00
Christophe Jaillet
30254a5fdd New xsl file which generates ready to copy/paste strings for prettify(.min).js
All the directives are collected in some JS arrays, so that it is easier to upgrade the list
in prettify.js when new directives are added.

'build.sh' will be updated accordingly. A new build target ('prettify') will be added to
update this list. The resulting file is: docs/manual/list_for_prettify.txt

This new file is heavily inspired from convmap.xsl.

It should be possible to go further, but this is already a first step.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828598 13f79535-47bb-0310-9956-ffa450edef68
2018-04-07 16:33:02 +00:00
Christophe Jaillet
fa84d34299 Add a permalink functionality to section and diective-section in the generated doc.
This is convenient and consistent with httpd.a.o

Getting a link to a section or a directive is already possible from the TOC, but having it available directly in-place is, IMHO, much more useful.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828588 13f79535-47bb-0310-9956-ffa450edef68
2018-04-07 08:55:11 +00:00
Luca Toscano
594930eea2 common.xsl: update year to 2018 in the footer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1819994 13f79535-47bb-0310-9956-ffa450edef68
2018-01-03 18:24:57 +00:00
Luca Toscano
d41a5d1e3a synopsis.xsl: fix broken translation builds
This commit is a follow up of r1805189, in which
a new logic was added to allow to repeat a directive
name only if its type is different (like SSLPolicy
and <SSLPolicy>). The change broken french translations
since the $this variable, containing the translated
sections, was not used anymore.

The XPath code could surely be improved, but it seems
more pressing to allow our translators to get back
to their daily work without interference.

build.sh validate-* worked fine, as well as the build.sh fr
translation.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1806443 13f79535-47bb-0310-9956-ffa450edef68
2017-08-28 12:34:58 +00:00
Luca Toscano
50c86e4f2c doc xsl/dtd: introduce idtype attribute for directivesynopsis
In r1805193 synopsis.xsl was changed to allow two directives
of different type (like <SSLPolicy> and SSLPolicy) to share
the same name but have different ids (and please validate-xml/xhtml).
The downside of this action was that all the quicklinks to
existing directive sections (like <If>, <VirtualHost>, etc..)
were changed, possibly breaking external clients already
referencing them.

This change introduces a new attribute in the directivesynopsis
DTD, namely 'idtype', that will be appended to 'name'
in the id generation by synopsis.xsl. This will rollback
link names to their previous values and will allow documentators
to fine tune directivesynopsis sections as they need
(for example we have recently introduced mod_md's
ManagedDomain/<ManagedDomain>, and modssl's SSLPolicy/<SSLPolicy>).

This approach seems more precise and less invasive to me.
Of course the name of the attribute can be changed later on
to whatever term would fit best, the main concern for me at
the moment is to restore the trunk documentation to its previous
state.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805372 13f79535-47bb-0310-9956-ffa450edef68
2017-08-18 08:21:43 +00:00
Luca Toscano
7d0602830d common|synopsis.xsl: rename directive type=sections id generation
This commits is a follow up of r1805189 and it is meant
to allow directives with the same name but different type
to coexist in the same document without triggering errors
while executing validate-xhtml.

For example: mod_md.xml recently introduced the following:

* ManagedDomain
* <ManagedDomain> (this one is type=section)

In my opinion this is a perfectly valid use case and it should
be allowed/handled correctly by the doc generation process/validation.

In order to avoid clashing the directive ids will get a suffix
called "section" if type=section will be present as param.

Quicklinks, <directive> links have been updated to the new
scheme to avoid dandling pointers in the doc.

Comments/reviews are welcome, if I left something behind
please let me know.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805193 13f79535-47bb-0310-9956-ffa450edef68
2017-08-16 13:40:12 +00:00
Luca Toscano
9745af6f42 synopsis.xsl: do not render two times the same
directive HTML if more than one
              directive share the same name.

This has happened when mod_md.xml was introduced,
and the following directives shared the same name:
* ManagedDomain
* <ManagedDomain>

With the current code each time that a node needs
to be rendered it will emit a duplicate, ending up
in the above example with 4 sections rather than two.

Uniqueness of sections will be ensured by the HTML
elements ids, to avoid errors before committing for
example (accidental duplicates, etc..).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805189 13f79535-47bb-0310-9956-ffa450edef68
2017-08-16 13:04:55 +00:00
Jacob Champion
3ec7888445 Add an Override Class Index
This page pulls in directives that declare an <override> element and
groups them by class. The documentation for each class comes from
overrides.xml. Any undocumented classes are flagged with a boilerplate
fallback text (this situation is only likely to occur with a misspelling
or otherwise invalid <override> somewhere else in the documentation).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793922 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 22:53:58 +00:00
Rainer Jung
ca435ae977 Happy New Year 2017
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776956 13f79535-47bb-0310-9956-ffa450edef68
2017-01-02 16:06:53 +00:00
Luca Toscano
41df726ba7 Make the comments link always appear under "See also" in the right panel of each doc page.
Previously it was inconsistently placed right below the last section on top.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741557 13f79535-47bb-0310-9956-ffa450edef68
2016-04-29 06:31:53 +00:00
Luca Toscano
71dc70fb42 Follow up for the Bugfix checklist panel. Remove ":" from Bugfix checklist, moved HTTPD to httpd, added the component=mod_name to the "Open bug" link.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741065 13f79535-47bb-0310-9956-ffa450edef68
2016-04-26 18:12:26 +00:00
Yann Ylavic
56b647349d Follow up to r1740928, r1740967: Introduce 'proxy section' context?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740987 13f79535-47bb-0310-9956-ffa450edef68
2016-04-26 09:47:46 +00:00
Christophe Jaillet
4d0d1ddae9 Fix a typo
Remove a useless empty line
Turn a tab into spaces to be consistent

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740880 13f79535-47bb-0310-9956-ffa450edef68
2016-04-25 19:18:38 +00:00
Luca Toscano
b684b4e395 Second part of the new "Bugfix checklist" panel in the modules doc pages.
Changes discussed in docs@ and implemented:
- Moved Httpd to HTTPD
- Created a new link to quickly open a bug in Bugzilla
- Modified the link called "Open bugs" to "Known issues" and appended
  the bugzilla component name to the URL. In this way the user will only
  see bugs related to the module under review, not all the httpd ones. 
  A little hack was necessary since some mpms have inconsistent naming
  (e.g. mpm_event in Bugzilla and event in docs).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740735 13f79535-47bb-0310-9956-ffa450edef68
2016-04-24 21:11:42 +00:00
Luca Toscano
38016d1d25 Add a new panel to all the module doc pages containing quicklinks for Changelog and open bugs.
This change should help users not familiar with the httpd changelog and bugzilla to check them
before asking in IRC/users@/etc if httpd has a bug or not. The wording and position of the 
panel can of course be changed; this is a proposal to improve user experience while consulting 
doc pages related to httpd modules. The change has also been discussed in docs@.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740110 13f79535-47bb-0310-9956-ffa450edef68
2016-04-20 11:12:50 +00:00
Jim Jagielski
79f068d00c Use nice PNG instead of ugly nasty GIF
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730073 13f79535-47bb-0310-9956-ffa450edef68
2016-02-12 17:03:09 +00:00
Lucien Gentis
985fcfccee Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727738 13f79535-47bb-0310-9956-ffa450edef68
2016-01-30 17:36:32 +00:00
Lucien Gentis
a8ed88f87b Rebuild with 'fr bootstrap' options.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727735 13f79535-47bb-0310-9956-ffa450edef68
2016-01-30 17:25:53 +00:00
Rainer Jung
a35dbc4e61 Happy New Year 2016
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722572 13f79535-47bb-0310-9956-ffa450edef68
2016-01-01 20:51:54 +00:00
André Malo
e4ef6e7dbc The good thing about standards is that there are so many to choose from.
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=55741


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674382 13f79535-47bb-0310-9956-ffa450edef68
2015-04-17 19:46:28 +00:00
Daniel Ruggeri
8ce268c3c6 Flip directives and topics sections after discussion around ordering
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673867 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 16:51:57 +00:00
Daniel Ruggeri
2c3efa3157 Adjust template to align page content with table of contents
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673846 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 16:21:28 +00:00
André Malo
2a46c5a884 allow placing the 'directive' word before the directive name in the module synopsis.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659855 13f79535-47bb-0310-9956-ffa450edef68
2015-02-14 20:07:46 +00:00
Rainer Jung
545e553dfb Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1649002 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 11:42:59 +00:00
Rainer Jung
7cb5913e8a Happy New Year 2015
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1648840 13f79535-47bb-0310-9956-ffa450edef68
2015-01-01 13:05:30 +00:00
Rainer Jung
1c96933732 Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1629257 13f79535-47bb-0310-9956-ffa450edef68
2014-10-03 16:48:30 +00:00
Joe Orton
6d9fb2783f - ignore <br> inside <dd> too, since ab.xml is using that,
though it's kind of wrong


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1605841 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 16:25:44 +00:00
Christophe Jaillet
4292178ce8 Add version number in <title> as proposed by Louise Hope in online doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1596441 13f79535-47bb-0310-9956-ffa450edef68
2014-05-21 02:20:27 +00:00
André Malo
1a2824e812 handle duplicate directives by sorting directive lists additionally by module name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1570862 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 17:47:10 +00:00
André Malo
b9f08fd090 indentation fixup for multinode <pre> container
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1565135 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 09:34:52 +00:00
André Malo
0a4b4dd433 left-trim one-liner-<pre>s or -<highlight>s completely. The indentation is
usually an accident.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1565001 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 23:51:08 +00:00
André Malo
8f29edaadf move the <pre> trimming code into its own module and use it both for html and
latex output


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564993 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 23:19:32 +00:00
André Malo
4d2c9470bc move string-reverse function into its own file and share it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564972 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 22:47:57 +00:00
André Malo
e76da58f48 improve output by trimming spaces from <pre> and <highlight> output.
- strip the initial empty lines, but keep initial indentation
- strip trailing whitespace completely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564956 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 22:19:53 +00:00
André Malo
c0b3ad339f build bootstrap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564800 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 15:15:29 +00:00