summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2014-02-26 15:20:53 +0100
committerThomas Schwinge <thomas@codesourcery.com>2014-02-26 15:20:53 +0100
commit93060a3967ef66873d6246b0b1228c57aed2d9e4 (patch)
tree0dda55d9eaa0fdf687acc80ac2329bdf42c6a652 /user
parentca63bd2d33b3d28eabd50ad58577b52a1fc9eba0 (diff)
parentc4ad3f73033c7e0511c3e7df961e1232cc503478 (diff)
Merge remote-tracking branch 'feldtkeller.SCHWINGE/master'
Conflicts: news/2011-q2.mdwn open_issues/glibc.mdwn open_issues/versioning.mdwn
Diffstat (limited to 'user')
-rw-r--r--user/jkoenig/java.mdwn5
1 files changed, 3 insertions, 2 deletions
diff --git a/user/jkoenig/java.mdwn b/user/jkoenig/java.mdwn
index 73982239..ebfa45a4 100644
--- a/user/jkoenig/java.mdwn
+++ b/user/jkoenig/java.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2011, 2013 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2011, 2013, 2014 Free Software Foundation,
+Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -402,7 +403,7 @@ than some huge patchset). Send patches to <distro-pkg-dev@openjdk.java.net>.
< jkoenig> there's a bug with java.nio when running javadoc, you might
run into it.
- * [[`SCM_CREDENTIALS`|open_issues/sendmsg/scm_creds]]
+ * [[`SCM_CREDENTIALS`|open_issues/sendmsg_scm_creds]]
IRC, freenode, #hurd, 2011-08-03: