diff options
| author | Paul Eggert | 2017-11-02 21:02:12 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-11-02 21:02:12 -0700 |
| commit | aa7542467238b06ed056054965ba444595b85453 (patch) | |
| tree | 3071c15ff777ef5727ccd254d9ddbf513a06c0cc /test | |
| parent | 5fcfdf433d74e8ecb35f86fdc071ce11ca0b0364 (diff) | |
| parent | a87ce5c4b41ca8146c764b1186a6162c069b1933 (diff) | |
| download | emacs-aa7542467238b06ed056054965ba444595b85453.tar.gz emacs-aa7542467238b06ed056054965ba444595b85453.zip | |
Merge from origin/emacs-26
a87ce5c4b4 * src/lisp.h (GCALIGNED): Clarify comment (Bug#29040).
8a31e9993f ; etc/NEWS: Add cpp-message-min-time-interval. (Bug#28961)
ac0bb9a192 Improve the doc of eshell-cmpl-* custom variables (Bug#25069)
36400c7dc9 Fix mouse-scrollbar offset on GNUstep and old macOS (bug#2...
04bc1410c2 Merge from Gnulib
6b08ad5263 Fix alignment portability problems
a9f8706fa8 Fix completion of colon after CSS property (Bug#29056)
9031dec527 ; * src/alloc.c (sweep_symbols): Fix last change.
fdd3dcfa4e * src/alloc.c (sweep_symbols): Tweak last change
27964af438 In frame parameters documentation mention desktop saving/r...
1bd4e7c243 ; Fix typo in ChangeLog.3
4182a60d31 Don't have frameset save the 'client' parameter (Bug#29067)
9d31a97092 ; Spelling fixes
460a25f212 Handle generic variables in cl-defgeneric Edebug spec
dc0a25c2f9 Give a more sensible message if file-attributes fails (Bug...
8453423c7c Avoid wrong value from file-attributes on Linux kernel bef...
70621e2571 Fix customization of debugger-print-function (Bug#29077)
# Conflicts:
# etc/NEWS
Diffstat (limited to 'test')
| -rw-r--r-- | test/manual/etags/html-src/software.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/manual/etags/html-src/software.html b/test/manual/etags/html-src/software.html index 7a85b9ab5e6..9c4f0dde8ea 100644 --- a/test/manual/etags/html-src/software.html +++ b/test/manual/etags/html-src/software.html | |||
| @@ -75,7 +75,7 @@ | |||
| 75 | protocol studies: | 75 | protocol studies: |
| 76 | <UL> | 76 | <UL> |
| 77 | <LI> <A HREF="/curriculum/pot-abstracts.html#R03:FODAIBEAvsDistributed-IJSC96"> | 77 | <LI> <A HREF="/curriculum/pot-abstracts.html#R03:FODAIBEAvsDistributed-IJSC96"> |
| 78 | <i>Comparison between distributed and centralised demand | 78 | <i>Comparison between distributed and centralized demand |
| 79 | assignment TDMA satellite access schemes</i></A> | 79 | assignment TDMA satellite access schemes</i></A> |
| 80 | 80 | ||
| 81 | <LI><A HREF="/curriculum/pot-abstracts.html#R07:FODAIBEAvsCFRA-IJSC97"> | 81 | <LI><A HREF="/curriculum/pot-abstracts.html#R07:FODAIBEAvsCFRA-IJSC97"> |
| @@ -225,7 +225,7 @@ if that happens so I can update this page. | |||
| 225 | decoding. I keep a <A HREF="codes.html">mirror</A> of this page. | 225 | decoding. I keep a <A HREF="codes.html">mirror</A> of this page. |
| 226 | 226 | ||
| 227 | <DT>Forward error correcting codes by Phil Karn | 227 | <DT>Forward error correcting codes by Phil Karn |
| 228 | <DD>Phil Karn's optimised really <A HREF="http://www.ka9q.net/code/fec/">free | 228 | <DD>Phil Karn's optimized really <A HREF="http://www.ka9q.net/code/fec/">free |
| 229 | codes</A>. | 229 | codes</A>. |
| 230 | 230 | ||
| 231 | </DL> | 231 | </DL> |