diff --git a/ide/fpdoceditwindow.lfm b/ide/fpdoceditwindow.lfm
index 3c9c640dbd..cf4e05c447 100644
--- a/ide/fpdoceditwindow.lfm
+++ b/ide/fpdoceditwindow.lfm
@@ -14,10 +14,10 @@ object FPDocEditor: TFPDocEditor
   OnResize = FormResize
   LCLVersion = '0.9.29'
   object PageControl: TPageControl
-    Left = 60
+    Left = 63
     Height = 126
     Top = 0
-    Width = 693
+    Width = 690
     ActivePage = ShortTabSheet
     Align = alClient
     TabIndex = 0
@@ -27,8 +27,8 @@ object FPDocEditor: TFPDocEditor
     OnPageChanged = PageControlChange
     object ShortTabSheet: TTabSheet
       Caption = 'ShortTabSheet'
-      ClientHeight = 95
-      ClientWidth = 689
+      ClientHeight = 99
+      ClientWidth = 688
       object LinkLabel: TLabel
         AnchorSideTop.Control = LinkEdit
         AnchorSideTop.Side = asrCenter
@@ -60,7 +60,7 @@ object FPDocEditor: TFPDocEditor
         Left = 82
         Height = 27
         Top = 0
-        Width = 605
+        Width = 604
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Left = 6
         BorderSpacing.Right = 2
@@ -92,7 +92,7 @@ object FPDocEditor: TFPDocEditor
         Left = 72
         Height = 27
         Top = 29
-        Width = 615
+        Width = 614
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Left = 6
         BorderSpacing.Top = 2
@@ -105,13 +105,13 @@ object FPDocEditor: TFPDocEditor
     end
     object InheritedTabSheet: TTabSheet
       Caption = 'InheritedTabSheet'
-      ClientHeight = 181
-      ClientWidth = 656
+      ClientHeight = 99
+      ClientWidth = 688
       object InheritedShortLabel: TLabel
         Left = 0
         Height = 14
         Top = 2
-        Width = 656
+        Width = 688
         Align = alTop
         BorderSpacing.Top = 2
         Caption = 'InheritedShortLabel'
@@ -126,7 +126,7 @@ object FPDocEditor: TFPDocEditor
         Left = 0
         Height = 27
         Top = 18
-        Width = 656
+        Width = 688
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 2
         ReadOnly = True
@@ -178,13 +178,13 @@ object FPDocEditor: TFPDocEditor
     end
     object DescrTabSheet: TTabSheet
       Caption = 'DescrTabSheet'
-      ClientHeight = 181
-      ClientWidth = 656
+      ClientHeight = 99
+      ClientWidth = 688
       object DescrMemo: TMemo
         Left = 0
-        Height = 177
+        Height = 95
         Top = 0
-        Width = 654
+        Width = 686
         Align = alClient
         BorderSpacing.Right = 2
         BorderSpacing.Bottom = 4
@@ -197,13 +197,13 @@ object FPDocEditor: TFPDocEditor
     end
     object ErrorsTabSheet: TTabSheet
       Caption = 'ErrorsTabSheet'
-      ClientHeight = 181
-      ClientWidth = 656
+      ClientHeight = 99
+      ClientWidth = 688
       object ErrorsMemo: TMemo
         Left = 0
-        Height = 177
+        Height = 95
         Top = 0
-        Width = 654
+        Width = 686
         Align = alClient
         BorderSpacing.Right = 2
         BorderSpacing.Bottom = 4
@@ -216,13 +216,13 @@ object FPDocEditor: TFPDocEditor
     end
     object SeeAlsoTabSheet: TTabSheet
       Caption = 'SeeAlsoTabSheet'
-      ClientHeight = 181
-      ClientWidth = 656
+      ClientHeight = 99
+      ClientWidth = 688
       object SeeAlsoMemo: TMemo
         Left = 0
-        Height = 181
+        Height = 99
         Top = 0
