diff --git a/wx/lib/pdfviewer/__init__.py b/wx/lib/pdfviewer/__init__.py
index 98eea7e6..67032c07 100644
--- a/wx/lib/pdfviewer/__init__.py
+++ b/wx/lib/pdfviewer/__init__.py
@@ -29,8 +29,8 @@ pyPdf can be downloaded from: https://pypi.python.org/pypi/pyPdf
 pyPDF2 home page: http://knowah.github.com/PyPDF2/
 pyPDF2 can be downloaded from: https://github.com/knowah/PyPDF2/
 
-There is an optional :class:`pdfButtonPanel` class, derived from 
-wx.lib.agw.buttonpanel, that can be placed, for example, at the top of the
+There is an optional :class:`~lib.pdfviewer.pdfButtonPanel` class, derived from 
+:class:`~lib.agw.buttonpanel`, that can be placed, for example, at the top of the
 scrolled viewer window, and which contains navigation and zoom controls.
 
 Usage
diff --git a/wx/lib/pdfviewer/buttonpanel.py b/wx/lib/pdfviewer/buttonpanel.py
index 204a65f6..919e3ee7 100644
--- a/wx/lib/pdfviewer/buttonpanel.py
+++ b/wx/lib/pdfviewer/buttonpanel.py
@@ -21,7 +21,7 @@ import wx.lib.agw.buttonpanel as bp
 
 class pdfButtonPanel(bp.ButtonPanel):
     """
-    :class:`pdfButtonPanel` is derived from wx.lib.agw.buttonpanel and provides
+    :class:`pdfButtonPanel` is derived from :class:`~lib.agw.buttonpanel` and provides
     buttons to manipulate the viewed PDF, e.g. zoom, save, print etc.
     """
     def __init__(self, parent, id, pos, size, style):
diff --git a/wx/lib/pdfviewer/dcgraphics.py b/wx/lib/pdfviewer/dcgraphics.py
index cf61d803..0c9175c1 100644
--- a/wx/lib/pdfviewer/dcgraphics.py
+++ b/wx/lib/pdfviewer/dcgraphics.py
@@ -20,11 +20,11 @@ related classes. The implementation is done using :class:`DC`
 
 Why do this?  Neither :class:`GraphicsContext` nor the Cairo-based
 GraphicsContext API provided by wx.lib.graphics can be written
-directly to a :class:`PrintDC`. It can be done via an intermediate bitmap in
-a :class:`MemoryDC` but transferring this to a :class:`PrintDC` is an order of
+directly to a :class:`PrinterDC`. It can be done via an intermediate bitmap in
+a :class:`MemoryDC` but transferring this to a :class:`PrinterDC` is an order of
 magnitude slower than writing directly.
 
-Why not just use :class:`PrintDC` directly?  There may be times when you do want
+Why not just use :class:`PrinterDC` directly?  There may be times when you do want
 to use :class:`GraphicsContext` for its displayed appearance and for its
 clean(er) API, so being able to use the same code for printing as well is nice.
 
@@ -150,7 +150,7 @@ class dcGraphicsContext(object):
         also with increasing y down.
         :class:`DC` and :class:`GraphicsContext` fonts are too big in the ratio
         of pixels per inch to points per inch. If screen rendering used Cairo,
-        printed fonts need to be scaled but if :class:`GC` was used, they are
+        printed fonts need to be scaled but if :class:`GCDC` was used, they are
         already scaled.
         
         :param `context`: ????
diff --git a/wx/lib/pdfviewer/viewer.py b/wx/lib/pdfviewer/viewer.py
index cda0d7a9..ff84b4c0 100644
--- a/wx/lib/pdfviewer/viewer.py
+++ b/wx/lib/pdfviewer/viewer.py
@@ -953,7 +953,7 @@ class pdfPrintout(wx.Printout):
     def PrintDirect(self, page):
         """
         Provide the data for page by rendering the drawing commands
-        to the printer DC using :class:`dcGraphicsContext`.
+        to the printer DC using :class:`~lib.pdfviewer.dcgraphics.dcGraphicsContext`.
         """
         pageno = page - 1       # zero based
         width = self.view.pagewidth