Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bingo1392 committed Apr 1, 2024
2 parents 7418ee2 + 668403f commit 2c21162
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:

env:
# Name of module and id separated by a slash
INSTANCE: Writerside/o
INSTANCE: Writerside/terun
# Replace HI with the ID of the instance in capital letters
ARTIFACT: webHelpO2-all.zip
# Writerside docker image version
Expand Down
12 changes: 12 additions & 0 deletions Writerside/redirection-rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,16 @@
<accepts>page.html</accepts>
</rule>
-->
<rule id="7cfab5d1">
<description>Created after removal of "Astrální zrcadlo" from Svět Térun</description>
<accepts>astralni_zrcadlo.html</accepts>
</rule>
<rule id="6045239a">
<description>Created after removal of "Licence" from Svět Térun</description>
<accepts>LICENSE.html</accepts>
</rule>
<rule id="2bea6849">
<description>Created after removal of "Térun" from Svět Térun</description>
<accepts>README.html</accepts>
</rule>
</rules>
7 changes: 2 additions & 5 deletions Writerside/hi.tree → Writerside/terun.tree
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
<!DOCTYPE instance-profile
SYSTEM "https://resources.jetbrains.com/writerside/1.0/product-profile.dtd">

<instance-profile id="hi" name="Svět Térun"
start-page="README.md">
<instance-profile id="terun" name="Svět Térun"
start-page="zakladni_konflikt.md">

<toc-element topic="README.md"/>
<toc-element toc-title="Mytologie">
<toc-element topic="zakladni_konflikt.md"/>
<toc-element topic="senanti.md"/>
Expand Down Expand Up @@ -80,6 +79,4 @@
<toc-element topic="baladorane.md"/>
</toc-element>
</toc-element>
<toc-element topic="LICENSE.md"/>
<toc-element topic="astralni_zrcadlo.md"/>
</instance-profile>
70 changes: 0 additions & 70 deletions Writerside/topics/LICENSE.md

This file was deleted.

18 changes: 0 additions & 18 deletions Writerside/topics/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions Writerside/topics/artefakty/astralni_zrcadlo.md

This file was deleted.

2 changes: 1 addition & 1 deletion Writerside/writerside.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<ihp version="2.0">
<topics dir="topics" web-path="topics"/>
<images dir="images" web-path="images"/>
<instance src="hi.tree"/>
<instance src="terun.tree"/>
</ihp>

0 comments on commit 2c21162

Please sign in to comment.