Automatic merge of jdk:master into master

Author: duke

src/java.base/share/classes/java/nio/file/Files.java

@@ -3110,7 +3110,7 @@ public static BufferedWriter newBufferedWriter(Path path, OpenOption... options)
      * @throws  DirectoryNotEmptyException
      *          the {@code REPLACE_EXISTING} option is specified but the file
      *          cannot be replaced because it is a non-empty directory
-     *          <i>(optional specific exception)</i>     *
+     *          <i>(optional specific exception)</i>
      * @throws  UnsupportedOperationException
      *          if {@code options} contains a copy option that is not supported
      * @throws  SecurityException

src/java.base/share/classes/java/nio/file/Path.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -911,7 +911,7 @@ default WatchKey register(WatchService watcher,
      * {@code getName(index)}, where {@code index} ranges from zero to
      * {@code getNameCount() - 1}, inclusive.
      *
-     * @return  an iterator over the name elements of this path.
+     * @return  an iterator over the name elements of this path
      */
     @Override
     default Iterator<Path> iterator() {