-        Width = 656
+        Width = 688
         Align = alClient
         Lines.Strings = (
           'SeeAlsoMemo'
@@ -233,13 +233,13 @@ object FPDocEditor: TFPDocEditor
     end
     object ExampleTabSheet: TTabSheet
       Caption = 'ExampleTabSheet'
-      ClientHeight = 181
-      ClientWidth = 656
+      ClientHeight = 99
+      ClientWidth = 688
       object ExampleEdit: TEdit
         Left = 0
         Height = 27
         Top = 0
-        Width = 654
+        Width = 686
         Align = alTop
         BorderSpacing.Right = 2
         OnChange = ExampleEditChange
@@ -251,7 +251,7 @@ object FPDocEditor: TFPDocEditor
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = ExampleTabSheet
         AnchorSideRight.Side = asrBottom
-        Left = 517
+        Left = 549
         Height = 23
         Top = 33
         Width = 133
@@ -268,14 +268,14 @@ object FPDocEditor: TFPDocEditor
     Left = 0
     Height = 126
     Top = 0
-    Width = 60
+    Width = 63
     Align = alLeft
     AutoSize = True
     BevelOuter = bvNone
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 3
     ClientHeight = 126
-    ClientWidth = 60
+    ClientWidth = 63
     FullRepaint = False
     ParentShowHint = False
     ShowHint = True
@@ -398,12 +398,26 @@ object FPDocEditor: TFPDocEditor
       ShowHint = True
       ParentShowHint = False
     end
+    object InsertURLTagSpeedButton: TSpeedButton
+      Tag = 8
+      Left = 0
+      Height = 23
+      Top = 69
+      Width = 20
+      Constraints.MaxHeight = 23
+      Constraints.MaxWidth = 20
+      Color = clBtnFace
+      NumGlyphs = 0
+      OnClick = FormatButtonClick
+      ShowHint = True
+      ParentShowHint = False
+    end
     object SaveButton: TSpeedButton
       AnchorSideLeft.Side = asrBottom
       Left = 0
       Height = 29
       Top = 97
-      Width = 60
+      Width = 63
       Align = alBottom
       Caption = 'Save'
       Color = clBtnFace
diff --git a/ide/fpdoceditwindow.lrs b/ide/fpdoceditwindow.lrs
index bf5e96e505..0acb0e20e0 100644
--- a/ide/fpdoceditwindow.lrs
+++ b/ide/fpdoceditwindow.lrs
@@ -6,12 +6,12 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'FPDoc editor'#12'ClientHeight'#2'~'#11'ClientWidth'#3#241#2#10'KeyPreview'#9
   +#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#9'OnKeyDown'#7
   +#11'FormKeyDown'#8'OnResize'#7#10'FormResize'#10'LCLVersion'#6#6'0.9.29'#0#12
-  +'TPageControl'#11'PageControl'#4'Left'#2'<'#6'Height'#2'~'#3'Top'#2#0#5'Widt'
-  +'h'#3#181#2#10'ActivePage'#7#13'ShortTabSheet'#5'Align'#7#8'alClient'#8'TabI'
+  +'TPageControl'#11'PageControl'#4'Left'#2'?'#6'Height'#2'~'#3'Top'#2#0#5'Widt'
+  +'h'#3#178#2#10'ActivePage'#7#13'ShortTabSheet'#5'Align'#7#8'alClient'#8'TabI'
   +'ndex'#2#0#8'TabOrder'#2#0#11'TabPosition'#7#8'tpBottom'#8'OnChange'#7#17'Pa'
   +'geControlChange'#13'OnPageChanged'#7#17'PageControlChange'#0#9'TTabSheet'#13
-  +'ShortTabSheet'#7'Caption'#6#13'ShortTabSheet'#12'ClientHeight'#2'_'#11'Clie'
-  +'ntWidth'#3#177#2#0#6'TLabel'#9'LinkLabel'#21'AnchorSideTop.Control'#7#8'Lin'
+  +'ShortTabSheet'#7'Caption'#6#13'ShortTabSheet'#12'ClientHeight'#2'c'#11'Clie'
+  +'ntWidth'#3#176#2#0#6'TLabel'#9'LinkLabel'#21'AnchorSideTop.Control'#7#8'Lin'
   +'kEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#18#3'T'
   +'op'#2'!'#5'Width'#2'<'#17'BorderSpacing.Top'#2#6#7'Caption'#6#9'LinkLabel'
   +#11'ParentColor'#8#0#0#6'TLabel'#10'ShortLabel'#22'AnchorSideLeft.Control'#7
@@ -21,7 +21,7 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'TEdit'#9'ShortEdit'#22'AnchorSideLeft.Control'#7#10'ShortLabel'#19'AnchorSi'
   +'deLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13'ShortTabSheet'
   +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'R'#6'Height'#2#27#3'Top'#2
-  +#0#5'Width'#3']'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSp'
+  +#0#5'Width'#3'\'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSp'
   +'acing.Left'#2#6#19'BorderSpacing.Right'#2#2#8'OnChange'#7#20'ShortEditEditi'
   +'ngDone'#13'OnEditingDone'#7#20'ShortEditEditingDone'#8'TabOrder'#2#0#4'Text'
   +#6#9'ShortEdit'#0#0#7'TButton'#12'CreateButton'#21'AnchorSideTop.Control'#7#8
@@ -32,28 +32,28 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'ShortEdit'#18'Anch'
   +'orSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13'ShortTabShe'
   +'et'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'H'#6'Height'#2#27#3'T'
-  +'op'#2#29#5'Width'#3'g'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'B'
+  +'op'#2#29#5'Width'#3'f'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'B'
   +'orderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#2
   +#8'OnChange'#7#19'LinkEditEditingDone'#13'OnEditingDone'#7#19'LinkEditEditin'
   +'gDone'#8'TabOrder'#2#2#4'Text'#6#8'LinkEdit'#0#0#0#9'TTabSheet'#17'Inherite'
-  +'dTabSheet'#7'Caption'#6#17'InheritedTabSheet'#12'ClientHeight'#3#181#0#11'C'
-  +'lientWidth'#3#144#2#0#6'TLabel'#19'InheritedShortLabel'#4'Left'#2#0#6'Heigh'
-  +'t'#2#14#3'Top'#2#2#5'Width'#3#144#2#5'Align'#7#5'alTop'#17'BorderSpacing.To'
-  +'p'#2#2#7'Caption'#6#19'InheritedShortLabel'#11'ParentColor'#8#0#0#5'TEdit'
-  +#18'InheritedShortEdit'#22'AnchorSideLeft.Control'#7#17'InheritedTabSheet'#21
-  +'AnchorSideTop.Control'#7#19'InheritedShortLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#23'AnchorSideRight.Control'#7#17'InheritedTabSheet'#20'AnchorSid'
-  +'eRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#18#5'Width'
-  +#3#144#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'
-  +#2#2#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#18'InheritedShortEdit'#0#0#7'TB'
-  +'utton'#21'MoveToInheritedButton'#21'AnchorSideTop.Control'#7#18'InheritedSh'
-  +'ortEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#23#3
-  +'Top'#2'3'#5'Width'#3#140#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#21'MoveToInheritedButton'#7'OnClick'#7#26'MoveToInheritedButtonClic'
-  +'k'#8'TabOrder'#2#1#0#0#7'TButton'#23'CopyFromInheritedButton'#22'AnchorSide'
-  +'Left.Control'#7#21'MoveToInheritedButton'#19'AnchorSideLeft.Side'#7#9'asrBo'
-  +'ttom'#21'AnchorSideTop.Control'#7#21'MoveToInheritedButton'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrCenter'#4'Left'#3#150#0#6'Height'#2#23#3'Top'#2'3'#5'Width'#3
+  +'dTabSheet'#7'Caption'#6#17'InheritedTabSheet'#12'ClientHeight'#2'c'#11'Clie'
+  +'ntWidth'#3#176#2#0#6'TLabel'#19'InheritedShortLabel'#4'Left'#2#0#6'Height'#2
+  +#14#3'Top'#2#2#5'Width'#3#176#2#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#2
+  +#7'Caption'#6#19'InheritedShortLabel'#11'ParentColor'#8#0#0#5'TEdit'#18'Inhe'
+  +'ritedShortEdit'#22'AnchorSideLeft.Control'#7#17'InheritedTabSheet'#21'Ancho'
+  +'rSideTop.Control'#7#19'InheritedShortLabel'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#23'AnchorSideRight.Control'#7#17'InheritedTabSheet'#20'AnchorSideRig'
+  +'ht.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#18#5'Width'#3
+  +#176#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2
+  +#2#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#18'InheritedShortEdit'#0#0#7'TBut'
+  +'ton'#21'MoveToInheritedButton'#21'AnchorSideTop.Control'#7#18'InheritedShor'
+  +'tEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#23#3'T'
+  +'op'#2'3'#5'Width'#3#140#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capt'
+  +'ion'#6#21'MoveToInheritedButton'#7'OnClick'#7#26'MoveToInheritedButtonClick'
+  +#8'TabOrder'#2#1#0#0#7'TButton'#23'CopyFromInheritedButton'#22'AnchorSideLef'
+  +'t.Control'#7#21'MoveToInheritedButton'#19'AnchorSideLeft.Side'#7#9'asrBotto'
+  +'m'#21'AnchorSideTop.Control'#7#21'MoveToInheritedButton'#18'AnchorSideTop.S'
+  +'ide'#7#9'asrCenter'#4'Left'#3#150#0#6'Height'#2#23#3'Top'#2'3'#5'Width'#3
   +#151#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#23'CopyFromInh'
   +'eritedButton'#7'OnClick'#7#28'CopyFromInheritedButtonClick'#8'TabOrder'#2#2
   +#0#0#7'TButton'#24'AddLinkToInheritedButton'#22'AnchorSideLeft.Control'#7#23
@@ -62,71 +62,74 @@ LazarusResources.Add('TFPDocEditor','FORMDATA',[
   +'Top'#2'3'#5'Width'#3#151#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#7'Capt'
   +'ion'#6#24'AddLinkToInheritedButton'#7'OnClick'#7#29'AddLinkToInheritedButto'
   +'nClick'#8'TabOrder'#2#3#0#0#0#9'TTabSheet'#13'DescrTabSheet'#7'Caption'#6#13
-  +'DescrTabSheet'#12'ClientHeight'#3#181#0#11'ClientWidth'#3#144#2#0#5'TMemo'#9
-  +'DescrMemo'#4'Left'#2#0#6'Height'#3#177#0#3'Top'#2#0#5'Width'#3#142#2#5'Alig'
-  +'n'#7#8'alClient'#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13
-  ,'Lines.Strings'#1#6#9'DescrMemo'#0#8'OnChange'#7#15'DescrMemoChange'#8'TabOr'
-  +'der'#2#0#0#0#0#9'TTabSheet'#14'ErrorsTabSheet'#7'Caption'#6#14'ErrorsTabShe'
-  +'et'#12'ClientHeight'#3#181#0#11'ClientWidth'#3#144#2#0#5'TMemo'#10'ErrorsMe'
-  +'mo'#4'Left'#2#0#6'Height'#3#177#0#3'Top'#2#0#5'Width'#3#142#2#5'Align'#7#8
-  +'alClient'#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13'Lines'
-  +'.Strings'#1#6#10'ErrorsMemo'#0#8'OnChange'#7#16'ErrorsMemoChange'#8'TabOrde'
-  +'r'#2#0#0#0#0#9'TTabSheet'#15'SeeAlsoTabSheet'#7'Caption'#6#15'SeeAlsoTabShe'
-  +'et'#12'ClientHeight'#3#181#0#11'ClientWidth'#3#144#2#0#5'TMemo'#11'SeeAlsoM'
-  +'emo'#4'Left'#2#0#6'Height'#3#181#0#3'Top'#2#0#5'Width'#3#144#2#5'Align'#7#8
-  +'alClient'#13'Lines.Strings'#1#6#11'SeeAlsoMemo'#0#13'OnEditingDone'#7#22'Se'
-  +'eAlsoMemoEditingDone'#8'TabOrder'#2#0#0#0#0#9'TTabSheet'#15'ExampleTabSheet'
-  +#7'Caption'#6#15'ExampleTabSheet'#12'ClientHeight'#3#181#0#11'ClientWidth'#3
-  +#144#2#0#5'TEdit'#11'ExampleEdit'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#0#5'Wi'
-  +'dth'#3#142#2#5'Align'#7#5'alTop'#19'BorderSpacing.Right'#2#2#8'OnChange'#7
-  +#17'ExampleEditChange'#8'TabOrder'#2#0#4'Text'#6#11'ExampleEdit'#0#0#7'TButt'
-  +'on'#19'BrowseExampleButton'#21'AnchorSideTop.Control'#7#11'ExampleEdit'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#15'Example'
-  +'TabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#5#2#6'Height'#2
-  +#23#3'Top'#2'!'#5'Width'#3#133#0#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoS'
-  +'ize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'BrowseExampleButton'#7
-  +'OnClick'#7#24'BrowseExampleButtonClick'#8'TabOrder'#2#1#0#0#0#0#6'TPanel'#12
-  +'LeftBtnPanel'#4'Left'#2#0#6'Height'#2'~'#3'Top'#2#0#5'Width'#2'<'#5'Align'#7
-  +#6'alLeft'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#18'ChildSizing.Layout'#7
-  +#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3#12'Cl'
-  +'ientHeight'#2'~'#11'ClientWidth'#2'<'#11'FullRepaint'#8#14'ParentShowHint'#8
-  +#8'ShowHint'#9#8'TabOrder'#2#1#0#12'TSpeedButton'#16'BoldFormatButton'#4'Lef'
-  +'t'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#2#20#21'Constraints.MaxHeight'#2
+  +'DescrTabSheet'#12'ClientHeight'#2'c'#11'ClientWidth'#3#176#2#0#5'TMemo'#9'D'
+  +'escrMemo'#4'Left'#2#0#6'Height'#2'_'#3'Top'#2#0#5'Width'#3#174#2#5'Align'#7
+  +#8'alClient'#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13'Lin'
+  ,'es.Strings'#1#6#9'DescrMemo'#0#8'OnChange'#7#15'DescrMemoChange'#8'TabOrder'
+  +#2#0#0#0#0#9'TTabSheet'#14'ErrorsTabSheet'#7'Caption'#6#14'ErrorsTabSheet'#12
+  +'ClientHeight'#2'c'#11'ClientWidth'#3#176#2#0#5'TMemo'#10'ErrorsMemo'#4'Left'
+  +#2#0#6'Height'#2'_'#3'Top'#2#0#5'Width'#3#174#2#5'Align'#7#8'alClient'#19'Bo'
+  +'rderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13'Lines.Strings'#1#6#10
+  +'ErrorsMemo'#0#8'OnChange'#7#16'ErrorsMemoChange'#8'TabOrder'#2#0#0#0#0#9'TT'
+  +'abSheet'#15'SeeAlsoTabSheet'#7'Caption'#6#15'SeeAlsoTabSheet'#12'ClientHeig'
+  +'ht'#2'c'#11'ClientWidth'#3#176#2#0#5'TMemo'#11'SeeAlsoMemo'#4'Left'#2#0#6'H'
+  +'eight'#2'c'#3'Top'#2#0#5'Width'#3#176#2#5'Align'#7#8'alClient'#13'Lines.Str'
+  +'ings'#1#6#11'SeeAlsoMemo'#0#13'OnEditingDone'#7#22'SeeAlsoMemoEditingDone'#8
+  +'TabOrder'#2#0#0#0#0#9'TTabSheet'#15'ExampleTabSheet'#7'Caption'#6#15'Exampl'
+  +'eTabSheet'#12'ClientHeight'#2'c'#11'ClientWidth'#3#176#2#0#5'TEdit'#11'Exam'
+  +'pleEdit'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#0#5'Width'#3#174#2#5'Align'#7#5
+  +'alTop'#19'BorderSpacing.Right'#2#2#8'OnChange'#7#17'ExampleEditChange'#8'Ta'
+  +'bOrder'#2#0#4'Text'#6#11'ExampleEdit'#0#0#7'TButton'#19'BrowseExampleButton'
+  +#21'AnchorSideTop.Control'#7#11'ExampleEdit'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#23'AnchorSideRight.Control'#7#15'ExampleTabSheet'#20'AnchorSideRight'
+  +'.Side'#7#9'asrBottom'#4'Left'#3'%'#2#6'Height'#2#23#3'Top'#2'!'#5'Width'#3
+  +#133#0#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#19'BrowseExampleButton'#7'OnClick'#7#24'BrowseExampl'
+  +'eButtonClick'#8'TabOrder'#2#1#0#0#0#0#6'TPanel'#12'LeftBtnPanel'#4'Left'#2#0
+  +#6'Height'#2'~'#3'Top'#2#0#5'Width'#2'?'#5'Align'#7#6'alLeft'#8'AutoSize'#9
+  +#10'BevelOuter'#7#6'bvNone'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTo'
+  +'pToBottom'#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHeight'#2'~'#11'Cli'
+  +'entWidth'#2'?'#11'FullRepaint'#8#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOr'
+  +'der'#2#1#0#12'TSpeedButton'#16'BoldFormatButton'#4'Left'#2#0#6'Height'#2#23
+  +#3'Top'#2#0#5'Width'#2#20#21'Constraints.MaxHeight'#2#23#20'Constraints.MaxW'
+  +'idth'#2#20#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatB'
+  +'uttonClick'#0#0#12'TSpeedButton'#18'ItalicFormatButton'#3'Tag'#2#1#4'Left'#2
+  +#20#6'Height'#2#23#3'Top'#2#0#5'Width'#2#20#21'Constraints.MaxHeight'#2#23#20
+  +'Constraints.MaxWidth'#2#20#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnCli'
+  +'ck'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#21'UnderlineFormatButton'#3
+  +'Tag'#2#2#4'Left'#2'('#6'Height'#2#23#3'Top'#2#0#5'Width'#2#20#21'Constraint'
+  +'s.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#5'Color'#7#9'clBtnFace'#9'N'
+  +'umGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#18'In'
+  +'sertVarTagButton'#3'Tag'#2#5#4'Left'#2#0#6'Height'#2#23#3'Top'#2#23#5'Width'
+  +#2#20#21'Constraints.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#5'Color'#7
+  +#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSp'
+  +'eedButton'#26'InsertParagraphSpeedButton'#3'Tag'#2#6#4'Left'#2#20#6'Height'
+  +#2#23#3'Top'#2#23#5'Width'#2#20#21'Constraints.MaxHeight'#2#23#20'Constraint'
+  +'s.MaxWidth'#2#20#7'Caption'#6#1'P'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0
+  +#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#21'InsertLinkSpeedB'
+  +'utton'#4'Left'#2'('#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#21'Constraints'
+  +'.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#7'Caption'#6#2'Li'#5'Color'#7
+  +#9'clBtnFace'#7'Enabled'#8#9'NumGlyphs'#2#0#7'OnClick'#7#26'InsertLinkSpeedB'
+  +'uttonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#19'Inse'
+  +'rtCodeTagButton'#3'Tag'#2#3#4'Left'#2#0#6'Height'#2#23#3'Top'#2'.'#5'Width'
+  +#2#20#21'Constraints.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#5'Color'#7
+  +#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'ShowHint'
+  +#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#18'InsertRemarkButton'#3'Tag'#2
+  +#4#4'Left'#2#20#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20#21'Constraints.MaxH'
+  +'eight'#2#23#20'Constraints.MaxWidth'#2#20#5'Color'#7#9'clBtnFace'#9'NumGlyp'
+  +'hs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'ShowHint'#9#14'ParentShowHint'
+  +#8#0#0#12'TSpeedButton'#27'InsertPrintShortSpeedButton'#3'Tag'#2#7#4'Left'#2
+  +'('#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20#21'Constraints.MaxHeight'#2#23
+  +#20'Constraints.MaxWidth'#2#20#7'Caption'#6#2'PS'#5'Color'#7#9'clBtnFace'#9
+  +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'ShowHint'#9#14'ParentSh'
+  +'owHint'#8#0#0#12'TSpeedButton'#23'InsertURLTagSpeedButton'#3'Tag'#2#8#4'Lef'
+  +'t'#2#0#6'Height'#2#23#3'Top'#2'E'#5'Width'#2#20#21'Constraints.MaxHeight'#2
   +#23#20'Constraints.MaxWidth'#2#20#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7
-  +'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#18'ItalicFormatButton'
-  +#3'Tag'#2#1#4'Left'#2#20#6'Height'#2#23#3'Top'#2#0#5'Width'#2#20#21'Constrai'
-  +'nts.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#5'Color'#7#9'clBtnFace'#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#21'U'
-  +'nderlineFormatButton'#3'Tag'#2#2#4'Left'#2'('#6'Height'#2#23#3'Top'#2#0#5'W'
-  +'idth'#2#20#21'Constraints.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#5'C'
-  +'olor'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0
-  +#12'TSpeedButton'#18'InsertVarTagButton'#3'Tag'#2#5#4'Left'#2#0#6'Height'#2
-  +#23#3'Top'#2#23#5'Width'#2#20#21'Constraints.MaxHeight'#2#23#20'Constraints.'
-  +'MaxWidth'#2#20#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'For'
-  +'matButtonClick'#0#0#12'TSpeedButton'#26'InsertParagraphSpeedButton'#3'Tag'#2
-  +#6#4'Left'#2#20#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#21'Constraints.MaxH'
-  +'eight'#2#23#20'Constraints.MaxWidth'#2#20#7'Caption'#6#1'P'#5'Color'#7#9'cl'
-  +'BtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedB'
-  +'utton'#21'InsertLinkSpeedButton'#4'Left'#2'('#6'Height'#2#23#3'Top'#2#23#5
-  +'Width'#2#20#21'Constraints.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#7
-  +'Caption'#6#2'Li'#5'Color'#7#9'clBtnFace'#7'Enabled'#8#9'NumGlyphs'#2#0#7'On'
-  +'Click'#7#26'InsertLinkSpeedButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0
-  +#0#12'TSpeedButton'#19'InsertCodeTagButton'#3'Tag'#2#3#4'Left'#2#0#6'Height'
-  +#2#23#3'Top'#2'.'#5'Width'#2#20#21'Constraints.MaxHeight'#2#23#20'Constraint'
-  +'s.MaxWidth'#2#20#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'F'
-  +'ormatButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#18
-  +'InsertRemarkButton'#3'Tag'#2#4#4'Left'#2#20#6'Height'#2#23#3'Top'#2'.'#5'Wi'
-  +'dth'#2#20#21'Constraints.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#5'Co'
-  +'lor'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'S'
-  +'howHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#27'InsertPrintShortSpe'
-  +'edButton'#3'Tag'#2#7#4'Left'#2'('#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20
-  +#21'Constraints.MaxHeight'#2#23#20'Constraints.MaxWidth'#2#20#7'Caption'#6#2
-  +'PS'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonCl'
-  +'ick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#10'SaveButton'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#29#3'Top'#2
-  +'a'#5'Width'#2'<'#5'Align'#7#8'alBottom'#7'Caption'#6#4'Save'#5'Color'#7#9'c'
-  +'lBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#15'SaveButtonClick'#0#0#0#11'TOpenD'
-  +'ialog'#10'OpenDialog'#5'Title'#6#17'Open example file'#6'Filter'#6#28'pasca'
-  +'l file|*.pas; *.pp; *.p'#11'FilterIndex'#2#0#4'left'#3#240#0#3'top'#2#16#0#0
-  +#0
+  +'OnClick'#7#17'FormatButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12
+  +'TSpeedButton'#10'SaveButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'
+  +#2#0#6'Height'#2#29#3'Top'#2'a'#5'Width'#2'?'#5'Align'#7#8'alBottom'#7'Capti'
+  +'on'#6#4'Save'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#15'Save'
+  ,'ButtonClick'#0#0#0#11'TOpenDialog'#10'OpenDialog'#5'Title'#6#17'Open exampl'
+  +'e file'#6'Filter'#6#28'pascal file|*.pas; *.pp; *.p'#11'FilterIndex'#2#0#4
+  +'left'#3#240#0#3'top'#2#16#0#0#0
 ]);
diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas
index 1d3ea74e01..7b69aeeb21 100644
--- a/ide/fpdoceditwindow.pas
+++ b/ide/fpdoceditwindow.pas
@@ -94,6 +94,7 @@ type
     ShortLabel: TLabel;
     ShortTabSheet: TTabSheet;
     InsertPrintShortSpeedButton: TSpeedButton;
+    InsertURLTagSpeedButton: TSpeedButton;
     UnderlineFormatButton: TSpeedButton;
     procedure AddLinkToInheritedButtonClick(Sender: TObject);
     procedure ApplicationIdle(Sender: TObject; var Done: Boolean);
@@ -220,6 +221,7 @@ begin
   InsertParagraphSpeedButton.Hint := lisCodeHelpInsertParagraphFormattingTag;
   InsertLinkSpeedButton.Hint := lisCodeHelpInsertALink;
   InsertPrintShortSpeedButton.Hint:=lisInsertPrintshortTag2;
+  InsertURLTagSpeedButton.Hint:=lisInsertUrlTag;
 
   ShortLabel.Caption:=lisShort;
   LinkLabel.Caption:=lisLink;
@@ -256,6 +258,7 @@ begin
   InsertVarTagButton.LoadGlyphFromLazarusResource('insertvartag');
   InsertCodeTagButton.LoadGlyphFromLazarusResource('insertcodetag');
   InsertRemarkButton.LoadGlyphFromLazarusResource('insertremark');
+  InsertURLTagSpeedButton.LoadGlyphFromLazarusResource('formatunderline');
   SaveButton.LoadGlyphFromLazarusResource('laz_save');
 end;
 
@@ -324,6 +327,9 @@ begin
     7:
       if (fChain<>nil) and (fChain.Count>0) then
         InsertTag('<printshort id="'+fChain[0].ElementName+'"/>','');
+    //url tag
+    8:
+      InsertTag('<url href="">', '</url>');
   end;
 end;
 
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 2f55983aa1..48bb9c1c3e 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -4275,6 +4275,7 @@ resourcestring
   lisEveryNThLineNumber = 'Every n-th line number:';
   lisLink = 'Link:';
   lisShort = 'Short:';
+  lisInsertUrlTag = 'Insert url tag';
   lisInsertPrintshortTag2 = 'Insert printshort tag';
   lisDeleteOldFile2 = 'Delete old file?';
   lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac = 'The unit search '