diff --git a/CODING b/CODING
index 8ce0d21bae0..6ec566ba162 100644
--- a/CODING
+++ b/CODING
@@ -204,7 +204,7 @@ example:
     1.3.3. SVN Keyword
     ==================
 
-Each source file should contain the $Id$ keyword. This will be expanded by CVS
+Each source file should contain the $Id$ keyword. This will be expanded by SVN
 to contain useful information about the file, revision, last committer, and
 date/time of last checkin.
 
@@ -215,6 +215,12 @@ top of each source file:
     /* $Id$ */
 
 
+You also need to set 
+
+svn propset svn:keywords "Id"
+
+for the new files.
+
 
   1.4. Variable Names
   ===================
@@ -873,6 +879,9 @@ one special include all tests should have:
   #include <QtTest>
 
 
+Note that we use the new style Qt4 includes - i.e. QtTest is included not
+qttest.h
+
 Beyond that you just continue implementing your class as per normal, pulling 
 in whatever headers you may need:
 
@@ -1383,6 +1392,7 @@ guidelines are followed in layout and design of GUIs.
    environment that the user is using.
 
 
+
   5. Authors
   ==========
 
@@ -1396,7 +1406,7 @@ Original pages from wiki to deprecate:
 - http://wiki.qgis.org/qgiswiki/CodingGuidelines (./)
 - http://wiki.qgis.org/qgiswiki/CodingStandards (./)
 - http://wiki.qgis.org/qgiswiki/UsingSubversion (./)
-- http://wiki.qgis.org/qgiswiki/DebuggingPlugins
+- http://www.qgis.org/wiki/How_to_debug_QGIS_Plugins
 - http://wiki.qgis.org/qgiswiki/DevelopmentInBranches (./)
 - http://wiki.qgis.org/qgiswiki/SubmittingPatchesAndSvnAccess (./)
 
diff --git a/doc/CODING.t2t b/doc/CODING.t2t
index 7b3533c8e7a..98caa5b1915 100644
--- a/doc/CODING.t2t
+++ b/doc/CODING.t2t
@@ -1272,6 +1272,7 @@ guidelines are followed in layout and design of GUIs.
    Using a button box will ensure that the order of 'OK' and 'Cancel' etc,
    buttons is consistent with the operating system / locale / desktop
    environment that the user is using.
+ +
  
 
 = Authors =
@@ -1286,7 +1287,7 @@ Original pages from wiki to deprecate:
 - http://wiki.qgis.org/qgiswiki/CodingGuidelines (./)
 - http://wiki.qgis.org/qgiswiki/CodingStandards (./)
 - http://wiki.qgis.org/qgiswiki/UsingSubversion (./)
-- http://wiki.qgis.org/qgiswiki/DebuggingPlugins
+- http://www.qgis.org/wiki/How_to_debug_QGIS_Plugins
 - http://wiki.qgis.org/qgiswiki/DevelopmentInBranches (./)
 - http://wiki.qgis.org/qgiswiki/SubmittingPatchesAndSvnAccess (./)