Skip to content

Commit 9950b30

Browse files
Prepare 20.6.0 release
1 parent a20b587 commit 9950b30

File tree

4 files changed

+260
-372
lines changed

4 files changed

+260
-372
lines changed

README.md

Lines changed: 45 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
11

22
# Table of Contents
33

4-
<<<<<<< HEAD
5-
1. [Introduction](#orgc23b651)
6-
2. [Some Highlights](#org79557f2)
7-
3. [Installation](#org508e09d)
8-
4. [First Step](#org64f5980)
9-
5. [Configuration and Customisation](#org7a9b408)
10-
6. [Bugs and Problems](#orgd414199)
11-
7. [News](#org6493685)
12-
8. [Further Resources](#org95ec5b8)
13-
9. [Acknowledgements](#orgb99185d)
14-
10. [Todos](#org377952a)
15-
11. [GNU GPL v3 License](#org40ded7f)
16-
=======
17-
1. [Introduction](#org83cff58)
18-
2. [Some Highlights](#orgae74ceb)
19-
3. [Installation](#org48c120a)
20-
4. [First Step](#org87f093b)
21-
5. [Configuration and Customisation](#orgb8c0584)
22-
6. [Bugs and Problems](#orgca9871d)
23-
7. [News](#orgb2ad85c)
24-
8. [Further Resources](#orgd98d848)
25-
9. [Acknowledgements](#org6ffb354)
26-
10. [Todos](#org14f8319)
27-
11. [GNU GPL v3 License](#orgb7c57dd)
28-
>>>>>>> fc8691b... Improve doc/example.mac
4+
1. [Introduction](#org1fed408)
5+
2. [Some Highlights](#org9de73b4)
6+
3. [Installation](#org3b81d25)
7+
4. [First Step](#org0f16bfd)
8+
5. [Configuration and Customisation](#org06077fc)
9+
6. [Bugs and Problems](#org2b56c2c)
10+
7. [News](#org332e539)
11+
8. [Further Resources](#orge7a4150)
12+
9. [Acknowledgements](#orgd2470e2)
13+
10. [Todos](#org428d3e2)
14+
11. [GNU GPL v3 License](#org21a8bce)
2915

3016

3117

@@ -41,11 +27,7 @@ Copyright (C) 2006 - 2021 H. Dieter Wilhelm, GPL V3
4127
![img](doc/ansys+emacs2020-03.png)
4228

4329

44-
<<<<<<< HEAD
45-
<a id="orgc23b651"></a>
46-
=======
47-
<a id="org83cff58"></a>
48-
>>>>>>> fc8691b... Improve doc/example.mac
30+
<a id="org1fed408"></a>
4931

5032
# Introduction
5133

@@ -85,11 +67,7 @@ Workbench changes and you can pull-in the updated content with the
8567
![img](doc/connect_command_snippet_to_file.png)
8668

8769

88-
<<<<<<< HEAD
89-
<a id="org79557f2"></a>
90-
=======
91-
<a id="orgae74ceb"></a>
92-
>>>>>>> fc8691b... Improve doc/example.mac
70+
<a id="org9de73b4"></a>
9371

9472
# Some Highlights
9573

@@ -115,14 +93,18 @@ Since Ansys v191 the online help is the default. APDL-Mode is
11593
using your default browser but to be able to access the online help
11694
you must register or you must start the online help once from any
11795
licensed Ansys product. I recommend installing the local Ansys
118-
documentation package, access time is much shorter.
96+
documentation, access time is much shorter. You can download the
97+
"help installer" from their Customer Portal.
11998

12099
The image below is showing a manual entry in GNU-Emacs' EWW
121100
browser. You are able to consult the manuals side-by-side your
122101
APDL code.
123102

124103
![img](doc/browse_manual.png)
125104

105+
Please read the [apdl-config](info/apdl-config.md) documentation on how configure EWW as
106+
default browser or check the accompanying [configuration template](apdl-config.el).
107+
126108

127109
## Command Object Templates and Code Highlighting Example
128110

@@ -155,11 +137,7 @@ The image below shows the unhidden content.
155137
![img](doc/unhidden_blocks.png)
156138

157139

158-
<<<<<<< HEAD
159-
<a id="org508e09d"></a>
160-
=======
161-
<a id="org48c120a"></a>
162-
>>>>>>> fc8691b... Improve doc/example.mac
140+
<a id="org3b81d25"></a>
163141

164142
# Installation
165143

@@ -182,13 +160,19 @@ for Emacs version 25.1 or newer.
182160

183161
Please add
184162

163+
(package-initialize)
185164
(add-to-list 'package-archives
186-
'("melpa" . "https://melpa.org/packages/") t)
165+
'("melpa" . "https://melpa.org/packages/") t)
166+
167+
to your initialisation file. Activate this code (for example by
168+
restarting Emacs), then type \`M-x install-package', answer the
169+
prompt with "apdl-mode" and conclude this command with <RET>.
187170

188-
to your initialisation file. Then type: \`M-x list-packages', find
189-
\`apdl-mode', mark it with \`i' and install it with \`x'.
171+
(You might also install it with GNU-Emacs' package interface \`M-x
172+
list-packages', find \`apdl-mode', mark it with \`i' and install it
173+
with \`x'.)
190174

191-
If you prefer the stable package archive instead of development
175+
If you prefer the stable package archive instead of the development
192176
versions, exchange above package source with
193177

194178
(add-to-list 'package-archives
@@ -199,7 +183,7 @@ versions, exchange above package source with
199183

200184
If you are behind a corporate firewall and you are not able to
201185
install APDL-Mode from Emacs' package menu, you can download and
202-
install APDL-Mode manually:
186+
install its package manually:
203187

204188
- Download the latest APDL-Mode's tar package from [Melpa](https://melpa.org/#/apdl-mode) or - for a
205189
released package - from the [Github release page](https://github.com/dieter-wilhelm/apdl-mode/releases/) under Assets.
@@ -209,10 +193,10 @@ install APDL-Mode manually:
209193
That's it.
210194

211195
**Hint:** If you are getting an error message "package.el is not yet
212-
initialised", you are using Emacs' packaging system for the very
213-
first time. It is necessary to initialise this machinery once,
214-
please type: \`M-: (package-initialize) <RET>' (it's an 'ALT + :'
215-
colon!) and then apply \`M-x package-install-file <RET>' again.
196+
initialised", you are using Emacs' packaging system for the first
197+
time. It is necessary to initialise this machinery once, please
198+
type: \`M-: (package-initialize) <RET>' (it's an 'ALT + :' colon!)
199+
and then apply \`M-x package-install-file <RET>' again.
216200

217201

218202
## Development and Source Code Installation
@@ -226,26 +210,18 @@ or download the GitHub ZIP archive and add the following line
226210

227211
(require 'apdl-mode)
228212

229-
to your initialisation file (the source directory must be set in
230-
the \`load-path' variable as well).
213+
to your initialisation file (the source directory must be set in the
214+
\`load-path' variable as well).
231215

232216

233-
<<<<<<< HEAD
234-
<a id="org64f5980"></a>
235-
=======
236-
<a id="org87f093b"></a>
237-
>>>>>>> fc8691b... Improve doc/example.mac
217+
<a id="org0f16bfd"></a>
238218

239219
# First Step
240220

241221
Please type \`M-x apdl' which opens a buffer in APDL-Mode where you
242222
can inspect the menu bar's \`APDL' and \`MAPDL' entries. For existing
243223
APDL files please type \`M-x apdl-mode' if the mode is not activated
244-
<<<<<<< HEAD
245-
already, please see in [5](#org7a9b408),
246-
=======
247-
already, please see in [5](#orgb8c0584),
248-
>>>>>>> fc8691b... Improve doc/example.mac
224+
already, please see in [5](#org06077fc),
249225
the section regarding preconfigured file suffixes.
250226

251227
For further guidance please select the APDL menu \`APDL-Mode
@@ -254,11 +230,7 @@ Documentation' (or type \`C-c C-h') and \`Describe APDL-Mode' (or type
254230
introductory APDL-Mode [tutorial](https://dieter-wilhelm.github.io/apdl-mode/doc/A-M_introductory_tutorial.pdf).
255231

256232

257-
<<<<<<< HEAD
258-
<a id="org7a9b408"></a>
259-
=======
260-
<a id="orgb8c0584"></a>
261-
>>>>>>> fc8691b... Improve doc/example.mac
233+
<a id="org06077fc"></a>
262234

263235
# Configuration and Customisation
264236

@@ -274,11 +246,7 @@ Please read the [apdl-config](info/apdl-config.md) documentation for further opt
274246
open the accompanying configuration [example-file](apdl-config.el).
275247

276248

277-
<<<<<<< HEAD
278-
<a id="orgd414199"></a>
279-
=======
280-
<a id="orgca9871d"></a>
281-
>>>>>>> fc8691b... Improve doc/example.mac
249+
<a id="org2b56c2c"></a>
282250

283251
# Bugs and Problems
284252

@@ -303,34 +271,22 @@ following options:
303271
[Emacs Wiki](https://www.emacswiki.org).
304272

305273

306-
<<<<<<< HEAD
307-
<a id="org6493685"></a>
308-
=======
309-
<a id="orgb2ad85c"></a>
310-
>>>>>>> fc8691b... Improve doc/example.mac
274+
<a id="org332e539"></a>
311275

312276
# News
313277

314278
For further news please have a look into the [NEWS](info/NEWS.md) file.
315279

316280

317-
<<<<<<< HEAD
318-
<a id="org95ec5b8"></a>
319-
=======
320-
<a id="orgd98d848"></a>
321-
>>>>>>> fc8691b... Improve doc/example.mac
281+
<a id="orge7a4150"></a>
322282

323283
# Further Resources
324284

325285
If you want to read further details regarding the APDL scripting,
326286
GNU-Emacs and other APDL editors please read the [RESOURCES](info/resources.md) file.
327287

328288

329-
<<<<<<< HEAD
330-
<a id="orgb99185d"></a>
331-
=======
332-
<a id="org6ffb354"></a>
333-
>>>>>>> fc8691b... Improve doc/example.mac
289+
<a id="orgd2470e2"></a>
334290

335291
# Acknowledgements
336292

@@ -345,22 +301,14 @@ I received, moreover, support and feedback from many individuals.
345301
Thank you very much!
346302

347303

348-
<<<<<<< HEAD
349-
<a id="org377952a"></a>
350-
=======
351-
<a id="org14f8319"></a>
352-
>>>>>>> fc8691b... Improve doc/example.mac
304+
<a id="org428d3e2"></a>
353305

354306
# Todos
355307

356308
Please check the [TODO](info/TODO.md) file.
357309

358310

359-
<<<<<<< HEAD
360-
<a id="org40ded7f"></a>
361-
=======
362-
<a id="orgb7c57dd"></a>
363-
>>>>>>> fc8691b... Improve doc/example.mac
311+
<a id="org21a8bce"></a>
364312

365313
# GNU GPL v3 License
366314

apdl-initialise.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
(defconst apdl-mode-version "20.6.0"
4040
"The APDL-Mode version string.")
4141

42-
(defconst apdl-mode-update "2021-10-02"
42+
(defconst apdl-mode-update "2021-11-14"
4343
"APDL-Mode packaging date string in yyyy-mm-dd format.
4444
This is for the APDL-Mode development versions to check the time
4545
of packaging.")

0 commit comments

Comments
 (0)