1 files changed, 10 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
index 132438ea372..abd7991d48b 100644
--- a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
+++ b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
@@ -22,7 +22,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{ryethesis}
 %<*class>
-    [2010/06/18 v1.1 Ryerson University thesis class definition]
+    [2010/06/18 v1.2 Ryerson University thesis class definition]
 %</class>
 %
 %<*driver>
@@ -39,7 +39,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{753}
+% \CheckSum{755}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -59,8 +59,10 @@
 %
 %
 % \changes{v1.0}{2009/09/30}{Initial version}
-% \changes{v1.1}{2009/09/30}{Fixed bug with previous degrees. Added
+% \changes{v1.1}{2010/06/18}{Fixed bug with previous degrees. Added
 % xcolor package earlier in file.}
+% \changes{v1.2}{2010/07/05}{Changed \\degree to \\degreeName to avoid
+% conflict with package unitsdef.}
 %
 % \GetFileInfo{ryethesis.dtx}
 %
@@ -98,9 +100,9 @@
 % Your full name as it will appear on the title and abstract page. The usage is the same as with the |book| and other classes. 
 % \begin{flushleft}|\author| \marg{Your Name}\end{flushleft}
 %
-% \DescribeMacro{\degree}
+% \DescribeMacro{\degreeName}
 % The full name of your degree (e.g.\ Doctor of Philosophy, Masters of Applied Science). Do not use abbreviations.
-% \begin{flushleft}|\degree| \marg{Full Degree Name}\end{flushleft}
+% \begin{flushleft}|\degreeName| \marg{Full Degree Name}\end{flushleft}
 %
 % \DescribeMacro{\degreeYear}
 % The year that the degree will be awarded, typically the year of convocation. 
@@ -539,7 +541,9 @@
 % \begin{macro}{degree}
 % Specify the name of the degree (e.g. ``Doctor of Philosophy'' or ``Masters of Applied Science''). This affects the content of the title and abstract page.
 %    \begin{macrocode}
-\newcommand{\degree}[1]{\gdef\ryethesis@degree{#1}}
+% Was \degree but changed to the more specific \degreeName to avoid
+% conflict with other packages
+\newcommand{\degreeName}[1]{\gdef\ryethesis@degree{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\degreeYear}