Merge "Bump version to 1.4.0-alpha1" into studio-1.4-dev
diff --git a/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/ElementWarningsRenderer.java b/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/ElementWarningsRenderer.java
index f06f991..e61f90e 100644
--- a/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/ElementWarningsRenderer.java
+++ b/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/ElementWarningsRenderer.java
@@ -31,9 +31,8 @@
para.appendChild(document.createTextNode(String.format("Note: This %s is ", type)));
Element link = document.createElement("ulink");
para.appendChild(link);
- link.setAttribute("url", "../userguide/feature_lifecycle.html");
link.appendChild(document.createTextNode("deprecated"));
- para.appendChild(document.createTextNode(" and will be removed in the next major version of Gradle."));
+ para.appendChild(document.createTextNode(" and will be removed in a future version of the plugin."));
}
if (elementDoc.isIncubating()) {
Document document = parent.getOwnerDocument();
@@ -44,9 +43,8 @@
para.appendChild(document.createTextNode(String.format("Note: This %s is ", type)));
Element link = document.createElement("ulink");
para.appendChild(link);
- link.setAttribute("url", "../userguide/feature_lifecycle.html");
link.appendChild(document.createTextNode("incubating"));
- para.appendChild(document.createTextNode(" and may change in a future version of Gradle."));
+ para.appendChild(document.createTextNode(" and may change in a future version of the plugin."));
}
}
}
diff --git a/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/PropertyDetailRenderer.java b/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/PropertyDetailRenderer.java
index 47737c5..6829437 100644
--- a/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/PropertyDetailRenderer.java
+++ b/src/fromGradle/groovy/org/gradle/build/docs/dsl/docbook/PropertyDetailRenderer.java
@@ -46,9 +46,9 @@
Element literal = document.createElement("literal");
title.appendChild(literal);
literal.appendChild(document.createTextNode(propertyDoc.getName()));
- if (!propertyDoc.getMetaData().isWriteable()) {
- title.appendChild(document.createTextNode(" (read-only)"));
- }
+ // if (!propertyDoc.getMetaData().isWriteable()) {
+ // title.appendChild(document.createTextNode(" (read-only)"));
+ // }
warningsRenderer.renderTo(propertyDoc, "property", section);
