diff --git a/.gitattributes b/.gitattributes
index d2a8d6c0cd..6f3d7b3039 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2480,15 +2480,6 @@ examples/groupboxnested.pas svneol=native#text/pascal
examples/hello.lpi svneol=native#text/plain
examples/hello.pp svneol=native#text/pascal
examples/helloform.pp svneol=native#text/pascal
-examples/helpforpackage/README.txt svneol=native#text/plain
-examples/helpforpackage/demopackagewithhelp.lpk svneol=native#text/plain
-examples/helpforpackage/demopackagewithhelp.pas svneol=native#text/plain
-examples/helpforpackage/html/index.html svneol=native#text/plain
-examples/helpforpackage/html/pkghelpdemounit1/index-5.html svneol=native#text/plain
-examples/helpforpackage/html/pkghelpdemounit1/index.html svneol=native#text/plain
-examples/helpforpackage/html/pkghelpdemounit1/register.html svneol=native#text/plain
-examples/helpforpackage/pkghelpdemounit1.pas svneol=native#text/plain
-examples/helpforpackage/xml/pkghelpdemounit1.xml svneol=native#text/plain
examples/helphtml/html/edit1.html svneol=native#text/plain
examples/helphtml/html/edit2.html svneol=native#text/plain
examples/helphtml/html/index.html svneol=native#text/plain
diff --git a/.gitignore b/.gitignore
index e883a1f0bd..758a021cbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -251,16 +251,6 @@ examples/gridexamples/grid_semaphor/example/units
examples/gridexamples/grid_semaphor/units
examples/gridexamples/gridcelleditor/*.bak
examples/gridexamples/gridcelleditor/units
-examples/help/*.bak
-examples/help/units
-examples/helpforpackage/*.bak
-examples/helpforpackage/html/*.bak
-examples/helpforpackage/html/pkghelpdemounit1/*.bak
-examples/helpforpackage/html/pkghelpdemounit1/units
-examples/helpforpackage/html/units
-examples/helpforpackage/units
-examples/helpforpackage/xml/*.bak
-examples/helpforpackage/xml/units
examples/helphtml/*.bak
examples/helphtml/html/*.bak
examples/helphtml/html/units
diff --git a/examples/helpforpackage/README.txt b/examples/helpforpackage/README.txt
deleted file mode 100644
index a76aa92475..0000000000
--- a/examples/helpforpackage/README.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-This package (demopackagewithhelp.lpk) demonstrates how to register help in the
-IDE for the sources of a package.
-
-The help itself is in fpdoc format.
-Here is an example how to create the basic fpdoc xml file from the source:
-
-makeskel --package=demopackagewithhelp --input=pkghelpdemounit1.pas --output=xml/pkghelpdemounit1.xml
-
-Use the program LazDE (lazarus/doceditor/lazde.lpi)
-or LazDoc tool in the IDE to write some documentation.
-
-Then create the html files from the xml files:
-
-cd html && fpdoc --package=demopackagewithhelp --descr=../xml/pkghelpdemounit1.xml --input=../pkghelpdemounit1.pas
-
-
diff --git a/examples/helpforpackage/demopackagewithhelp.lpk b/examples/helpforpackage/demopackagewithhelp.lpk
deleted file mode 100644
index e1d17880e0..0000000000
--- a/examples/helpforpackage/demopackagewithhelp.lpk
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/helpforpackage/demopackagewithhelp.pas b/examples/helpforpackage/demopackagewithhelp.pas
deleted file mode 100644
index ca48fa2e74..0000000000
--- a/examples/helpforpackage/demopackagewithhelp.pas
+++ /dev/null
@@ -1,21 +0,0 @@
-{ This file was automatically created by Lazarus. Do not edit!
-This source is only used to compile and install the package.
- }
-
-unit DemoPackageWithHelp;
-
-interface
-
-uses
- PkgHelpDemoUnit1, LazarusPackageIntf;
-
-implementation
-
-procedure Register;
-begin
- RegisterUnit('PkgHelpDemoUnit1', @PkgHelpDemoUnit1.Register);
-end;
-
-initialization
- RegisterPackage('DemoPackageWithHelp', @Register);
-end.
diff --git a/examples/helpforpackage/html/index.html b/examples/helpforpackage/html/index.html
deleted file mode 100644
index 40a0d72f57..0000000000
--- a/examples/helpforpackage/html/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-Reference for package 'demopackagewithhelp'
-
-
-
-
-Reference for package 'demopackagewithhelp'
-
-Units
-
-
-
diff --git a/examples/helpforpackage/html/pkghelpdemounit1/index-5.html b/examples/helpforpackage/html/pkghelpdemounit1/index-5.html
deleted file mode 100644
index 0378b96407..0000000000
--- a/examples/helpforpackage/html/pkghelpdemounit1/index-5.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-Reference for unit 'PkgHelpDemoUnit1': Procedures and functions
-
-
-
-
-Reference for unit 'PkgHelpDemoUnit1': Procedures and functions
-
-
-
diff --git a/examples/helpforpackage/html/pkghelpdemounit1/index.html b/examples/helpforpackage/html/pkghelpdemounit1/index.html
deleted file mode 100644
index cd9a1af515..0000000000
--- a/examples/helpforpackage/html/pkghelpdemounit1/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-Reference for unit 'PkgHelpDemoUnit1'
-
-
-
-
-Reference for unit 'PkgHelpDemoUnit1'
-
-
-
-uses |
-
-
- Classes, |
-
-
- SysUtils, |
-
-
- HelpFPDoc; |
-
-
-
-
diff --git a/examples/helpforpackage/html/pkghelpdemounit1/register.html b/examples/helpforpackage/html/pkghelpdemounit1/register.html
deleted file mode 100644
index a59faecab7..0000000000
--- a/examples/helpforpackage/html/pkghelpdemounit1/register.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-Register
-
-
-
-
-Register
-
-Declaration
-Source position: pkghelpdemounit1.pas line 28
-
-
-procedure Register; |
-
-
-
-
diff --git a/examples/helpforpackage/pkghelpdemounit1.pas b/examples/helpforpackage/pkghelpdemounit1.pas
deleted file mode 100644
index bf54ea572e..0000000000
--- a/examples/helpforpackage/pkghelpdemounit1.pas
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- *****************************************************************************
- * *
- * See the file COPYING.modifiedLGPL.txt, included in this distribution, *
- * for details about the copyright. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
- * *
- *****************************************************************************
-
- Author: Mattias Gaertner
-
- Abstract:
- Example unit demonstrating how to register IDE online help for the sources
- of a package.
-}
-unit PkgHelpDemoUnit1;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
- Classes, SysUtils, HelpFPDoc;
-
-procedure Register;
-
-implementation
-
-procedure Register;
-begin
- RegisterFPDocHTMLHelpForPackage('Demo Help DB','Demo Help Database',
- 'file://$PkgDir(DemoPackageWithHelp)/html','DemoPackageWithHelp');
-end;
-
-end.
-
diff --git a/examples/helpforpackage/xml/pkghelpdemounit1.xml b/examples/helpforpackage/xml/pkghelpdemounit1.xml
deleted file mode 100644
index 58ffe77bc8..0000000000
--- a/examples/helpforpackage/xml/pkghelpdemounit1.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-