You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/03/08 00:01:48 UTC
[2/2] isis git commit: ISIS-1594: edit button for docs.
ISIS-1594: edit button for docs.
Also: removal of pass:[<br/><br/>] for spacing (using CSS instead)
Also: removal of github fork banner - breaks mobile web site
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cf84ab17
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf84ab17
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf84ab17
Branch: refs/heads/master
Commit: cf84ab1788071b31d5748e7451465fa33527dc8c
Parents: c531f7e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Mar 8 00:01:38 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Mar 8 00:01:38 2017 +0000
----------------------------------------------------------------------
adocs/documentation/monitor.sh | 2 +-
adocs/documentation/pom-pdf.xml | 228 ++++++++
adocs/documentation/pom.xml | 71 +--
adocs/documentation/pom.xml.new | 572 +++++++++++++++++++
adocs/documentation/publish.sh | 4 +-
.../asciidoc/articles-and-presentations.adoc | 2 -
adocs/documentation/src/main/asciidoc/asf.adoc | 2 -
.../documentation/src/main/asciidoc/books.adoc | 14 +-
.../src/main/asciidoc/cheat-sheet.adoc | 2 -
.../src/main/asciidoc/common-use-cases.adoc | 3 -
.../src/main/asciidoc/documentation.adoc | 1 -
.../asciidoc/downloadable-presentations.adoc | 4 +-
.../src/main/asciidoc/downloads.adoc | 32 +-
adocs/documentation/src/main/asciidoc/help.adoc | 1 -
.../src/main/asciidoc/how-isis-works.adoc | 2 -
.../documentation/src/main/asciidoc/icons.adoc | 6 +-
.../src/main/asciidoc/isis-in-pictures.adoc | 127 ++--
.../src/main/asciidoc/migration-notes.adoc | 3 +
.../src/main/asciidoc/more-thanks.adoc | 3 -
.../src/main/asciidoc/powered-by.adoc | 3 -
.../src/main/asciidoc/screencasts-older.adoc | 5 +-
.../src/main/asciidoc/screencasts.adoc | 12 +-
adocs/template/document.html.erb | 13 +-
23 files changed, 956 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/monitor.sh
----------------------------------------------------------------------
diff --git a/adocs/documentation/monitor.sh b/adocs/documentation/monitor.sh
index 69437a8..fc587f5 100644
--- a/adocs/documentation/monitor.sh
+++ b/adocs/documentation/monitor.sh
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
-mvn compile -Dskip.pdf -o && ruby monitor.rb -b
+mvn compile -o && ruby monitor.rb -b
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/pom-pdf.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/pom-pdf.xml b/adocs/documentation/pom-pdf.xml
new file mode 100644
index 0000000..ba19d35
--- /dev/null
+++ b/adocs/documentation/pom-pdf.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+ 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.
+-->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ Heavily adapted from deltaspike's Asciidoctor website; many thanks!
+ -->
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.apache.isis.docs</groupId>
+ <artifactId>isis-documentation-pdf</artifactId>
+ <version>1.14.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Isis Docs</name>
+ <description>
+ Apache Isis Website and Documentation, written using Asciidoctor
+ </description>
+ <url>http://isis.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <asciidoctor.maven.plugin.version>1.5.3</asciidoctor.maven.plugin.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4</asciidoctorj.version>
+ <asciidoctorj.diagram.version>1.5.0</asciidoctorj.diagram.version>
+ <incode-asciidoctor-extension-monotree.version>0.0.2</incode-asciidoctor-extension-monotree.version>
+ <jruby.version>1.7.21</jruby.version>
+
+ <svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
+
+ <build.dir>${project.basedir}/target/site</build.dir>
+
+ <isis-site.dir>../../../isis-site/content</isis-site.dir>
+ <redirects.dir>../redirects/content</redirects.dir>
+ <message>updating content (built from adocs/documentation in isis.git repo)</message>
+ </properties>
+
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/isis.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>rubygems-proxy-releases</id>
+ <name>RubyGems.org Proxy (Releases)</name>
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <version>1.0.5</version>
+ <configuration>
+ <!-- align JRuby version with AsciidoctorJ to avoid redundant downloading -->
+ <jrubyVersion>${jruby.version}</jrubyVersion>
+ <gemHome>${project.build.directory}/gems</gemHome>
+ <gemPath>${project.build.directory}/gems</gemPath>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>initialize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <version>${asciidoctor.maven.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-pdf</artifactId>
+ <version>${asciidoctorj.pdf.version}</version>
+ </dependency>
+ <!-- Comment this section to use the default jruby artifact provided by the plugin -->
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby.version}</version>
+ </dependency>
+ <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ <version>${asciidoctorj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-diagram</artifactId>
+ <version>${asciidoctorj.diagram.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.incode.asciidoctor.monotree</groupId>
+ <artifactId>incode-asciidoctor-extension-monotree</artifactId>
+ <version>${incode-asciidoctor-extension-monotree.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <!-- If you set baseDir to ${project.basedir}, top-level includes are resolved relative to the project root -->
+ <!--
+ <baseDir>${project.basedir}</baseDir>
+ -->
+ <!-- Attributes common to all output formats -->
+ <attributes>
+ <endpoint-url>http://isis.apache.org</endpoint-url>
+ <sourcedir>${project.build.sourceDirectory}</sourcedir>
+ <project-version>${project.version}</project-version>
+ </attributes>
+ <requires>
+ <require>asciidoctor-diagram</require>
+ </requires>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor-diagram</artifactId>
+ <version>1.2.1</version>
+ <type>gem</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <property>
+ <name>!skip.pdf</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-pdf-doc</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <backend>pdf</backend>
+
+ <sourceDirectory>src/main/asciidoc/guides</sourceDirectory>
+ <outputDirectory>${project.reporting.outputDirectory}/guides</outputDirectory>
+
+ <sourceHighlighter>coderay</sourceHighlighter>
+ <preserveDirectories>true</preserveDirectories>
+ <relativeBaseDir>true</relativeBaseDir>
+ <doctype>book</doctype>
+
+ <attributes>
+ <sourcedir>${project.build.sourceDirectory}</sourcedir>
+ <imagesdir/>
+
+ <icons>font</icons>
+ <pagenums/>
+ <toc/>
+ <idprefix/>
+ <idseparator>-</idseparator>
+ </attributes>
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/pom.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index 6bb07d8..8cc1978 100644
--- a/adocs/documentation/pom.xml
+++ b/adocs/documentation/pom.xml
@@ -47,10 +47,13 @@
<asciidoctor.maven.plugin.version>1.5.3</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
- <asciidoctorj.version>1.5.4</asciidoctorj.version>
+ <asciidoctorj.version>1.5.4.1</asciidoctorj.version>
<asciidoctorj.diagram.version>1.5.0</asciidoctorj.diagram.version>
<incode-asciidoctor-extension-monotree.version>0.0.2</incode-asciidoctor-extension-monotree.version>
- <jruby.version>1.7.21</jruby.version>
+ <incode-asciidoctor-extension-improvethisdoc.version>0.0.2-SNAPSHOT</incode-asciidoctor-extension-improvethisdoc.version>
+
+ <jruby.version>9.1.8.0</jruby.version>
+ <!--<jruby.version>1.7.21</jruby.version>-->
<svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
@@ -108,11 +111,6 @@
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
<dependencies>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>${asciidoctorj.pdf.version}</version>
- </dependency>
<!-- Comment this section to use the default jruby artifact provided by the plugin -->
<dependency>
<groupId>org.jruby</groupId>
@@ -135,6 +133,11 @@
<artifactId>incode-asciidoctor-extension-monotree</artifactId>
<version>${incode-asciidoctor-extension-monotree.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.incode.asciidoctor.improvethisdoc</groupId>
+ <artifactId>incode-asciidoctor-extension-improvethisdoc</artifactId>
+ <version>${incode-asciidoctor-extension-improvethisdoc.version}</version>
+ </dependency>
</dependencies>
<configuration>
<!-- If you set baseDir to ${project.basedir}, top-level includes are resolved relative to the project root -->
@@ -213,55 +216,14 @@
<toc>right</toc>
<icons>font</icons>
- </attributes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>pdf</id>
- <activation>
- <property>
- <name>!skip.pdf</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-pdf-doc</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>pdf</backend>
-
- <sourceDirectory>src/main/asciidoc/guides</sourceDirectory>
- <outputDirectory>${project.reporting.outputDirectory}/guides</outputDirectory>
- <sourceHighlighter>rouge</sourceHighlighter>
- <preserveDirectories>true</preserveDirectories>
- <relativeBaseDir>true</relativeBaseDir>
- <doctype>book</doctype>
-
- <attributes>
- <sourcedir>${project.build.sourceDirectory}</sourcedir>
- <imagesdir/>
-
- <icons>font</icons>
- <pagenums/>
- <toc/>
- <idprefix/>
- <idseparator>-</idseparator>
+ <improvethisdoc.rootDir>/adocs/documentation</improvethisdoc.rootDir>
+ <improvethisdoc.srcDir>/src/main/asciidoc</improvethisdoc.srcDir>
+ <improvethisdoc.organisation>apache</improvethisdoc.organisation>
+ <improvethisdoc.repo>isis</improvethisdoc.repo>
+ <improvethisdoc.branch>master</improvethisdoc.branch>
+ <improvethisdoc.label>Edit</improvethisdoc.label>
</attributes>
-
</configuration>
</execution>
</executions>
@@ -270,6 +232,7 @@
</build>
</profile>
+
<profile>
<id>delete</id>
<activation>
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/pom.xml.new
----------------------------------------------------------------------
diff --git a/adocs/documentation/pom.xml.new b/adocs/documentation/pom.xml.new
new file mode 100644
index 0000000..44924f0
--- /dev/null
+++ b/adocs/documentation/pom.xml.new
@@ -0,0 +1,572 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+ 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.
+-->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ Heavily adapted from deltaspike's Asciidoctor website; many thanks!
+ -->
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.apache.isis.docs</groupId>
+ <artifactId>isis-documentation</artifactId>
+ <version>1.14.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Isis Docs</name>
+ <description>
+ Apache Isis Website and Documentation, written using Asciidoctor
+ </description>
+ <url>http://isis.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <asciidoctor.maven.plugin.version>1.5.3</asciidoctor.maven.plugin.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4.1</asciidoctorj.version>
+ <asciidoctorj.diagram.version>1.5.0</asciidoctorj.diagram.version>
+ <incode-asciidoctor-extension-monotree.version>0.0.2</incode-asciidoctor-extension-monotree.version>
+ <incode-asciidoctor-extension-improvethisdoc.version>0.0.2-SNAPSHOT</incode-asciidoctor-extension-improvethisdoc.version>
+
+ <jruby.version>9.1.8.0</jruby.version>
+ <!--<jruby.version>1.7.21</jruby.version>-->
+
+ <svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
+
+ <build.dir>${project.basedir}/target/site</build.dir>
+
+ <isis-site.dir>../../../isis-site/content</isis-site.dir>
+ <redirects.dir>../redirects/content</redirects.dir>
+ <message>updating content (built from adocs/documentation in isis.git repo)</message>
+ </properties>
+
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/isis.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>rubygems-proxy-releases</id>
+ <name>RubyGems.org Proxy (Releases)</name>
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <version>1.0.5</version>
+ <configuration>
+ <!-- align JRuby version with AsciidoctorJ to avoid redundant downloading -->
+ <jrubyVersion>${jruby.version}</jrubyVersion>
+ <gemHome>${project.build.directory}/gems</gemHome>
+ <gemPath>${project.build.directory}/gems</gemPath>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>initialize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <version>${asciidoctor.maven.plugin.version}</version>
+ <configuration>
+ <!-- If you set baseDir to ${project.basedir}, top-level includes are resolved relative to the project root -->
+ <!--
+ <baseDir>${project.basedir}</baseDir>
+ -->
+ <!-- Attributes common to all output formats -->
+ <attributes>
+ <endpoint-url>http://isis.apache.org</endpoint-url>
+ <sourcedir>${project.build.sourceDirectory}</sourcedir>
+ <project-version>${project.version}</project-version>
+ </attributes>
+ <requires>
+ <require>asciidoctor-diagram</require>
+ </requires>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor-diagram</artifactId>
+ <version>1.2.1</version>
+ <type>gem</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>html</id>
+ <activation>
+ <property>
+ <name>!skip.html</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <dependencies>
+ <!-- Comment this section to use the default jruby artifact provided by the plugin -->
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby.version}</version>
+ </dependency>
+ <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ <version>${asciidoctorj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-diagram</artifactId>
+ <version>${asciidoctorj.diagram.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.incode.asciidoctor.monotree</groupId>
+ <artifactId>incode-asciidoctor-extension-monotree</artifactId>
+ <version>${incode-asciidoctor-extension-monotree.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.incode.asciidoctor.improvethisdoc</groupId>
+ <artifactId>incode-asciidoctor-extension-improvethisdoc</artifactId>
+ <version>${incode-asciidoctor-extension-improvethisdoc.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>output-html</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <backend>html5</backend>
+
+ <sourceDirectory>src/main/asciidoc</sourceDirectory>
+ <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+
+ <!-- The gem-maven-plugin appends the scope (e.g., provided) to the gemPath defined in the plugin configuration -->
+ <gemPath>${project.build.directory}/gems-provided</gemPath>
+
+ <sourceHighlighter>coderay</sourceHighlighter>
+ <templateDir>../template</templateDir>
+ <eruby>erb</eruby>
+ <preserveDirectories>true</preserveDirectories>
+ <relativeBaseDir>true</relativeBaseDir>
+
+ <attributes>
+ <sourcedir>${project.build.sourceDirectory}</sourcedir>
+ <imagesdir/>
+
+ <toc>right</toc>
+ <icons>font</icons>
+
+ <improvethisdoc.rootDir>/adocs/documentation</improvethisdoc.rootDir>
+ <improvethisdoc.srcDir>/src/main/asciidoc</improvethisdoc.srcDir>
+ <improvethisdoc.organisation>apache</improvethisdoc.organisation>
+ <improvethisdoc.repo>isis</improvethisdoc.repo>
+ <improvethisdoc.branch>master</improvethisdoc.branch>
+ <improvethisdoc.label>Edit</improvethisdoc.label>
+
+ </attributes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <property>
+ <name>!skip.pdf</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-pdf</artifactId>
+ <version>${asciidoctorj.pdf.version}</version>
+ </dependency>
+ <!-- Comment this section to use the default jruby artifact provided by the plugin -->
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby.version}</version>
+ </dependency>
+ <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ <version>${asciidoctorj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-diagram</artifactId>
+ <version>${asciidoctorj.diagram.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.incode.asciidoctor.monotree</groupId>
+ <artifactId>incode-asciidoctor-extension-monotree</artifactId>
+ <version>${incode-asciidoctor-extension-monotree.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>generate-pdf-doc</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <backend>pdf</backend>
+
+ <sourceDirectory>src/main/asciidoc/guides</sourceDirectory>
+ <outputDirectory>${project.reporting.outputDirectory}/guides</outputDirectory>
+
+ <sourceHighlighter>coderay</sourceHighlighter>
+ <preserveDirectories>true</preserveDirectories>
+ <relativeBaseDir>true</relativeBaseDir>
+ <doctype>book</doctype>
+
+ <attributes>
+ <sourcedir>${project.build.sourceDirectory}</sourcedir>
+ <imagesdir/>
+
+ <icons>font</icons>
+ <pagenums/>
+ <toc/>
+ <idprefix/>
+ <idseparator>-</idseparator>
+ </attributes>
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>delete</id>
+ <activation>
+ <property>
+ <name>!skip.delete</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <configuration>
+ <target>
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="deleting everything in ${isis-site.dir}"/>
+ <echo message=""/>
+ <delete includeemptydirs="true">
+ <fileset dir="${isis-site.dir}" includes="**/*"/>
+ </delete>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>copy</id>
+ <activation>
+ <property>
+ <name>!skip.copy</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="copying from ${redirects.dir} to ${isis-site.dir}"/>
+ <echo message=""/>
+ <copy todir="${isis-site.dir}">
+ <fileset dir="${redirects.dir}"/>
+ </copy>
+
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="copying from ${build.dir} to ${isis-site.dir}"/>
+ <echo message=""/>
+ <copy todir="${isis-site.dir}" overwrite="true" force="true">
+ <fileset dir="${build.dir}"/>
+ </copy>
+
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="converting CRLF to LF for all text files under ${isis-site.dir}"/>
+
+ <echo message="... .html files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.html"
+ eol="lf"
+ eof="remove"
+ fixlast="true"/>
+
+ <echo message="... .xml files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.xml"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+
+ <echo message="... .xsd files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.xsd"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <echo message="... .css files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.css"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <echo message="... .svg files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.svg"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <echo message="... .less files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.less"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <echo message="... .scss files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.scss"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <echo message="... .js files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.js"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <echo message="... .sh files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.sh"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <echo message="... .rdf files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.rdf"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <!-- for these files, encoding seems to go from UTF8 to ASCII when
+ apply fixcrlf, so just copy over again... -->
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="copying over slick CSS and SCSS from ${build.dir} to ${isis-site.dir}"/>
+ <echo message=""/>
+ <copy todir="${isis-site.dir}" overwrite="true" force="true">
+ <fileset dir="${build.dir}" includes="**/css/slick/**/*"/>
+ </copy>
+
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>commit</id>
+ <activation>
+ <property>
+ <name>!skip.commit</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def siteDir = new File("${isis-site.dir}", "..")
+
+ "git add content --all".execute(null, siteDir).in.text
+ "git reset content/guides".execute(null, siteDir).in.text
+
+ def gitStatusOutput = "git status --porcelain".execute(null, siteDir).in.text
+
+ def lines = gitStatusOutput.readLines()
+ lines.each{ line ->
+ def file=line.drop(3)
+ if(file.endsWith(".html")) {
+ def pdfFile = file.replaceAll(".html",".pdf")
+ "git add $file".execute(null, siteDir).in.text
+ "git add $pdfFile".execute(null, siteDir).in.text
+ }
+ }
+
+ // the commit doesn't seem to do anything; so instead using antrun plugin below to complete.
+ // "git commit --message '${message}'".execute(null, siteDir).text
+ // "git reset --hard".execute(null, siteDir).in.text
+
+ return null
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <target>
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="git commit -m '${message}' "/>
+ <echo message=""/>
+ <exec executable="git" dir="${isis-site.dir}">
+ <arg value="commit"/>
+ <arg value="-m"/>
+ <arg value="${message}"/>
+ </exec>
+
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="git reset --hard"/>
+ <echo message=""/>
+ <exec executable="git" dir="${isis-site.dir}">
+ <arg value="reset"/>
+ <arg value="--hard"/>
+ </exec>
+ <echo message=""/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/publish.sh
----------------------------------------------------------------------
diff --git a/adocs/documentation/publish.sh b/adocs/documentation/publish.sh
index 1cfb9b3..62970ed 100644
--- a/adocs/documentation/publish.sh
+++ b/adocs/documentation/publish.sh
@@ -5,4 +5,6 @@ else
MSG=$1
fi
echo $MSG
-mvn clean install -D message="$MSG"
+mvn clean
+mvn install -f pom-pdf.xml -D message="$MSG"
+mvn install -D message="$MSG"
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/articles-and-presentations.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/articles-and-presentations.adoc b/adocs/documentation/src/main/asciidoc/articles-and-presentations.adoc
index e0a906f..d243f22 100644
--- a/adocs/documentation/src/main/asciidoc/articles-and-presentations.adoc
+++ b/adocs/documentation/src/main/asciidoc/articles-and-presentations.adoc
@@ -6,8 +6,6 @@
:toc: right
-pass:[<br/><br/>]
-
Some articles and recorded material relating to either Apache Isis (or its predecessor, the Naked Objects framework), or its 'sister' open source project on the .NET platform, Naked Objects .NET. We've *highlighted* some of the better ones\u2026
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/asf.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/asf.adoc b/adocs/documentation/src/main/asciidoc/asf.adoc
index dea9f17..4666c8b 100644
--- a/adocs/documentation/src/main/asciidoc/asf.adoc
+++ b/adocs/documentation/src/main/asciidoc/asf.adoc
@@ -6,8 +6,6 @@
:toc: right
-pass:[<br/><br/><br/>]
-
Apache Software Foundation:
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/books.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/books.adoc b/adocs/documentation/src/main/asciidoc/books.adoc
index 143b120..1e61678 100644
--- a/adocs/documentation/src/main/asciidoc/books.adoc
+++ b/adocs/documentation/src/main/asciidoc/books.adoc
@@ -6,9 +6,8 @@
:toc: right
-pass:[<br/><br/>]
-
-Although it has evolved since, the _Apache Isis_ framework started out as an open source implementation of the naked objects pattern. Indeed, the generic user interfaces provided by Apache Isis link:../../components/viewers/wicket/about.html[Wicket] viewer and the link:../../components/viewers/restfulobjects/about.html[Restful Objects] viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings.
+Although it has evolved since, the _Apache Isis_ framework started out as an open source implementation of the naked objects pattern.
+Indeed, the generic user interfaces provided by Apache Isis link:../../components/viewers/wicket/about.html[Wicket] viewer and the link:../../components/viewers/restfulobjects/about.html[Restful Objects] viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings.
If the idea of naked objects is of interest, then there are a couple of books on the topic that you might want to read.
@@ -21,7 +20,8 @@ Richard Pawson and Robert Matthews, Wiley 2002
image::{_imagesdir}/books/nakedobjects-book.jpg[width="159px",link="{_imagesdir}/books/nakedobjects-book.jpg"]
-This book describes the original ideas of Naked Objects. Although based on a very early version of the framework, it's still definitely worth a read (and beautifully produced).
+This book describes the original ideas of Naked Objects.
+Although based on a very early version of the framework, it's still definitely worth a read (and beautifully produced).
Amazon quotes: (avg 5 stars)
@@ -40,7 +40,8 @@ Dan Haywood, Pragmatic Bookshelf 2009
image::{_imagesdir}/books/dhnako.jpg[width="167px",link="{_imagesdir}/books/dhnako.jpg"]
-This more recent book draws the parallel between domain-driven design and Naked Objects (4.0). In the spirit of the Pragmatic Bookshelf, it's a practical, hands-on sort of book, building up a case study as it goes and encouraging you to build your own app as you go.
+This more recent book draws the parallel between domain-driven design and Naked Objects (4.0).
+In the spirit of the Pragmatic Bookshelf, it's a practical, hands-on sort of book, building up a case study as it goes and encouraging you to build your own app as you go.
Amazon quotes: (avg 4.5 stars)
@@ -61,4 +62,5 @@ Dan Haywood
The http://restfulobjects.org[Restful Objects specification] defines a set of RESTful resources, and corresponding JSON representations, for accessing and manipulating a domain object model.
-This is a comprehensive specification, running to over 200 pages in length. It is implemented by Apache Isis' link:../../components/viewers/restfulobjects/about.html[Restful Objects] viewer, and is also implemented by another (non-Apache) open source project, http://nakedobjects.codeplex.com[Naked Objects MVC].
+This is a comprehensive specification, running to over 200 pages in length.
+It is implemented by Apache Isis' link:../../components/viewers/restfulobjects/about.html[Restful Objects] viewer, and is also implemented by another (non-Apache) open source project, http://nakedobjects.codeplex.com[Naked Objects MVC].
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/cheat-sheet.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/cheat-sheet.adoc b/adocs/documentation/src/main/asciidoc/cheat-sheet.adoc
index 5f7f192..2b92080 100644
--- a/adocs/documentation/src/main/asciidoc/cheat-sheet.adoc
+++ b/adocs/documentation/src/main/asciidoc/cheat-sheet.adoc
@@ -6,8 +6,6 @@
:toc: right
-pass:[<br/><br/>]
-
This "one-pager" cheat sheet summarises the main programming conventions to follow when writing an Apache Isis application.
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/common-use-cases.adoc b/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
index 6e32b6d..7332107 100644
--- a/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
+++ b/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
@@ -6,9 +6,6 @@
:toc: right
-pass:[<br/><br/>]
-
-
== Prototyping
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index f42b35a..c93c7f0 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -5,7 +5,6 @@
:_imagesdir: images/
:toc: right
-pass:[<br/><br/><br/>]
pass:[<div class="extended-quote-first"><p>]Perfection is finally attained not when there is no longer anything to add but when there is no longer anything to take away.
pass:[</p></div>]
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/downloadable-presentations.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/downloadable-presentations.adoc b/adocs/documentation/src/main/asciidoc/downloadable-presentations.adoc
index 207f3f6..ac9a00e 100644
--- a/adocs/documentation/src/main/asciidoc/downloadable-presentations.adoc
+++ b/adocs/documentation/src/main/asciidoc/downloadable-presentations.adoc
@@ -7,8 +7,6 @@
-pass:[<br/><br/>]
-
The following presentation, available in multiple formats, provides some background on Apache Isis:
@@ -17,7 +15,7 @@ The following presentation, available in multiple formats, provides some backgro
[WARNING]
====
-Our apologies, this presentation is somewhat out-of-date...
+This presentation is somewhat out-of-date...
====
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/downloads.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/downloads.adoc b/adocs/documentation/src/main/asciidoc/downloads.adoc
index 2e4988f..40a9feb 100644
--- a/adocs/documentation/src/main/asciidoc/downloads.adoc
+++ b/adocs/documentation/src/main/asciidoc/downloads.adoc
@@ -6,16 +6,16 @@
:toc: right
-pass:[<br/><br/><br/>]
-
-Apache Isis™ software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or RESTful API. Use for prototyping or production.
+Apache Isis™ software is a framework for rapidly developing domain-driven apps in Java.
+Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or RESTful API. Use for prototyping or production.
== Getting Started
-If you just want to get going quickly, we suggest using our Maven archetype. For more information, see xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype][here].
+If you just want to get going quickly, we suggest using our Maven archetype.
+For more information, see xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype][here].
@@ -36,9 +36,11 @@ Archetypes:
== Verifying Releases
-It is essential that you verify the integrity of any downloaded files using the PGP or MD5 signatures. For more information on signing artifacts and why we do it, check out the http://www.apache.org/dev/release-signing.html[Release Signing FAQ].
+It is essential that you verify the integrity of any downloaded files using the PGP or MD5 signatures.
+For more information on signing artifacts and why we do it, check out the http://www.apache.org/dev/release-signing.html[Release Signing FAQ].
-The PGP signatures can be verified using PGP or GPG. First download the http://www.apache.org/dist/isis/KEYS[KEYS] as well as the asc signature file for the artifact. Make sure you get these files from the http://www.apache.org/dist/isis/[main distribution directory], rather than from a mirror.
+The PGP signatures can be verified using PGP or GPG. First download the http://www.apache.org/dist/isis/KEYS[KEYS] as well as the asc signature file for the artifact.
+Make sure you get these files from the http://www.apache.org/dist/isis/[main distribution directory], rather than from a mirror.
Then verify the signatures using a command such as:
@@ -67,7 +69,10 @@ gpg \u2013verify isis-1.13.2-source-release.zip.asc
-Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called `md5` or `md5sum` is included in most distributions. It is also available as part of http://www.gnu.org/software/textutils/textutils.html[GNU Textutils]. Windows users can get binary md5 programs from these (and likely other) places:
+Alternatively, you can verify the MD5 signature on the files.
+A Unix/Linux program called `md5` or `md5sum` is included in most distributions.
+It is also available as part of http://www.gnu.org/software/textutils/textutils.html[GNU Textutils].
+Windows users can get binary md5 programs from these (and likely other) places:
* http://www.md5summer.org/[http://www.md5summer.org/]
* http://www.fourmilab.ch/md5/[http://www.fourmilab.ch/md5/]
@@ -93,7 +98,8 @@ git clone http://git.apache.org/isis.git
----
-The code is also mirrored on http://github.com/apache/isis[github], where you can browse it or fork it. And if you're interested in contributing back to Apache Isis, see link:contributors/contributing.html[here].
+The code is also mirrored on http://github.com/apache/isis[github], where you can browse it or fork it.
+And if you're interested in contributing back to Apache Isis, see link:contributors/contributing.html[here].
@@ -112,6 +118,12 @@ You can browse the repo https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis
-== Isis add-ons
+== Isis add-ons & Incode Catalog
+
+There are also a number of (open source, but not ASF) supporting modules and extensions for you to use:
+
+* the link:http://www.isisaddons.org/[Isis Add-ons] provide technical extensions, such as security, commands, auditing and feature toggles
+
+* the link:http://catalog.incode.org[Incode Catalog] provides business modules, such as documents, notes and communications.
-There are also a number of (open source, but not ASF) supporting modules and extensions for you to use; see link:http://www.isisaddons.org/[Isis Add-ons].
+Each module is in a separate github repo, with a demo app to illustrate the module's functionality.
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/help.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/help.adoc b/adocs/documentation/src/main/asciidoc/help.adoc
index 4dbb434..44f2e07 100644
--- a/adocs/documentation/src/main/asciidoc/help.adoc
+++ b/adocs/documentation/src/main/asciidoc/help.adoc
@@ -6,7 +6,6 @@
:toc: right
-pass:[<br/><br/><br/>]
== Help:
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/how-isis-works.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/how-isis-works.adoc b/adocs/documentation/src/main/asciidoc/how-isis-works.adoc
index 3b64575..2ea16e5 100644
--- a/adocs/documentation/src/main/asciidoc/how-isis-works.adoc
+++ b/adocs/documentation/src/main/asciidoc/how-isis-works.adoc
@@ -6,8 +6,6 @@
:toc: right
-pass:[<br/><br/>]
-
This screencast explains how Apache Isis builds a webapp from the underlying domain object model...
http://git-wip-us.apache.org/repos/asf/isis/blob/cf84ab17/adocs/documentation/src/main/asciidoc/icons.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/icons.adoc b/adocs/documentation/src/main/asciidoc/icons.adoc
index 27ce10d..9697a0b 100644
--- a/adocs/documentation/src/main/asciidoc/icons.adoc
+++ b/adocs/documentation/src/main/asciidoc/icons.adoc
@@ -7,10 +7,10 @@
-pass:[<br/><br/>]
-
-Most Apache Isis viewers use icons to help identify domain objects in the user interface. It's a good idea to ensure that these are styled consistently. Here are some open source icon sets for both personal and commercial use (though some require a link back to the authors website):
+Most Apache Isis viewers use icons to help identify domain objects in the user interface.
+It's a good idea to ensure that these are styled consistently.
+Here are some open source icon sets for both personal and commercial use (though some require a link back to the authors website):
* http://icons8.com/[icons8] (as used in the link:../powered-by/powered-by.html[Estatio] app) - styled for Win8, Android and MacOS
* http://tango.freedesktop.org/Tango_Icon_Library[tango desktop] icon set - as used in Linux GNOME and KDE desktops