Merge branch 'master' of git.emacsconf.org:emacsconf-wiki

7 files changed, 19 insertions, 19 deletions

diff --git a/2020/schedule-details.txt b/2020/schedule-details.txt
index 48ffe616..7b44b328 100644
--- a/2020/schedule-details.txt
+++ b/2020/schedule-details.txt
@@ -36,7 +36,7 @@
 <tr><td width=100> 9:56 AM</td><td width=100>10:46 AM</td><td><a href="/2020/schedule/23">Incremental Parsing with emacs-tree-sitter</a></td><td>Tuấn-Anh Nguyễn</td></tr>
 <tr><td width=100>10:49 AM</td><td width=100>11:09 AM</td><td><a href="/2020/schedule/24">Analyze code quality through Emacs: a smart forensics approach and the story of a hack</a></td><td>Andrea</td></tr>
 <tr><td width=100>11:12 AM</td><td width=100>11:22 AM</td><td><a href="/2020/schedule/25">Traverse complex JSON structures with live feedback</a></td><td>Zen Monk Alain M. Lafon</td></tr>
-<tr><td width=100>11:25 AM</td><td width=100>11:45 AM</td><td><a href="/2020/schedule/39">Non-GNU ELPA</a></td><td>Richard Stallman</td></tr>
+<tr><td width=100>11:25 AM</td><td width=100>11:45 AM</td><td><a href="/2020/schedule/39">NonGNU ELPA</a></td><td>Richard Stallman</td></tr>
 <tr><td colspan="4"><strong>12:00 - 13:00 Lunch<strong></td></tr>
 <tr><td colspan="4"><strong>13:00 - 16:30 Afternoon talks<strong></td></tr>
 <tr><td width=100> 1:03 PM</td><td width=100> 1:13 PM</td><td><a href="/2020/schedule/26">Emacs as a Highschooler: How It Changed My Life</a></td><td>Pierce Wang</td></tr>
diff --git a/2020/schedule.md b/2020/schedule.md
index f102a68a..8e433be8 100644
--- a/2020/schedule.md
+++ b/2020/schedule.md
@@ -44,7 +44,7 @@ Please note that the times on this schedule are a rough approximation, and that
 <tr><td width=100> 9:56 AM</td><td width=100>10:46 AM</td><td><a href="/2020/schedule/23">Incremental Parsing with emacs-tree-sitter</a></td><td>Tuấn-Anh Nguyễn</td></tr>
 <tr><td width=100>10:49 AM</td><td width=100>11:09 AM</td><td><a href="/2020/schedule/24">Analyze code quality through Emacs: a smart forensics approach and the story of a hack</a></td><td>Andrea</td></tr>
 <tr><td width=100>11:12 AM</td><td width=100>11:22 AM</td><td><a href="/2020/schedule/25">Traverse complex JSON structures with live feedback</a></td><td>Zen Monk Alain M. Lafon</td></tr>
-<tr><td width=100>11:25 AM</td><td width=100>11:45 AM</td><td><a href="/2020/schedule/39">Non-GNU ELPA</a></td><td>Richard Stallman</td></tr>
+<tr><td width=100>11:25 AM</td><td width=100>11:45 AM</td><td><a href="/2020/schedule/39">NonGNU ELPA</a></td><td>Richard Stallman</td></tr>
 <tr><td colspan="4"><strong>12:00 - 13:00 Lunch<strong></td></tr>
 <tr><td colspan="4"><strong>13:00 - 16:30 Afternoon talks<strong></td></tr>
 <tr><td width=100> 1:03 PM</td><td width=100> 1:13 PM</td><td><a href="/2020/schedule/26">Emacs as a Highschooler: How It Changed My Life</a></td><td>Pierce Wang</td></tr>
diff --git a/2020/schedule/25.md b/2020/schedule/25.md
index 16875643..35144db0 100644
--- a/2020/schedule/25.md
+++ b/2020/schedule/25.md
@@ -3,7 +3,7 @@
 
 Back to the [[schedule]]  
 Previous: <a href="/2020/schedule/24">Analyze code quality through Emacs: a smart forensics approach and the story of a hack</a>  
-Next: <a href="/2020/schedule/39">Non-GNU ELPA</a>  
+Next: <a href="/2020/schedule/39">NonGNU ELPA</a>  
 
 
 # Traverse complex JSON structures with live feedback
@@ -37,7 +37,7 @@ counsel-jq and how to build similar completion functionality.
 
 Back to the [[schedule]]  
 Previous: <a href="/2020/schedule/24">Analyze code quality through Emacs: a smart forensics approach and the story of a hack</a>  
