diff --git a/doc/README b/doc/README
index d127f9064ca..b9bc876cfd2 100644
--- a/doc/README
+++ b/doc/README
@@ -40,7 +40,7 @@ Database
 
 streams attributes screenshot
 
-DIR="../trunk-commands/doc/"
+DIR="../doc/"
 for FILE in *.png; do convert $FILE -resize 200x200 $DIR/`basename -s .png $FILE`.jpg; done;
 
 
diff --git a/doc/gui/wxpython/example/frame.py b/doc/gui/wxpython/example/frame.py
index 7f68642de9f..adba49b842d 100644
--- a/doc/gui/wxpython/example/frame.py
+++ b/doc/gui/wxpython/example/frame.py
@@ -41,8 +41,8 @@
 from example.dialogs import ExampleMapDialog
 
 # It is possible to call grass library functions (in C) directly via ctypes
-# however this is less stable. Example is available in trunk/doc/python/, ctypes
-# are used in nviz, vdigit, iclass gui modules.
+# however this is less stable. Example is available in doc/examples/python/,
+# ctypes are used in nviz, vdigit, iclass gui modules.
 
 # from ctypes import *
 # try:
diff --git a/doc/gui/wxpython/example/toolbars.py b/doc/gui/wxpython/example/toolbars.py
index 382672fbe64..bb7f9fb5f68 100644
--- a/doc/gui/wxpython/example/toolbars.py
+++ b/doc/gui/wxpython/example/toolbars.py
@@ -43,7 +43,7 @@ def __init__(self, parent, toolSwitcher):
     def _toolbarData(self):
         """!Returns toolbar data (name, icon, handler)"""
         # BaseIcons are a set of often used icons. It is possible
-        # to reuse icons in ./trunk/gui/icons/grass or add new ones there.
+        # to reuse icons in gui/icons/grass or add new ones there.
         icons = BaseIcons
         return self._getToolbarData(
             (
diff --git a/gui/wxpython/animation/toolbars.py b/gui/wxpython/animation/toolbars.py
index 1ac3c2efedb..199bcf15aee 100644
--- a/gui/wxpython/animation/toolbars.py
+++ b/gui/wxpython/animation/toolbars.py
@@ -74,7 +74,7 @@ def __init__(self, parent):
     def _toolbarData(self):
         """Returns toolbar data (name, icon, handler)"""
         # BaseIcons are a set of often used icons. It is possible
-        # to reuse icons in ./trunk/gui/icons/grass or add new ones there.
+        # to reuse icons in gui/icons/grass or add new ones there.
         icons = ganimIcons
         return self._getToolbarData(
             (
@@ -120,7 +120,7 @@ def __init__(self, parent):
     def _toolbarData(self):
         """Returns toolbar data (name, icon, handler)"""
         # BaseIcons are a set of often used icons. It is possible
-        # to reuse icons in ./trunk/gui/icons/grass or add new ones there.
+        # to reuse icons in gui/icons/grass or add new ones there.
         icons = ganimIcons
         return self._getToolbarData(
             (
diff --git a/gui/wxpython/datacatalog/toolbars.py b/gui/wxpython/datacatalog/toolbars.py
index 03de4f350b3..c9c8e2281a9 100644
--- a/gui/wxpython/datacatalog/toolbars.py
+++ b/gui/wxpython/datacatalog/toolbars.py
@@ -112,7 +112,7 @@ def __init__(self, parent):
     def _toolbarData(self):
         """Returns toolbar data (name, icon, handler)"""
         # BaseIcons are a set of often used icons. It is possible
-        # to reuse icons in ./trunk/gui/icons/grass or add new ones there.
+        # to reuse icons in gui/icons/grass or add new ones there.
         return self._getToolbarData(
             (
                 (
diff --git a/gui/wxpython/mapswipe/toolbars.py b/gui/wxpython/mapswipe/toolbars.py
index 135a04567ae..72387d07819 100644
--- a/gui/wxpython/mapswipe/toolbars.py
+++ b/gui/wxpython/mapswipe/toolbars.py
@@ -55,7 +55,7 @@ def __init__(self, parent, toolSwitcher):
     def _toolbarData(self):
         """Returns toolbar data (name, icon, handler)"""
         # BaseIcons are a set of often used icons. It is possible
-        # to reuse icons in ./trunk/gui/icons/grass or add new ones there.
+        # to reuse icons in gui/icons/grass or add new ones there.
         icons = BaseIcons
         return self._getToolbarData(
             (