Changeset 69d280f


Ignore:
Timestamp:
08/22/2021 03:45:22 AM (9 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
0fd35e0
Parents:
fd6a5f8 (diff), df732b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Automatic merge of trunk into multilib

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rfd6a5f8 r69d280f  
    6060        $(Q)mkdir -p $(BASEDIR)/stylesheets
    6161        $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
     62        $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
    6263
    6364        $(Q)mkdir -p $(BASEDIR)/images
  • chapter07/cleanup.xml

    rfd6a5f8 r69d280f  
    8787      chapters, it often turns out that removing everything and starting over
    8888      (more carefully) is the best option to recover. Unfortunately, all the
    89       the temporary files will be removed, too. To avoid spending extra time to
     89      temporary files will be removed, too. To avoid spending extra time to
    9090      redo something which has been built successfully, prepare a backup.
    9191    </para>
Note: See TracChangeset for help on using the changeset viewer.