From: Tom Yu Date: Tue, 10 Jan 2012 17:43:23 +0000 (+0000) Subject: Pull up r25631 from trunk X-Git-Tag: krb5-1.10-beta1~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc0711fea344d9eab38d01867b78bd3bb70d00f7;p=krb5.git Pull up r25631 from trunk ------------------------------------------------------------------------ r25631 | tlyu | 2012-01-09 16:35:30 -0500 (Mon, 09 Jan 2012) | 7 lines ticket: 7065 subject: delete duplicate NOTICE file status: open Delete the duplicate NOTICE file, as it is checked into the tree and relative include paths work for sphinx. ticket: 7065 version_fixed: 1.10 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25636 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/doc/rst_source/mitK5license.rst b/doc/rst_source/mitK5license.rst index 1d61b8340..aefb019b1 100644 --- a/doc/rst_source/mitK5license.rst +++ b/doc/rst_source/mitK5license.rst @@ -2,7 +2,5 @@ MIT Kerberos License information =================================== -.. include:: NOTICE +.. include:: ../../NOTICE :literal: - -