Correct usage of #+texinfo lines

Remove forgotten merge cookies in README.org.

README.md

@@ -1,23 +1,18 @@
 
 # Table of Contents
 
-1.  [Introduction](#orgbd9565b)
-2.  [Some Highlights](#orgf16524e)
-3.  [Installation](#orge3a00cd)
-4.  [First Steps](#org659e9c6)
-5.  [Configuration and Customisation](#org45ecbff)
-6.  [Bugs and Problems](#org9cb11c3)
-7.  [News](#org9d695a5)
-8.  [Further Resources](#orgbd11703)
-9.  [Acknowledgements](#org7655699)
-10. [Todos](#orgf92af26)
-11. [GNU GPL v3 License](#org2f6d750)
+1.  [Introduction](#org0a6416f)
+2.  [Some Highlights](#org3fde12c)
+3.  [Installation](#org2947558)
+4.  [First Steps](#org4020323)
+5.  [Configuration and Customisation](#orgc049613)
+6.  [Bugs and Problems](#org3cbb95d)
+7.  [News](#org79e866e)
+8.  [Further Resources](#org05c3c52)
+9.  [Acknowledgements](#orgbf65e9b)
+10. [Todos](#org02e166b)
+11. [GNU GPL v3 License](#org2431fc1)
 
-<<<<<<< HEAD
-
-`=====`
-
->>>>>>> help
 
 
 ## The GNU-Emacs major mode for the scripting language APDL
@@ -32,7 +27,7 @@ Copyright (C) 2006 - 2020  H. Dieter Wilhelm, GPL V3
 ![img](doc/ansys+emacs2020-03.png)
 
 
-<a id="orgbd9565b"></a>
+<a id="org0a6416f"></a>
 
 # Introduction
 
@@ -75,7 +70,7 @@ with the "Refresh" button.
 ![img](doc/connect_command_snippet_to_file.png)
 
 
-<a id="orgf16524e"></a>
+<a id="org3fde12c"></a>
 
 # Some Highlights
 
@@ -141,7 +136,7 @@ The image below shows the unhidden content.
 ![img](doc/unhidden_blocks.png)
 
 
-<a id="orge3a00cd"></a>
+<a id="org2947558"></a>
 
 # Installation
 
@@ -209,7 +204,7 @@ to your initialisation file (the source directory must be set in
 the \`load-path' variable as well).
 
 
-<a id="org659e9c6"></a>
+<a id="org4020323"></a>
 
 # First Steps
 
@@ -228,7 +223,7 @@ APDL-Mode is tested with Ansys v193 and v201 under Windows 10, as
 well as under Emacs-25 and 26 under GNU-Linux and Windows.
 
 
-<a id="org45ecbff"></a>
+<a id="orgc049613"></a>
 
 # Configuration and Customisation
 
@@ -244,7 +239,7 @@ Please read the [apdl-config](info/apdl-config.md) documentation for further opt
 open the accompanying configuration [example-file](info/apdl-config.el).
 
 
-<a id="org9cb11c3"></a>
+<a id="org3cbb95d"></a>
 
 # Bugs and Problems
 
@@ -265,22 +260,22 @@ following options:
     [Emacs Wiki](https://www.emacswiki.org).
 
 
-<a id="org9d695a5"></a>
+<a id="org79e866e"></a>
 
 # News
 
 For further news please have a look into the [NEWS](info/NEWS.md) file.
 
 
-<a id="orgbd11703"></a>
+<a id="org05c3c52"></a>
 
 # Further Resources
 
 If you want to read further details regarding the APDL scripting,
 GNU-Emacs and other APDL editors please read the [RESOURCES](info/resources.md) file.
 
 
-<a id="org7655699"></a>
+<a id="orgbf65e9b"></a>
 
 # Acknowledgements
 
@@ -295,14 +290,14 @@ I received moreover support and feedback from many individuals, thank
 you very much!
 
 
-<a id="orgf92af26"></a>
+<a id="org02e166b"></a>
 
 # Todos
 
 Please check the [TODO](info/TODO.md) file.
 
 
-<a id="org2f6d750"></a>
+<a id="org2431fc1"></a>
 
 # GNU GPL v3 License
 

apdl-mode.info

@@ -3169,6 +3169,7 @@ File: apdl-mode.info,  Node: Todos bugs,  Next: Minor bugs,  Up: Version 2050 1
 12.1.1 Todos, bugs
 ------------------
 
+   • Make text around #+texinfo: lines self sustained!
    • Templates: Add intro help to the -wb-template system, complete
      usage.org
         • Code Templates, apdl-wb-custom-template-directory
@@ -3180,13 +3181,13 @@ File: apdl-mode.info,  Node: Minor bugs,  Next: Checks,  Prev: Todos bugs,  Up:
 12.1.2 Minor bugs
 -----------------
 
-   • C-c C-v doesn’t preserve point of macro file
+   • C-c C-v doesn’t preserve point of the APDL file
    • M-?  parameter counter is not working for commands where functions
      with multiple arguments are in the argument list!  f,node(x,y,z),,,
-   • C-u C-c C-b in browser on Win10 for "All"stuff isn’t skipping to
-     the respective section on page for Chrome and Edge!?
    • ‘1/en’, en is variable but this fraction is not fontified, though
      ‘1/ en’ is fontified!
+   • C-u C-c C-b in browser on Win10 for "All"stuff isn’t skipping to
+     the respective section on page for Chrome and Edge!?
 
 
 File: apdl-mode.info,  Node: Checks,  Next: Wishes,  Prev: Minor bugs,  Up: Version 2050 1
@@ -3242,7 +3243,8 @@ File: apdl-mode.info,  Node: Docu,  Next: templates,  Up: Wishes
 
    • work on the Info index
    • #+include: #+title adds to info title!
-   • #+texinfo: @inforef{node,name,file} links to Emacs info pages, done
+   • #+texinfo: @inforef{node,name,file} links to Emacs info pages,
+     done, make contex self sustained!!
    • Attention colon ":" in headline gives a texinfo reference!
    • C-u C-h i: info file :-)
    • package with file "dir"
@@ -3336,8 +3338,7 @@ makefile?
 
    apdl-customise-ansys
 
-   (tags-query-replace "26\.3" "27.1") (tags-search "((emacs
-\"25.1\"))")
+   (tags-query-replace "26\.3" "27.1") (tags-search "texinfo:")
 
 
 File: apdl-mode.info,  Node: Version 2040 1,  Next: Version 2030 1,  Prev: Version 2050 1,  Up: Todos
@@ -4549,37 +4550,37 @@ Node: Other APDL editor resources130072
 Node: Todos130986
 Node: Version 2050 1131302
 Node: Todos bugs131633
-Node: Minor bugs131960
-Node: Checks132537
-Node: Wishes132820
-Node: Docu133124
-Node: templates134966
-Node: misc135563
-Node: Done135974
-Node: Push and Release Proceedures136213
-Node: Version 2040 1137139
-Node: Version 2030 1137336
-Node: Version 2020 1137554
-Node: Version 2011 1137733
-Node: Version 162-2138205
-Node: Bugs138481
-Node: Freeze139450
-Node: Wish-list139807
-Node: Deficiencies145923
-Node: Procedures147584
-Node: Freeze proceedures148106
-Node: Release149633
-Node: Ideas for further versions150236
-Node: Parameter help and documentation150665
-Node: Ansys process and interpreter buffer152967
-Node: Skeletons outline and abbrevs155830
-Node: Miscellaneous 1157562
-Node: Ansys syntax restrictions not (yet) accounted for162552
-Node: Unknown Ansys stuff163455
-Node: Acknowledgements163738
-Node: GNU Free Documentation License164308
-Node: Variable Index189334
-Node: Concept Index189483
+Node: Minor bugs132017
+Node: Checks132597
+Node: Wishes132880
+Node: Docu133184
+Node: templates135061
+Node: misc135658
+Node: Done136069
+Node: Push and Release Proceedures136308
+Node: Version 2040 1137224
+Node: Version 2030 1137421
+Node: Version 2020 1137639
+Node: Version 2011 1137818
+Node: Version 162-2138290
+Node: Bugs138566
+Node: Freeze139535
+Node: Wish-list139892
+Node: Deficiencies146008
+Node: Procedures147669
+Node: Freeze proceedures148191
+Node: Release149718
+Node: Ideas for further versions150321
+Node: Parameter help and documentation150750
+Node: Ansys process and interpreter buffer153052
+Node: Skeletons outline and abbrevs155915
+Node: Miscellaneous 1157647
+Node: Ansys syntax restrictions not (yet) accounted for162637
+Node: Unknown Ansys stuff163540
+Node: Acknowledgements163823
+Node: GNU Free Documentation License164393
+Node: Variable Index189419
+Node: Concept Index189568
 
 End Tag Table
 

helper/makefile

@@ -109,7 +109,10 @@ ELC : $(ELC_FILES)
 # interesting files besides the essential lisp files
 FILES := ../info/LICENSE ../apdl-mode-readme.txt ../info/README.org \
 	 ../info/TODO.org ../info/NEWS.org ../info/INSTALLATION.org \
-	 ../info/apdl-config.org ../info/apdl-config.el ../info/apdl-mode.info
+	 ../info/apdl-config.org ../info/apdl-mode.org \
+	 ../info/acknowledgements.org ../info/bugs.org ../info/first_steps.org \
+	 ../info/introduction.org ../info/resources.org ../info/tutorial.org \
+	 ../info/usage.org
 
 # all org files which are referenced in README.org have to be exported
 # to markdown .md

info/README.org

@@ -1,9 +1,5 @@
 #+STARTUP: all
-<<<<<<< HEAD
-#+DATE: Time-stamp: <2020-04-14>
-=======
-#+DATE: Time-stamp: <2020-04-15>
->>>>>>> help
+#+DATE: Time-stamp: <2020-04-17>
 #+bind: org-html-preamble-format (("en" "%d"))
 #+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:t arch:headline
 #+OPTIONS: author:t c:t creator:t d:(not "LOGBOOK") date:t

info/TODO.md

@@ -1,16 +1,16 @@
 
 # Table of Contents
 
-1.  [Version 20.5.0](#org1750184)
-2.  [Version 20.4.0](#org8271fec)
-3.  [Version 20.3.0](#orgb02a203)
-4.  [Version 20.2.0](#org2183efc)
-5.  [Version 20.1.1](#org3206a09)
-6.  [Version 162-2](#org05c64f8)
+1.  [Version 20.5.0](#orgc7e6dfb)
+2.  [Version 20.4.0](#org0568e68)
+3.  [Version 20.3.0](#org7f7b1e7)
+4.  [Version 20.2.0](#orgf14e810)
+5.  [Version 20.1.1](#orgda94e20)
+6.  [Version 162-2](#org9332efd)
 
 
 
-<a id="org1750184"></a>
+<a id="orgc7e6dfb"></a>
 
 # TODO Version 20.5.0
 
@@ -20,6 +20,7 @@ help for all get- and parametric-functions
 
 ## Todos, bugs
 
+-   Make text around #+texinfo: lines self sustained!
 -   Templates: Add intro help to the -wb-template system, complete
     usage.org
     -   Code Templates, apdl-wb-custom-template-directory
@@ -28,14 +29,14 @@ help for all get- and parametric-functions
 
 ## Minor bugs
 
--   C-c C-v doesn't preserve point of macro file
+-   C-c C-v doesn't preserve point of the APDL file
 -   M-? parameter counter is not working for commands where functions
     with multiple arguments are in the argument list!
     f,node(x,y,z),,,
--   C-u C-c C-b in browser on Win10 for "All"stuff isn't skipping to
-    the respective section on page for Chrome and Edge!?
 -   \`1/en', en is variable but this fraction is not fontified, though
     \`1/ en' is fontified!
+-   C-u C-c C-b in browser on Win10 for "All"stuff isn't skipping to
+    the respective section on page for Chrome and Edge!?
 
 
 ## Checks
@@ -87,7 +88,7 @@ Info documentation:
 -   work on the Info index
 -   \#+include: #+title adds to info title!
 -   \#+texinfo: @inforef{node,name,file} links to Emacs info pages,
-    done
+    done, make contex self sustained!!
 -   Attention colon ":" in headline gives a texinfo reference!
 -   C-u C-h i: info file :-)
 -   package with file "dir"
@@ -177,18 +178,18 @@ APDL<sub>PATCH</sub> := 0
 apdl-customise-ansys
 
 (tags-query-replace "26\\.3" "27.1")
-(tags-search "((emacs \\"25.1\\"))")
+(tags-search "texinfo:")
 
 
-<a id="org8271fec"></a>
+<a id="org0568e68"></a>
 
 # DONE Version 20.4.0
 
 <span class="timestamp-wrapper"><span class="timestamp">[2020-04-01 Mi]</span></span>
 updated to 2020R1
 
 
-<a id="orgb02a203"></a>
+<a id="org7f7b1e7"></a>
 
 # DONE Version 20.3.0
 
@@ -197,14 +198,14 @@ Melpa
 feature freeze <span class="timestamp-wrapper"><span class="timestamp">[2020-03-20 Fr]</span></span>
 
 
-<a id="org2183efc"></a>
+<a id="orgf14e810"></a>
 
 # DONE Version 20.2.0
 
 <span class="timestamp-wrapper"><span class="timestamp">[2020-03-10 Di]</span></span>
 
 
-<a id="org3206a09"></a>
+<a id="orgda94e20"></a>
 
 # DONE Version 20.1.1
 
@@ -217,7 +218,7 @@ feature freeze <span class="timestamp-wrapper"><span class="timestamp">[2020-03-
 -   bug-report about package.el "NAME-readme.txt", done
 
 
-<a id="org05c64f8"></a>
+<a id="org9332efd"></a>
 
 # Version 162-2