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 2018/08/06 10:47:01 UTC

cayenne git commit: Cleanup docs

Repository: cayenne
Updated Branches:
  refs/heads/STABLE-4.0 f3ff55197 -> aec01f585


Cleanup docs


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/aec01f58
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/aec01f58
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/aec01f58

Branch: refs/heads/STABLE-4.0
Commit: aec01f585d53507408301592c249c3e67bc033f7
Parents: f3ff551
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 6 13:46:52 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 6 13:46:52 2018 +0300

----------------------------------------------------------------------
 .../asciidoc/_cayenne-guide/part1/setup.adoc    |   2 +-
 .../_getting-started-guide/java-classes.adoc    |   2 --
 .../src/docs/asciidoc/var.adoc                  |  15 ---------------
 .../asciidoc/images/datamap-enableclient.png    | Bin 104778 -> 98494 bytes
 4 files changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/aec01f58/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
index 5b8e28b..a990cdf 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
@@ -31,7 +31,7 @@ include::../var.adoc[]
 
 |4.0
 |Java 1.7 or newer
-|Beta
+|Stable
 
 |3.1
 |Java 1.5 or newer

http://git-wip-us.apache.org/repos/asf/cayenne/blob/aec01f58/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc
index 0177f26..f8d2edc 100644
--- a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc
+++ b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc
@@ -12,8 +12,6 @@
 //    the specific language governing permissions and limitations under the
 //    License.
 
-include::../var.adoc[]
-
 === Creating Java Classes
 Here we'll generate the Java classes from the model that was created in the previous
 section. CayenneModeler can be used to also generate the database schema, but since we

http://git-wip-us.apache.org/repos/asf/cayenne/blob/aec01f58/docs/asciidoc/getting-started-guide/src/docs/asciidoc/var.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/var.adoc b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/var.adoc
deleted file mode 100644
index f5b6f37..0000000
--- a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/var.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-:version: {project-version}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/aec01f58/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png
index 62a2af2..549759f 100644
Binary files a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png and b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png differ