You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/11/06 11:08:28 UTC
[cayenne-website] branch master updated: Move documentation link
from docs to site config
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-website.git
The following commit(s) were added to refs/heads/master by this push:
new 725e922 Move documentation link from docs to site config
725e922 is described below
commit 725e922614ee857dcb28a86a2dd83225db92d2fc
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Nov 6 14:08:21 2019 +0300
Move documentation link from docs to site config
---
src/main/site/config.yaml | 6 +++++-
src/main/site/content/docs/4.0/cayenne-guide.html | 7 +------
src/main/site/content/docs/4.0/getting-started-guide.html | 3 ---
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/site/config.yaml b/src/main/site/config.yaml
index 43dafb1..16b7a36 100644
--- a/src/main/site/config.yaml
+++ b/src/main/site/config.yaml
@@ -41,8 +41,12 @@ outputFormats:
permalinks:
news: '/:year/:month/:filename/'
-# Add link to Jira to the footer menu
menu:
+ main:
+ - name: Documentation
+ weight: 20
+ url: "/docs/4.1/getting-started-guide/"
+
footer:
- name: Bug/Feature Tracker
weight: 10
diff --git a/src/main/site/content/docs/4.0/cayenne-guide.html b/src/main/site/content/docs/4.0/cayenne-guide.html
index e259237..ed72f03 100644
--- a/src/main/site/content/docs/4.0/cayenne-guide.html
+++ b/src/main/site/content/docs/4.0/cayenne-guide.html
@@ -56,11 +56,6 @@ menu:
</thead>
<tbody>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock">4.1</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Java 1.8 or newer</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Development</p></td>
- </tr>
- <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">4.0</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Java 1.7 or newer</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Stable</p></td>
@@ -1151,7 +1146,7 @@ compileJava.dependsOn cgen</code></pre>
<tbody>
<tr>
<td class="icon"> <i class="fa fa-info-circle fa-2x" title="Note"></i> </td>
- <td class="content"> Running <code>cdbimport</code> automatically with build not always a good choice, e.g. in case of complex model that you need to alter in the Cayenne Modeler after import. </td>
+ <td class="content"> Running <code>cdbimport</code> automatically with build is not always a good choice, e.g. in case of complex model that you need to alter in the Cayenne Modeler after import. </td>
</tr>
</tbody>
</table>
diff --git a/src/main/site/content/docs/4.0/getting-started-guide.html b/src/main/site/content/docs/4.0/getting-started-guide.html
index 43a6ca4..d9c9a1d 100644
--- a/src/main/site/content/docs/4.0/getting-started-guide.html
+++ b/src/main/site/content/docs/4.0/getting-started-guide.html
@@ -26,9 +26,6 @@ menu:
weight: 5
parent: docs
name: "Getting Started (4.0)"
- main:
- name: Documentation
- weight: 20
---
<div class="sect1">
<h2 id="setting-up-the-environment"><a class="anchor" href="#setting-up-the-environment"></a>1. Setting up the environment</h2>