-Next: <a href="/2020/schedule/39">Non-GNU ELPA</a>  
+Next: <a href="/2020/schedule/39">NonGNU ELPA</a>  
 
 
 All times are approximate, and we might shuffle talks around as needed.
diff --git a/2020/schedule/26.md b/2020/schedule/26.md
index 3ee15469..a6610113 100644
--- a/2020/schedule/26.md
+++ b/2020/schedule/26.md
@@ -2,7 +2,7 @@
 [[!meta copyright="Copyright &copy; 2020 Pierce Wang"]]
 
 Back to the [[schedule]]  
-Previous: <a href="/2020/schedule/39">Non-GNU ELPA</a>  
+Previous: <a href="/2020/schedule/39">NonGNU ELPA</a>  
 Next: <a href="/2020/schedule/27">State of Retro Gaming in Emacs</a>  
 
 
@@ -31,7 +31,7 @@ various sources both from inside and outside the Emacs community.
 
 
 Back to the [[schedule]]  
-Previous: <a href="/2020/schedule/39">Non-GNU ELPA</a>  
+Previous: <a href="/2020/schedule/39">NonGNU ELPA</a>  
 Next: <a href="/2020/schedule/27">State of Retro Gaming in Emacs</a>  
 
 
diff --git a/2020/schedule/39.md b/2020/schedule/39.md
index 1a88a944..f21207a8 100644
--- a/2020/schedule/39.md
+++ b/2020/schedule/39.md
@@ -1,4 +1,4 @@
-[[!meta title="Non-GNU ELPA"]]
+[[!meta title="NonGNU ELPA"]]
 [[!meta copyright="Copyright &copy; 2020 Richard Stallman"]]
 
 Back to the [[schedule]]  
@@ -6,11 +6,11 @@ Previous: <a href="/2020/schedule/25">Traverse complex JSON structures with live
 Next: <a href="/2020/schedule/26">Emacs as a Highschooler: How It Changed My Life</a>  
 
 
-# Non-GNU ELPA
+# NonGNU ELPA
 Sunday, Nov 29 2020, 11:25 AM - 11:45 AM  
 Richard Stallman
 
-TBD - plans for a non-GNU ELPA that will be easy to enable and contribute to without signing copyright assignment papers
+TBD - plans for a NonGNU ELPA that will be easy to enable and contribute to without signing copyright assignment papers
 
 
 
