Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson
2018-08-01 12:00:03 +01:00
10 changed files with 21 additions and 26 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* Copyright 2014-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
package org.springframework.restdocs.templates;
/**
* An enumeration of the built-in formats for which templates are provuded.
* An enumeration of the built-in formats for which templates are provided.
*
* @author Andy Wilkinson
* @since 1.1.0