Derby
  1. Derby
  2. DERBY-4408

missing DOCTYPE and META tags in toc.html and index.html pages

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 10.3.3.0
    • Fix Version/s: 10.8.2.2, 10.9.1.0
    • Component/s: Documentation
    • Labels:
      None

      Description

      I found a tool that analyzes the documentation for possible accessibility issues, and it found that the index.html and toc.html files from all 6 books have issues:

      INDEX.HTML
      977 Missing DOCTYPE tag. Required to define version of XHTML being used.
      833 Missing META tag. Required CHARSET value must be defined in this file.
      TOC.HTML
      831 Missing DOCTYPE tag. Required to define version of HTML being used. Line: 1

      1. DERBY-4408.diff
        0.6 kB
        Kim Haase
      2. index.html
        2 kB
        Kim Haase
      3. DERBY-4408.diff
        2 kB
        Kim Haase
      4. toc.html
        4 kB
        Kim Haase
      5. DERBY-4408-2.diff
        5 kB
        Kim Haase
      6. DERBY-4408.stat
        0.1 kB
        Kim Haase
      7. DERBY-4408.zip
        4 kB
        Kim Haase
      8. insert-header.diff
        5 kB
        Knut Anders Hatlen
      9. DERBY-4408-3.diff
        10 kB
        Kim Haase
      10. DERBY-4408-3.stat
        0.1 kB
        Kim Haase
      11. DERBY-4408-3.zip
        5 kB
        Kim Haase
      12. DERBY-4408-4.diff
        10 kB
        Kim Haase
      13. DERBY-4408-5.diff
        0.4 kB
        Kim Haase
      14. DERBY-4408-5.stat
        0.1 kB
        Kim Haase
      15. DERBY-4408-6.diff
        368 kB
        Kim Haase
      16. DERBY-4408-6.stat
        0.1 kB
        Kim Haase

        Issue Links

          Activity

          Hide
          Knut Anders Hatlen added a comment -

          Those files are generated by DITA, so I don't know if there's much we can do. For the record, I tried to generate docs with the newest DITA (1.4.1, whereas the build scripts currently use 1.1.2.1) and can verify that DOCTYPE and META are still missing in index.html. However, the toc.html file has a DOCTYPE tag with that version of DITA.

          Show
          Knut Anders Hatlen added a comment - Those files are generated by DITA, so I don't know if there's much we can do. For the record, I tried to generate docs with the newest DITA (1.4.1, whereas the build scripts currently use 1.1.2.1) and can verify that DOCTYPE and META are still missing in index.html. However, the toc.html file has a DOCTYPE tag with that version of DITA.
          Hide
          Kim Haase added a comment -

          I ran these files through another accessibility checker and got different errors:

          INDEX.HTML
          A TITLE attribute is required for FRAME tag.
          FRAMESET element should have NOFRAMES sub-element for user agents that do not support frames.
          HTML tags require LANG attributes. Primary language not specified for document.
          TOC.HTML
          HTML tags require LANG attributes. Primary language not specified for document.

          Ideally we would fix all of these, but with our current toolkit we can't.

          The rest of the frameset files are fine except for those with tables (mainly to do with empty summary attributes generated by our toolkit; it's complicated).

          Do not use TH for structural layout in layout tables.

          The one-page HTML books generate a lot of errors because of the FOP processing:

          HTML tags require LANG attributes. Primary language not specified for document.
          An ALT attribute is required for IMG tag.
          No SUMMARY attribute found for TABLE tag.
          Table data cells are required to be associated with headers.

          BTW, we would get the last one in the regular frameset files if we were able to put summaries in our table tags. Catch 22.

          Show
          Kim Haase added a comment - I ran these files through another accessibility checker and got different errors: INDEX.HTML A TITLE attribute is required for FRAME tag. FRAMESET element should have NOFRAMES sub-element for user agents that do not support frames. HTML tags require LANG attributes. Primary language not specified for document. TOC.HTML HTML tags require LANG attributes. Primary language not specified for document. Ideally we would fix all of these, but with our current toolkit we can't. The rest of the frameset files are fine except for those with tables (mainly to do with empty summary attributes generated by our toolkit; it's complicated). Do not use TH for structural layout in layout tables. The one-page HTML books generate a lot of errors because of the FOP processing: HTML tags require LANG attributes. Primary language not specified for document. An ALT attribute is required for IMG tag. No SUMMARY attribute found for TABLE tag. Table data cells are required to be associated with headers. BTW, we would get the last one in the regular frameset files if we were able to put summaries in our table tags. Catch 22.
          Hide
          Kim Haase added a comment -

          Most of the problems described in comments have been fixed in one or another of the sub-tasks of DERBY-5135. However, some of the initial problems remain, although the toc.html files now contain a META tag defining the charset.

          It is easy enough to add the DOCTYPE and META tags to the index.html file in the lib directory that is used as a template for all of them. Would it be okay to remove the IBM copyright from the file, too, do you think?

          How to get the DOCTYPE into the toc.html file is a puzzle, though.

          Show
          Kim Haase added a comment - Most of the problems described in comments have been fixed in one or another of the sub-tasks of DERBY-5135 . However, some of the initial problems remain, although the toc.html files now contain a META tag defining the charset. It is easy enough to add the DOCTYPE and META tags to the index.html file in the lib directory that is used as a template for all of them. Would it be okay to remove the IBM copyright from the file, too, do you think? How to get the DOCTYPE into the toc.html file is a puzzle, though.
          Hide
          Kim Haase added a comment -

          Attaching an initial patch, DERBY-4408.diff, that fixes the DOCTYPE and META tag issues for the lib/index.html file, resulting in content similar to that for other topics; the attached index.html file is the output file for Getting Started.

          I didn't remove the IBM copyright in this patch.

          I'll try to figure out how to get the DOCTYPE into the toc.html file, but that'll be harder.

          Show
          Kim Haase added a comment - Attaching an initial patch, DERBY-4408 .diff, that fixes the DOCTYPE and META tag issues for the lib/index.html file, resulting in content similar to that for other topics; the attached index.html file is the output file for Getting Started. I didn't remove the IBM copyright in this patch. I'll try to figure out how to get the DOCTYPE into the toc.html file, but that'll be harder.
          Hide
          Kim Haase added a comment -

          I think I figured out how to fix the toc file, by comparing the map2htmtoc.xsl file that generates it with the dita2htmlImpl.xsl file that generates ordinary pages and adding the needed code. I'm attaching a new version of the DERBY-4408.diff patch that includes the changes to map2htmtoc.xsl as well as to the index file, as well as the generated toc.html file from Getting Started.

          Hope this works for your accessibility tool, Myrna.

          Show
          Kim Haase added a comment - I think I figured out how to fix the toc file, by comparing the map2htmtoc.xsl file that generates it with the dita2htmlImpl.xsl file that generates ordinary pages and adding the needed code. I'm attaching a new version of the DERBY-4408 .diff patch that includes the changes to map2htmtoc.xsl as well as to the index file, as well as the generated toc.html file from Getting Started. Hope this works for your accessibility tool, Myrna.
          Hide
          Myrna van Lunteren added a comment -

          I cannot check any time soon, so I think it is best to go ahead and if I need further adjustments, we can tackle them later. Thanks for working on this issue!

          Show
          Myrna van Lunteren added a comment - I cannot check any time soon, so I think it is best to go ahead and if I need further adjustments, we can tackle them later. Thanks for working on this issue!
          Hide
          Knut Anders Hatlen added a comment -

          I took a look at the patch, and noticed some small issues with the generated HTML files. I'm not sure if fixing all of these is within the scope of this bug report, but here goes.

          • I think the <?xml ...?> line needs to be the first line in the file (both index.html and toc.html) in order to be well-formed XML.
          • The doctype for index.html should be XHTML 1.0 Frameset, not XHTML 1.0 Transitional, since the <frameset> element isn't defined in the transitional DTD.

          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

          • The patch makes the doctype of toc.html XHTML 1.0 Transitional. However, the XHTML DTDs require the tags to be in lower case, whereas the document uses upper case <UL>..</UL> and <LI>..</LI>. We should either use a doctype that allows upper case tags (for example HTML 4.01 Transitional), or change the case of those tags to match the doctype. I think I prefer the latter.
          • The html element needs the attribute xmlns="http://www.w3.org/1999/xhtml" in order to pass as valid XHTML on http://validator.w3.org/ (assuming the above issues are fixed first).
          Show
          Knut Anders Hatlen added a comment - I took a look at the patch, and noticed some small issues with the generated HTML files. I'm not sure if fixing all of these is within the scope of this bug report, but here goes. I think the <?xml ...?> line needs to be the first line in the file (both index.html and toc.html) in order to be well-formed XML. The doctype for index.html should be XHTML 1.0 Frameset, not XHTML 1.0 Transitional, since the <frameset> element isn't defined in the transitional DTD. <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> The patch makes the doctype of toc.html XHTML 1.0 Transitional. However, the XHTML DTDs require the tags to be in lower case, whereas the document uses upper case <UL>..</UL> and <LI>..</LI>. We should either use a doctype that allows upper case tags (for example HTML 4.01 Transitional), or change the case of those tags to match the doctype. I think I prefer the latter. The html element needs the attribute xmlns="http://www.w3.org/1999/xhtml" in order to pass as valid XHTML on http://validator.w3.org/ (assuming the above issues are fixed first).
          Hide
          Kim Haase added a comment -

          This is great information, Knut – I am pretty clueless about these DTDs.

          The <?xml ...?> line comes after the license comment in all our files, and has ever since 10.2, when we first put the Apache license in the frameset output files. I can try tweaking the order in which the template calls are invoked.

          It should not be hard to change the case of the list elements in the toc. I will look into that, too.

          Thanks again. I'll try to figure all this out and hopefully file another patch later on.

          Show
          Kim Haase added a comment - This is great information, Knut – I am pretty clueless about these DTDs. The <?xml ...?> line comes after the license comment in all our files, and has ever since 10.2, when we first put the Apache license in the frameset output files. I can try tweaking the order in which the template calls are invoked. It should not be hard to change the case of the list elements in the toc. I will look into that, too. Thanks again. I'll try to figure all this out and hopefully file another patch later on.
          Hide
          Kim Haase added a comment -

          Some of this is not so hard, but There are a couple of problems. First, the Apache license is inserted after all the other processing, in the following code within the html.dita target of the build.xml file.

          <filterchain>
          <concatfilter prepend="$

          {basedir}

          /lib/apache-license-html.html"/>
          </filterchain>

          So I'll have to bring the license insertion into the XSL files somehow.

          Also, getting the xmlns attribute into the html element is not trivial. If I simply insert it into the html element in the stylesheet –

          <html xmlns="http://www.w3.org/1999/xhtml">

          then in the toc frame, I get empty xmnls attributes in the meta and ul tags:

          <html xmlns="http://www.w3.org/1999/xhtml" lang="en-us" xml:lang="en-us">
          <head>
          <meta xmlns="" content="text/html; charset=utf-8" http-equiv="Content-Type" />
          ...
          <ul xmlns="">

          Whereas if I do the same thing in the stylesheet for the non-toc pages, I get the empty attributes in the head and body elements only:

          <html xmlns="http://www.w3.org/1999/xhtml" lang="en-us" xml:lang="en-us">
          <head xmlns="">
          ...
          <body xmlns="" id="tgsactivity4"><a name="tgsactivity4"><!-- --></a>

          However, if I try to create a template to set the attribute, it is completely ignored.

          <xsl:call-template name="setNamespace"/>
          ...
          <xsl:template name="setNamespace">
          <xsl:attribute name="xmlns">http://www.w3.org/1999/xhtml</xsl:attribute>
          </xsl:template>

          The "ant -verbose" command says,

          Warning! Illegal value used for attribute name: name

          Looks like the namespace attribute is the one attribute you can't set.

          At http://www.w3schools.com/tags/tag_html.asp it says that "the HTML validator at w3.org does not complain when the xmlns attribute is missing in an XHTML document. This is because the namespace "xmlns=http://www.w3.org/1999/xhtml" is default, and will be added to the <html> tag even if you do not include it."

          This suggests that we may not really need to add this after all?

          Show
          Kim Haase added a comment - Some of this is not so hard, but There are a couple of problems. First, the Apache license is inserted after all the other processing, in the following code within the html.dita target of the build.xml file. <filterchain> <concatfilter prepend="$ {basedir} /lib/apache-license-html.html"/> </filterchain> So I'll have to bring the license insertion into the XSL files somehow. Also, getting the xmlns attribute into the html element is not trivial. If I simply insert it into the html element in the stylesheet – <html xmlns="http://www.w3.org/1999/xhtml"> then in the toc frame, I get empty xmnls attributes in the meta and ul tags: <html xmlns="http://www.w3.org/1999/xhtml" lang="en-us" xml:lang="en-us"> <head> <meta xmlns="" content="text/html; charset=utf-8" http-equiv="Content-Type" /> ... <ul xmlns=""> Whereas if I do the same thing in the stylesheet for the non-toc pages, I get the empty attributes in the head and body elements only: <html xmlns="http://www.w3.org/1999/xhtml" lang="en-us" xml:lang="en-us"> <head xmlns=""> ... <body xmlns="" id="tgsactivity4"><a name="tgsactivity4"><!-- --></a> However, if I try to create a template to set the attribute, it is completely ignored. <xsl:call-template name="setNamespace"/> ... <xsl:template name="setNamespace"> <xsl:attribute name="xmlns"> http://www.w3.org/1999/xhtml </xsl:attribute> </xsl:template> The "ant -verbose" command says, Warning! Illegal value used for attribute name: name Looks like the namespace attribute is the one attribute you can't set. At http://www.w3schools.com/tags/tag_html.asp it says that "the HTML validator at w3.org does not complain when the xmlns attribute is missing in an XHTML document. This is because the namespace "xmlns= http://www.w3.org/1999/xhtml " is default, and will be added to the <html> tag even if you do not include it." This suggests that we may not really need to add this after all?
          Hide
          Kim Haase added a comment -

          This is a little scary, but there is a simple solution to the placement of the xml declaration – specify the attribute

          omit-xml-declaration="yes"

          in the xsl:output tag, and put the xml declaration at the top of the prepended license file. I removed the declaration from the index.html file too.

          Show
          Kim Haase added a comment - This is a little scary, but there is a simple solution to the placement of the xml declaration – specify the attribute omit-xml-declaration="yes" in the xsl:output tag, and put the xml declaration at the top of the prepended license file. I removed the declaration from the index.html file too.
          Hide
          Kim Haase added a comment -

          Attaching DERBY-4408-2.diff, DERBY-4408.stat, and DERBY-4408.zip. The following files have changes:

          M lib/dita2htmlImpl.xsl
          M lib/map2htmtoc.xsl
          M lib/apache-license-html.html
          M lib/index.html

          The zip file contains the changed index and toc and a sample topic page from Getting Started.

          This revised patch not only adds the doctype and charset to the toc and index files, but also lowercases the elements in the toc and places the xml declaration at the top of each file.

          Show
          Kim Haase added a comment - Attaching DERBY-4408 -2.diff, DERBY-4408 .stat, and DERBY-4408 .zip. The following files have changes: M lib/dita2htmlImpl.xsl M lib/map2htmtoc.xsl M lib/apache-license-html.html M lib/index.html The zip file contains the changed index and toc and a sample topic page from Getting Started. This revised patch not only adds the doctype and charset to the toc and index files, but also lowercases the elements in the toc and places the xml declaration at the top of each file.
          Hide
          Knut Anders Hatlen added a comment -

          I agree that making the xml declaration part of the license template file feels a bit ugly. What about generating the license headers in the XSL scripts instead? Something along the lines of the attached insert-header.diff patch. That seems to insert the license header at the correct place in the html files.

          Show
          Knut Anders Hatlen added a comment - I agree that making the xml declaration part of the license template file feels a bit ugly. What about generating the license headers in the XSL scripts instead? Something along the lines of the attached insert-header.diff patch. That seems to insert the license header at the correct place in the html files.
          Hide
          Knut Anders Hatlen added a comment -

          Forgot to say that I ran the html files in DERBY-4408.zip through http://validator.w3.org/, and there were no errors except the aforementioned missing xmlns attribute, so the DERBY-4408-2.diff patch looks like a good improvement.

          Show
          Knut Anders Hatlen added a comment - Forgot to say that I ran the html files in DERBY-4408 .zip through http://validator.w3.org/ , and there were no errors except the aforementioned missing xmlns attribute, so the DERBY-4408 -2.diff patch looks like a good improvement.
          Hide
          Kim Haase added a comment -

          Thanks, Knut! That does work. Part of the patch was rejected when I applied it (the part with the xsl:output tag) so the omit-xml-declaration attribute stayed in. I fixed that.

          I needed to put the xml declaration and license in the index.html file, too.

          I don't think we need to put the license into the -single html files, since the full license is near the top of the file anyway – that's why it wasn't there before. With the frames version, the license was in only one topic rather than every file. However, it can do no harm. What do you think?

          Show
          Kim Haase added a comment - Thanks, Knut! That does work. Part of the patch was rejected when I applied it (the part with the xsl:output tag) so the omit-xml-declaration attribute stayed in. I fixed that. I needed to put the xml declaration and license in the index.html file, too. I don't think we need to put the license into the -single html files, since the full license is near the top of the file anyway – that's why it wasn't there before. With the frames version, the license was in only one topic rather than every file. However, it can do no harm. What do you think?
          Hide
          Kim Haase added a comment -

          Attaching another patch that incorporates Knut's changes: DERBY-4408-3.diff, DERBY-4408-3.stat, and DERBY-4408-3.zip. The changes are to the following files:

          M build.xml
          M lib/dita2htmlImpl.xsl
          M lib/fo2html.xsl
          M lib/map2htmtoc.xsl
          M lib/index.html

          The zip contains files from the Tools Guide this time. I did not include the one-page HTML file since it's so big, but it begins like this now:

          <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
          <!--
          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.
          -->
          <html><head><META http-equiv="Content-Type" content="text/html; charset=utf-8"><
          title>Derby Tools and Utilities Guide</title><META content="text/css" http-equiv
          ="Content-Style-Type"><style type="text/css">
          ...

          Thanks again for your help, Knut.

          Show
          Kim Haase added a comment - Attaching another patch that incorporates Knut's changes: DERBY-4408 -3.diff, DERBY-4408 -3.stat, and DERBY-4408 -3.zip. The changes are to the following files: M build.xml M lib/dita2htmlImpl.xsl M lib/fo2html.xsl M lib/map2htmtoc.xsl M lib/index.html The zip contains files from the Tools Guide this time. I did not include the one-page HTML file since it's so big, but it begins like this now: <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- 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. --> <html><head><META http-equiv="Content-Type" content="text/html; charset=utf-8">< title>Derby Tools and Utilities Guide</title><META content="text/css" http-equiv ="Content-Style-Type"><style type="text/css"> ... Thanks again for your help, Knut.
          Hide
          Kim Haase added a comment -

          Attaching yet another patch, DERBY-4408-4.diff, that adds an overwrite attribute to the build.xml file's copy command for the map2htmtoc.xml file to resolve DERBY-5349. Hope this works.

          Show
          Kim Haase added a comment - Attaching yet another patch, DERBY-4408 -4.diff, that adds an overwrite attribute to the build.xml file's copy command for the map2htmtoc.xml file to resolve DERBY-5349 . Hope this works.
          Hide
          Knut Anders Hatlen added a comment -

          Thanks, Kim! The latest patch looks great.

          As to the problem with applying the patch, I think it's caused by lib/dita2htmlImpl.xsl and lib/map2htmtoc.xsl not having the svn:eol-style property set. The files even have a mix of unix line endings and windows line endings. We should fix that, but first let's get this patch in, so that we don't need to regenerate it.

          Show
          Knut Anders Hatlen added a comment - Thanks, Kim! The latest patch looks great. As to the problem with applying the patch, I think it's caused by lib/dita2htmlImpl.xsl and lib/map2htmtoc.xsl not having the svn:eol-style property set. The files even have a mix of unix line endings and windows line endings. We should fix that, but first let's get this patch in, so that we don't need to regenerate it.
          Hide
          Kim Haase added a comment -

          Thanks, Knut, for the review and for catching the problem of the line endings. I'll commit the patch Monday and we can take it from there.

          Show
          Kim Haase added a comment - Thanks, Knut, for the review and for catching the problem of the line endings. I'll commit the patch Monday and we can take it from there.
          Hide
          Kim Haase added a comment -

          Committed patch DERBY-4408-4.diff to documentation trunk at revision 1150706.
          Merged to 10.8 doc branch at revision 1150712.

          I'm not resolving the issue because of the problems with the svn:eol-style property for lib/dita2htmlImpl.xsl and lib/map2htmtoc.xsl.

          Show
          Kim Haase added a comment - Committed patch DERBY-4408 -4.diff to documentation trunk at revision 1150706. Merged to 10.8 doc branch at revision 1150712. I'm not resolving the issue because of the problems with the svn:eol-style property for lib/dita2htmlImpl.xsl and lib/map2htmtoc.xsl.
          Hide
          Kim Haase added a comment -

          I can file a patch that changes the eol-style for those two files (and also for index.html, which doesn't currently have it set). But should I run dos2unix or some such on the files first, to remove the current mix of line endings?

          Show
          Kim Haase added a comment - I can file a patch that changes the eol-style for those two files (and also for index.html, which doesn't currently have it set). But should I run dos2unix or some such on the files first, to remove the current mix of line endings?
          Hide
          Knut Anders Hatlen added a comment -

          I think it's sufficient to run "svn propset svn:eol-style native" on the files. In similar exercises in the past, the line endings in the files weren't updated until the files were committed, so you shouldn't be alarmed if you still see incorrect endings after the svn propset command.

          Show
          Knut Anders Hatlen added a comment - I think it's sufficient to run "svn propset svn:eol-style native" on the files. In similar exercises in the past, the line endings in the files weren't updated until the files were committed, so you shouldn't be alarmed if you still see incorrect endings after the svn propset command.
          Hide
          Kim Haase added a comment -

          Thanks, Knut, for that info. Attaching DERBY-4408-5.diff and DERBY-4408-5.stat, with changes to the following:

          M lib/dita2htmlImpl.xsl
          M lib/map2htmtoc.xsl
          M lib/index.html

          Think that'll do it?

          Show
          Kim Haase added a comment - Thanks, Knut, for that info. Attaching DERBY-4408 -5.diff and DERBY-4408 -5.stat, with changes to the following: M lib/dita2htmlImpl.xsl M lib/map2htmtoc.xsl M lib/index.html Think that'll do it?
          Hide
          Knut Anders Hatlen added a comment -

          Yes, but the property should be named svn:eol-style (note the svn: prefix). I see now that I get a warning about inconsistent line ending style when I try to set that property, and the property isn't actually set unless I say svn propset --force, or run dos2unix on the file first, as you suggested.

          Show
          Knut Anders Hatlen added a comment - Yes, but the property should be named svn:eol-style (note the svn: prefix). I see now that I get a warning about inconsistent line ending style when I try to set that property, and the property isn't actually set unless I say svn propset --force, or run dos2unix on the file first, as you suggested.
          Hide
          Kim Haase added a comment -

          That was careless of me! I see the same warning now – thanks. I guess running dos2unix to get the endings consistent first is the best bet?

          Show
          Kim Haase added a comment - That was careless of me! I see the same warning now – thanks. I guess running dos2unix to get the endings consistent first is the best bet?
          Hide
          Knut Anders Hatlen added a comment -

          Yes, that ought to do the trick. +1

          Show
          Knut Anders Hatlen added a comment - Yes, that ought to do the trick. +1
          Hide
          Kim Haase added a comment -

          Thanks again, Knut. Well, now the patch is a lot bigger! And the changes look like this (both to files and properties):

          MM lib/dita2htmlImpl.xsl
          MM lib/map2htmtoc.xsl
          MM lib/index.html

          Show
          Kim Haase added a comment - Thanks again, Knut. Well, now the patch is a lot bigger! And the changes look like this (both to files and properties): MM lib/dita2htmlImpl.xsl MM lib/map2htmtoc.xsl MM lib/index.html
          Hide
          Knut Anders Hatlen added a comment -

          Looks good. +1

          Show
          Knut Anders Hatlen added a comment - Looks good. +1
          Hide
          Kim Haase added a comment -

          Thanks, Knut!

          Darn, I did a commit to trunk, then merged to the branch and suddenly realized that the property setting had to be done manually – it didn't happen automatically with the patch command. I'll commit to branch for symmetry, then have to redo the commit to get the property setting. Sorry.

          Show
          Kim Haase added a comment - Thanks, Knut! Darn, I did a commit to trunk, then merged to the branch and suddenly realized that the property setting had to be done manually – it didn't happen automatically with the patch command. I'll commit to branch for symmetry, then have to redo the commit to get the property setting. Sorry.
          Hide
          Kim Haase added a comment -

          Thanks again for all your help, Knut.

          Committed patch DERBY-4408-6.diff to documentation trunk at revision 1151090.
          Merged to 10.8 doc branch at revision 1151098.

          Set properties on doc trunk files at revision 1151099.
          Set properties on 10.8 doc branch files at revision 1151103.

          Show
          Kim Haase added a comment - Thanks again for all your help, Knut. Committed patch DERBY-4408 -6.diff to documentation trunk at revision 1151090. Merged to 10.8 doc branch at revision 1151098. Set properties on doc trunk files at revision 1151099. Set properties on 10.8 doc branch files at revision 1151103.
          Hide
          Kim Haase added a comment -

          Issue was resolved several months ago, so closing.

          Show
          Kim Haase added a comment - Issue was resolved several months ago, so closing.

            People

            • Assignee:
              Kim Haase
              Reporter:
              Myrna van Lunteren
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development