diff --git a/lib/redmine/core_ext/string.rb b/lib/redmine/core_ext/string.rb
index 2da5ffef9..5d03b9b5c 100644
--- a/lib/redmine/core_ext/string.rb
+++ b/lib/redmine/core_ext/string.rb
@@ -1,7 +1,8 @@
 require File.dirname(__FILE__) + '/string/conversions'
 require File.dirname(__FILE__) + '/string/inflections'
 
-class String #:nodoc:
+# @private
+class String
   include Redmine::CoreExtensions::String::Conversions
   include Redmine::CoreExtensions::String::Inflections
 end
diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb
index fbac0de7b..4fc571167 100644
--- a/lib/redmine/core_ext/string/conversions.rb
+++ b/lib/redmine/core_ext/string/conversions.rb
@@ -15,10 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-module Redmine #:nodoc:
-  module CoreExtensions #:nodoc:
-    module String #:nodoc:
+module Redmine
+  # @private
+  module CoreExtensions
+    # @private
+    module String
       # Custom string conversions
+      # @private
       module Conversions
         # Parses hours format and returns a float
         def to_hours
diff --git a/lib/redmine/core_ext/string/inflections.rb b/lib/redmine/core_ext/string/inflections.rb
index 2dd5a1fe5..efb62ee8e 100644
--- a/lib/redmine/core_ext/string/inflections.rb
+++ b/lib/redmine/core_ext/string/inflections.rb
@@ -15,10 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-module Redmine #:nodoc:
-  module CoreExtensions #:nodoc:
-    module String #:nodoc:
+module Redmine
+  # @private
+  module CoreExtensions
+    # @private
+    module String
       # Custom string inflections
+      # @private
       module Inflections
         def with_leading_slash
           starts_with?('/') ? self : "/#{ self }"
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index c0b1f3148..e926e667f 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -32,8 +32,8 @@ module Redmine
         IssueRelation::TYPE_PRECEDES => { :landscape_margin => 20, :color => '#628FEA' }
       }.freeze
 
-      # :nodoc:
       # Some utility methods for the PDF export
+      # @private
       class PDF
         MaxCharactorsForSubject = 45
         TotalWidth = 280
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index fb34e70c5..dcdd0fa23 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -17,7 +17,8 @@
 
 module Redmine
   module MenuManager
-    class MenuError < StandardError #:nodoc:
+    # @private
+    class MenuError < StandardError
     end
 
     module MenuController
diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
index 7f058a31d..d65668447 100644
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-module Redmine #:nodoc:
+module Redmine
 
   class PluginNotFound < StandardError; end
   class PluginRequirementError < StandardError; end
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 437ba92a8..7f3b8093f 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -21,7 +21,8 @@ require 'redmine/scm/adapters'
 module Redmine
   module Scm
     module Adapters
-      class AbstractAdapter #:nodoc:
+      # @private
+      class AbstractAdapter
         include Redmine::Utils::Shell
 
         # raised if scm command exited with error, e.g. unknown revision.
diff --git a/lib/redmine/scm/adapters/command_failed.rb b/lib/redmine/scm/adapters/command_failed.rb
index 562b00658..0d9571f8c 100644
--- a/lib/redmine/scm/adapters/command_failed.rb
+++ b/lib/redmine/scm/adapters/command_failed.rb
@@ -18,7 +18,8 @@
 module Redmine
   module Scm
     module Adapters
-      class CommandFailed < StandardError #:nodoc:
+      # @private
+      class CommandFailed < StandardError
       end
     end
   end
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 8802cddf7..aca03f749 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -1,7 +1,8 @@
 require 'rexml/document'
 
 module Redmine
-  module VERSION #:nodoc:
+  # @private
+  module VERSION
     MAJOR = 3
     MINOR = 4
     TINY  = 4
diff --git a/lib/tasks/yardoc.rake b/lib/tasks/yardoc.rake
index eab0d8606..60d3a644a 100644
--- a/lib/tasks/yardoc.rake
+++ b/lib/tasks/yardoc.rake
@@ -12,7 +12,7 @@ begin
                     'doc/RUNNING_TESTS',
                     'doc/UPGRADING'].join(',')
 
-    t.options += ['--output-dir', './doc/app', '--files', static_files]
+    t.options += ['--no-private', '--output-dir', './doc/app', '--files', static_files]
   end
 
 rescue LoadError