Skip to content

Commit 87560d9

Browse files
authored
Merge pull request #4167 from mapfish/print-v4
Use version 4 in the documentation
2 parents 08be784 + 49fb57c commit 87560d9

5 files changed

Lines changed: 12 additions & 11 deletions

File tree

docs/src/main/resources/images/Mapfish_Print_V3_Architecture.svg renamed to docs/src/main/resources/images/Mapfish_Print_V4_Architecture.svg

File renamed without changes.

docs/src/main/resources/templates/_main.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77

8-
<title>MapFish Print 3 Documentation - {{pageTitle}}</title>
8+
<title>MapFish Print 4 Documentation - {{pageTitle}}</title>
99

1010
<link rel="stylesheet" href="css/sphinx_rtd_theme.css" type="text/css" />
1111
<link rel="stylesheet" href="css/readthedocs-doc-embed.css" type="text/css" />
@@ -17,7 +17,7 @@
1717
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
1818
<div class="wy-side-scroll">
1919
<div class="wy-side-nav-search">
20-
<a href="index.html" class="icon icon-home"> MapFish Print 3</a>
20+
<a href="index.html" class="icon icon-home"> MapFish Print 4</a>
2121
</div>
2222

2323
<div
@@ -109,7 +109,7 @@
109109
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
110110
<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
111111
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
112-
<a href="index.html">MapFish Print 3</a>
112+
<a href="index.html">MapFish Print 4</a>
113113
</nav>
114114

115115
<div class="wy-nav-content">

docs/src/main/resources/templates/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="admonition note examples">
1212
<p class="first admonition-title">Getting started</p>
1313
<p class="last">
14-
A good way to get started with MapFish Print 3 is to follow the <strong>introduction workshop</strong>.
14+
A good way to get started with MapFish Print 4 is to follow the <strong>introduction workshop</strong>.
1515
Download the workshop
1616
<a target="_blank" href="https://mapfish.github.io/mapfish-print-workshop/mfp-workshop.zip" rel="noopener"
1717
>here</a
@@ -41,7 +41,7 @@
4141
<h2>Design Philosophy</h2>
4242
<p>The (much simplified) architecture of Mapfish Print is as follows:</p>
4343

44-
<img class="architecture" src="images/Mapfish_Print_V3_Architecture.svg" />
44+
<img class="architecture" src="images/Mapfish_Print_V4_Architecture.svg" />
4545

4646
<p>
4747
This diagram illustrates how a client (web-client or Java application) communicates with the Mapfish Print

jMeter/Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ You'll need:
44

55
- [jMeter](http://jmeter.apache.org/download_jmeter.cgi)
66
- Tomcat
7-
- A MapFish Print 3 WAR (for example build one with `./gradlew war`)
7+
- A MapFish Print 4 WAR (for example build one with `./gradlew war`)
88

9-
Deploy the WAR and check that MapFish Print 3 works correctly. Then start jMeter and open
9+
Deploy the WAR and check that MapFish Print 4 works correctly. Then start jMeter and open
1010
the file `jmeter-test-plan.jmx`. Make sure that the configuration in `MapFish Print Server Config`
1111
matches your setup. There are several test cases available to run. The most complete is
1212
`Create and Get Report`.

pyproject.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
2+
[project]
3+
classifiers = []
4+
dynamic = ["dependencies", "version"]
5+
16
[tool.ruff]
27
target-version = "py310"
38
line-length = 110
49

510
[tool.ruff.lint.pydocstyle]
611
convention = "numpy"
7-
8-
[project]
9-
classifiers = []
10-
dynamic = ["dependencies", "version"]

0 commit comments

Comments
 (0)