diff --git a/2020/submissions.md b/2020/submissions.md
index a9aa7110..820fdf7d 100644
--- a/2020/submissions.md
+++ b/2020/submissions.md
@@ -512,7 +512,7 @@ You can check out the Org Mode source for this page by following the [editing in
     
     <tr>
     <td class="org-left"><span class="timestamp-wrapper"><span class="timestamp">[2020-11-29 Sun 11:25]&#x2013;[2020-11-29 Sun 11:45]</span></span></td>
-    <td class="org-left">Non-GNU ELPA</td>
+    <td class="org-left">NonGNU ELPA</td>
     <td class="org-left">Richard Stallman</td>
     <td class="org-left">planned</td>
     <td class="org-left">tbd</td>
@@ -876,7 +876,7 @@ You can check out the Org Mode source for this page by following the [editing in
 <tr>
 <td class="org-left">planned</td>
 <td class="org-left"><span class="timestamp-wrapper"><span class="timestamp">[2020-11-29 Sun 11:25]&#x2013;[2020-11-29 Sun 11:45]</span></span></td>
-<td class="org-left">Non-GNU ELPA</td>
+<td class="org-left">NonGNU ELPA</td>
 <td class="org-left">Richard Stallman</td>
 </tr>
 
@@ -2735,7 +2735,7 @@ You can check out the Org Mode source for this page by following the [editing in
 
 <tr>
 <td class="org-left"><span class="timestamp-wrapper"><span class="timestamp">[2020-11-29 Sun 11:25]&#x2013;[2020-11-29 Sun 11:45]</span></span></td>
-<td class="org-left">Non-GNU ELPA</td>
+<td class="org-left">NonGNU ELPA</td>
 <td class="org-left">Richard Stallman</td>
 <td class="org-left">planned</td>
 <td class="org-left">tbd</td>
@@ -3038,11 +3038,11 @@ You can check out the Org Mode source for this page by following the [editing in
         sublicensable to the EmacsConf organizers or that my use of them is
         fair use.
 
--   in-progress Non-GNU ELPA
+-   in-progress NonGNU ELPA
 
 -   Abstract
 
-    TBD - plans for a non-GNU ELPA that will be easy to enable and contribute to without signing copyright assignment papers
+    TBD - plans for a NonGNU ELPA that will be easy to enable and contribute to without signing copyright assignment papers
 
 
 <a id="orgc674abb"></a>
diff --git a/2020/submissions.org b/2020/submissions.org
index b833a4e0..2a7e9ca7 100644
--- a/2020/submissions.org
+++ b/2020/submissions.org
@@ -92,7 +92,7 @@ You can check out the Org Mode source for this page by following the [[https://e
 | [2020-11-29 Sun 09:56-10:46] | Incremental Parsing with emacs-tree-sitter                                             | Tuấn-Anh Nguyễn         | planned | GMT+7, so earlier is better (9:30 EST?). Can pre-record and answer questions. |
 | [2020-11-29 Sun 10:49-11:09] | Analyze code quality through Emacs: a smart forensics approach and the story of a hack | Andrea                  | planned | ok                                                                            |
 | [2020-11-29 Sun 11:12-11:22] | Traverse complex JSON structures with live feedback                                    | Zen Monk Alain M. Lafon | planned | Available both days, birthday on the 28th                                     |
-| [2020-11-29 Sun 11:25-11:45] | Non-GNU ELPA                                                                           | Richard Stallman        | planned | tbd                                                                           |
+| [2020-11-29 Sun 11:25-11:45] | NonGNU ELPA                                                                            | Richard Stallman        | planned | tbd                                                                           |
 #+END:
 
 **** 13:00 - 16:30 Afternoon talks                             :afternoon:
@@ -143,7 +143,7 @@ You can check out the Org Mode source for this page by following the [[https://e
 | planned | [2020-11-29 Sun 09:56-10:46] | Incremental Parsing with emacs-tree-sitter                                             | Tuấn-Anh Nguyễn                                      |
 | planned | [2020-11-29 Sun 10:49-11:09] | Analyze code quality through Emacs: a smart forensics approach and the story of a hack | Andrea                                               |
 | planned | [2020-11-29 Sun 11:12-11:22] | Traverse complex JSON structures with live feedback                                    | Zen Monk Alain M. Lafon                              |
-| planned | [2020-11-29 Sun 11:25-11:45] | Non-GNU ELPA                                                                           | Richard Stallman                                     |
+| planned | [2020-11-29 Sun 11:25-11:45] | NonGNU ELPA                                                                            | Richard Stallman                                     |
 |         | [2020-11-29 Sun 13:03-13:13] | Emacs as a Highschooler: How It Changed My Life                                        | Pierce Wang                                          |
 |         | [2020-11-29 Sun 13:16-13:26] | State of Retro Gaming in Emacs                                                         | Vasilij "wasamasa" Schneidermann                     |
 |         | [2020-11-29 Sun 13:29-14:19] | Welcome To The Dungeon                                                                 | Erik Elmshauser and Corwin Brust                     |
@@ -1799,7 +1799,7 @@ SCHEDULED: <2020-11-29 Sun 09:00-09:10>
 | [2020-11-29 Sun 09:56-10:46] | Incremental Parsing with emacs-tree-sitter                                             | Tuấn-Anh Nguyễn         | planned | GMT+7, so earlier is better (9:30 EST?). Can pre-record and answer questions. |
 | [2020-11-29 Sun 10:49-11:09] | Analyze code quality through Emacs: a smart forensics approach and the story of a hack | Andrea                  | planned | ok                                                                            |
 | [2020-11-29 Sun 11:12-11:22] | Traverse complex JSON structures with live feedback                                    | Zen Monk Alain M. Lafon | planned | Available both days, birthday on the 28th                                     |
-| [2020-11-29 Sun 11:25-11:45] | Non-GNU ELPA                                                                           | Richard Stallman        | planned | tbd                                                                           |
+| [2020-11-29 Sun 11:25-11:45] | NonGNU ELPA                                                                            | Richard Stallman        | planned | tbd                                                                           |
 #+END:
 
 **** in-progress Emacs development update
@@ -2144,7 +2144,7 @@ material owned by third parties, I represent that the material is
 sublicensable to the EmacsConf organizers or that my use of them is
 fair use.
 
-**** in-progress Non-GNU ELPA
+**** in-progress NonGNU ELPA
      SCHEDULED: <2020-11-29 Sun 11:25-11:45>
      :PROPERTIES:
      :PREREC:   planned
@@ -2158,7 +2158,7 @@ fair use.
      
 **** Abstract
      
-TBD - plans for a non-GNU ELPA that will be easy to enable and contribute to without signing copyright assignment papers
+TBD - plans for a NonGNU ELPA that will be easy to enable and contribute to without signing copyright assignment papers
 
 *** 12:00 - 13:00 Lunch
 SCHEDULED: <2020-11-29 Sun 12:00-13:00>