Browse files

Merge branch '2.1.x'

Conflicts:
	build.gradle
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties
  • Loading branch information...
2 parents ec0e682 + 309f34c commit 71d4fedfbe6853f5ee9d29d58527c323dd5cca51 @pledbrook pledbrook committed Aug 13, 2012
Showing with 7 additions and 4 deletions.
  1. +3 −0 build.gradle
  2. +1 −1 gradlew
  3. +1 −1 src/en/guide/commandLine/antAndMaven.gdoc
  4. +2 −2 src/en/guide/conf/dataSource/multipleDatasources.gdoc
View
3 build.gradle
@@ -113,3 +113,6 @@ artifacts {
archives dist
}
+task wrapper(type: Wrapper) {
+ gradleVersion = '1.0'
+}
View
2 gradlew
@@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
- warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
View
2 src/en/guide/commandLine/antAndMaven.gdoc
@@ -297,4 +297,4 @@ mvn grails:run-app
h4. Raising issues
-If you come across any problems with the Maven integration, please raise a [JIRA issue||http://jira.grails.org/browse/MAVEN].
+If you come across any problems with the Maven integration, please raise a [JIRA issue|http://jira.grails.org/browse/MAVEN].
View
4 src/en/guide/conf/dataSource/multipleDatasources.gdoc
@@ -167,7 +167,7 @@ You can also partition annotated Java classes into separate datasources. Classes
For example if the @Book@ class is in the default datasource, you would register that in @grails-app/conf/hibernate/hibernate.cfg.xml@:
-{code}
+{code:xml}
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE hibernate-configuration PUBLIC
'-//Hibernate/Hibernate Configuration DTD 3.0//EN'
@@ -181,7 +181,7 @@ For example if the @Book@ class is in the default datasource, you would register
and if the @Library@ class is in the "ds2" datasource, you would register that in @grails-app/conf/hibernate/ds2_hibernate.cfg.xml@:
-{code}
+{code:xml}
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE hibernate-configuration PUBLIC
'-//Hibernate/Hibernate Configuration DTD 3.0//EN'

0 comments on commit 71d4fed

Please sign in to comment.