Le 18/08/2020 à 12:33, Joe Orton a écrit :
On Tue, Jul 28, 2020 at 07:32:01AM -0400, Eric Covener wrote:
FYI I am seeing if I can coordinate with Humbedooh to change all the
generated files without one of those 17-part commit threads.
But I will probably just commit in the next few hours either way.
Does this still need to be done for trunk?
Yes, I think that it has been done just half-way on trunk. See below
I'm kind of lost here (as
usual with the docs), but running "./build.sh all" in trunk gives me a
tonne of *.html.en.utf8 files.
My first thought was that it shouldn't, unless you modified:
/home/tititou36/svn_httpd_trunk/docs/manual/style/lang/en.xml
Mine has:
<target-ext>.html.en</target-ext>
If you look at fr.xml, for example, it has:
<target-ext>.html.fr.utf8</target-ext>
So, unless, I missed something, only html.en should be generated.
My 2nd thought, is that in fact, I've missed something. See r1880368.
And running build.sh also generates *.html.en.utf8 for me.
So, now it is me who is lost.
What is the relation between what is in <lang>.xml and lang-targets.xml
<http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang-targets.xml?sortby=date&view=log>?
<lang>.xml controls what is written in <file>.html and lang-targets.xml
how files are named?
If so, it is wired and, if feasible, it would be great to have it
defined at only one place.
So I think, that en doc is actually broken on trunk, because the html
files point to non-existing files for en version.
:(
CJ
I have docs/manual/build at r1880369
Should we do a mass "svn mv" for .html.en to .html.en.utf8?
Regards, Joe
On Tue, Jul 28, 2020 at 7:21 AM <cove...@apache.org> wrote:
Author: covener
Date: Tue Jul 28 11:21:32 2020
New Revision: 1880368
URL: http://svn.apache.org/viewvc?rev=1880368&view=rev
Log:
use .utf8 output
Modified:
httpd/httpd/trunk/docs/manual/style/lang-targets.xml
Modified: httpd/httpd/trunk/docs/manual/style/lang-targets.xml
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang-targets.xml?rev=1880368&r1=1880367&r2=1880368&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang-targets.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang-targets.xml Tue Jul 28 11:21:32
2020
@@ -75,7 +75,7 @@
<!-- English -->
<!-- ==================================================================== -->
<property value=".xml" name="inputext.en"/>
-<property value=".html.en" name="outputext.en"/>
+<property value=".html.en.utf8" name="outputext.en"/>
<target description="- builds English HTML files" name="en">
<html.generic lang="en"/>
@@ -312,4 +312,4 @@
</xmlvalidate>
</target>
-</project>
\ No newline at end of file
+</project>
--
Eric Covener
cove...@gmail.com
