Fix C++ highlighting

Weirdly enough, "c++" works with markdown files but not with org
files, where only "cpp" works.

While in there, make all tags lowercase for consistency.  This is what
org-insert-structure-template generates.

3 files changed, 18 insertions, 18 deletions

diff --git a/guides/setups/operating-systems/debian.org b/guides/setups/operating-systems/debian.org
index bf8a810..cc7bf0e 100644
--- a/guides/setups/operating-systems/debian.org
+++ b/guides/setups/operating-systems/debian.org
@@ -47,12 +47,12 @@ sudo apt install ${packages[@]}
 - unpack it =$SOMEWHERE=
 - make sure everyone can find it:
 
-#+BEGIN_SRC sh
+#+begin_src sh
 $ sudo update-alternatives --install $(which x-www-browser) x-www-browser \
                            ${SOMEWHERE}/firefox/firefox 1
 $ sudo update-alternatives --set x-www-browser ${SOMEWHERE}/firefox/firefox
 $ ln -s ${SOMEWHERE}/firefox/firefox ~/.local/bin/
-#+END_SRC
+#+end_src
 
 - paste backuped profile into =~/.mozilla/firefox/${profile}=
 **** Symbola
@@ -184,11 +184,11 @@ Format: Custom format: =%d %b, %R=
 ** Setup more stuff
 *** lightdm
 Show my account on startup:
-#+BEGIN_SRC conf
+#+begin_src conf
 # /usr/share/lightdm/lightdm.conf.d/99_custom.conf
 [Seat:*]
 greeter-hide-users=false
-#+END_SRC
+#+end_src
 *** system groups
 #+begin_src sh
 groups=(
@@ -253,11 +253,11 @@ N: No packages found
 
 [[https://www.debian.org/vote/2006/vote_001][Oh.]]  Well then,
 
-#+BEGIN_SRC sh
+#+begin_src sh
 $ sudo sed -ri 's/^([^#].+ main)$/\1 contrib non-free/' /etc/apt/sources.list
 $ # While in there…
 $ sudo sed -ri 's/^(deb|deb-src) http:/\1 https:/' /etc/apt/sources.list
-#+END_SRC
+#+end_src
 
 What now?
 
@@ -274,9 +274,9 @@ N: See apt-secure(8) manpage for repository creation and user configuration deta
 
 🤨
 
-#+BEGIN_SRC sh
+#+begin_src sh
 $ sudo sed -ri 's/security\.debian\.org/deb.debian.org/' /etc/apt/sources.list
-#+END_SRC
+#+end_src
 
 [[https://wiki.debian.org/SourcesList#Example_sources.list][🤷]]
 
@@ -314,7 +314,7 @@ Greybird
 Patch the xfwm-tabwin style to prevent the mouse from screwing with
 Alt-Tab:
 
-#+BEGIN_SRC diff
+#+begin_src diff
 diff -u /usr/share/themes/Greybird/gtk-2.0/gtkrc.bkp /usr/share/themes/Greybird/gtk-2.0/gtkrc
 --- /usr/share/themes/Greybird/gtk-2.0/gtkrc.bkp
 +++ /usr/share/themes/Greybird/gtk-2.0/gtkrc
@@ -329,7 +329,7 @@ diff -u /usr/share/themes/Greybird/gtk-2.0/gtkrc.bkp /usr/share/themes/Greybird/
  
  	fg[NORMAL]	= shade (0.8, @base_color)
  	fg[ACTIVE]	= @base_color
-#+END_SRC
+#+end_src
 *** configure more stuff
 **** lightdm
 Debian [[https://wiki.debian.org/LightDM#Enable_user_list][hides the list of users]] on the login screen; Bunsenlabs [[https://github.com/BunsenLabs/bunsen-configs/blob/9.6-1/lightdm.conf.d/50_bunsen.conf][enables
@@ -401,9 +401,9 @@ had left an error marker somewhere?].  Steps taken:
 ** Samsung NC10
 *** fix Ethernet after suspend
 Workaround:
-#+BEGIN_SRC sh
+#+begin_src sh
 $ sudo modprobe -r sky2 && sudo modprobe -i sky2
-#+END_SRC
+#+end_src
 References:
 - https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1841304
 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895378
diff --git a/itches/emacs/language-support.org b/itches/emacs/language-support.org
index d784f2b..8ec766e 100644
--- a/itches/emacs/language-support.org
+++ b/itches/emacs/language-support.org
@@ -21,7 +21,7 @@ E.g. ="an ${expression} that should be highlighted"=.
 ** Do not highlight single-quoted command substitutions
 E.g. ='this $(call) should not be highlighted'=.
 ** Fix indentation on continuation lines
-#+BEGIN_SRC shell
+#+begin_src shell
 # cf
 # - electric-indent-post-self-insert-function
 # - indent-according-to-mode
@@ -35,7 +35,7 @@ foo_bar \
     indentisstill4
 ${foo}bar \
       indentisfoobar
-#+END_SRC
+#+end_src
 
 
 * Makefile
@@ -61,7 +61,7 @@ TeX-insert-quote erases the region and inserts =``= instead.
 *** =catcode`$= starts a math environment
 Minimal example:
 
-#+BEGIN_SRC latex
+#+begin_src latex
 \documentclass{article}
 
 \usepackage{fancyvrb}
@@ -84,7 +84,7 @@ Things decreased: \textcolor{green}{-49.22%} (514 $\searrow$ 261)
 \end{Verbatim}
 
 \end{document}
-#+END_SRC
+#+end_src
 
 Can workaround it with =\catcode36= instead of =\catcode`$=.
 *** saving does not add a final newline
diff --git a/itches/emacs/tracker.org b/itches/emacs/tracker.org
index 64317a0..ba198b0 100644
--- a/itches/emacs/tracker.org
+++ b/itches/emacs/tracker.org
@@ -46,7 +46,7 @@ First reported as [[https://github.com/dgutov/diff-hl/issues/142][dgutov/diff-hl
 To make =C-x [0-9]= more accessible on AZERTY.  Firefox does this, cf
 [[https://hg.mozilla.org/mozilla-unified/file/FIREFOX_80_0_1_RELEASE/widget/gtk/nsGtkKeyUtils.cpp#l1207][here]]:
 
-#+begin_src c++
+#+begin_src cpp
   // Retry with shifted keycode.
   guint shiftState = (baseState | keymapWrapper->GetModifierMask(SHIFT));
   uint32_t shiftedChar = keymapWrapper->GetCharCodeFor(aGdkKeyEvent, shiftState,
@@ -62,7 +62,7 @@ To make =C-x [0-9]= more accessible on AZERTY.  Firefox does this, cf
 
 and [[https://hg.mozilla.org/mozilla-unified/file/FIREFOX_80_0_1_RELEASE/widget/gtk/nsGtkKeyUtils.cpp#l1896][there]]:
 
-#+begin_src c++
+#+begin_src cpp
 uint32_t KeymapWrapper::GetCharCodeFor(const GdkEventKey* aGdkKeyEvent,
                                        guint aModifierState, gint aGroup) {
   guint keyval;