From cf0f0133dd94266fa58f375a9d8bf0d2fc53a171 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Sun, 3 Mar 2024 14:22:51 +0900
Subject: [PATCH] Ch09: rephrase and reorder

Signed-off-by: Osamu Aoki <osamu@debian.org>
---
 rawxml/09_system_tips.rawxml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/rawxml/09_system_tips.rawxml b/rawxml/09_system_tips.rawxml
index 574c3e98..21a4cc94 100644
--- a/rawxml/09_system_tips.rawxml
+++ b/rawxml/09_system_tips.rawxml
@@ -326,6 +326,7 @@ xnoremap * y/\V&lt;C-R&gt;"&lt;CR&gt;
 xnoremap # y?\V&lt;C-R&gt;"&lt;CR&gt;
 """ repeat last substitute and *KEEP* flags
 nnoremap &amp; :&amp;&amp;&lt;CR&gt;</screen>
+        <para>In order for the above keybindings to function properly, the terminal program needs to be configured to generate "ASCII DEL" for <literal>Backspace</literal>-key and "Escape sequence" for <literal>Delete</literal>-key.</para>
         <para>Other miscellaneous configuration can be changed in user's vimrc file.  E.g.:</para>
         <!--
           I excluded ripgrep for :grep since this is non-essential
@@ -363,9 +364,17 @@ augroup END</screen>
       </section>
       <section id="_customizing_vim_with_external_packages">
         <title>Customizing vim with external packages</title>
-        <para>Simple customization to enable secure-modelines and classical IDE can be enabled by installing <ulink url="https://packages.debian.org/unstable/vim-scripts">vim-scripts</ulink> package and appending the following to user's vimrc file.</para>
+        <para>Interesting external plugin packages can be found:</para>
+        <itemizedlist>
+          <listitem> <para> <ulink url="https://www.vim.org/"> Vim - the ubiquitous text editor </ulink> -- The official upstream site of Vim and vim scripts </para> </listitem>
+          <listitem> <para> <ulink url="https://vimawesome.com/"> VimAwsome </ulink> -- The listing of Vim plugins </para> </listitem>
+          <listitem> <para> <ulink url="https://packages.debian.org/unstable/vim-scripts">vim-scripts</ulink> -- Debian package: a collection of vim scripts </para> </listitem>
+        </itemizedlist>
+        <para>Plugin packages in the <ulink url="https://packages.debian.org/unstable/vim-scripts">vim-scripts</ulink> package can be enabled using user's vimrc file.  E.g.:</para>
         <!--
           I admit I don't use these now.  But I need to keep these as an example.
+          I know "set pastetoggle" is out of place but I wanted "leader" here.
+          I don't want to discuss disabled secure-modeline feature in Debian's Vim package.
         -->
         <screen>packadd! secure-modelines
 packadd! winmanager
@@ -374,8 +383,7 @@ let mapleader = ' '
 set pastetoggle=&lt;leader&gt;p
 " IDE-like UI for files and buffers with &lt;space&gt;w
 nnoremap &lt;leader&gt;w         :WMToggle&lt;CR&gt;</screen>
-        <para>In order for the above keybindings to function properly, the terminal program needs to be configured to generate "ASCII DEL" for <literal>Backspace</literal>-key and "Escape sequence" for <literal>Delete</literal>-key.</para>
-        <para>The new native Vim package system works nicely with "<literal>git</literal>" and "<literal>git submodule</literal>".  One such example configuration can be found at <ulink url="https://github.com/osamuaoki/dot-vim">my git repository: dot-vim</ulink>.  This does essentially:</para>
+        <para>The new native Vim package system works nicely with "<literal>git</literal>" and "<literal>git submodule</literal>".  One such example configuration can be found at <ulink url="https://github.com/osamuaoki/dot-vim/tree/old">my git repository: dot-vim</ulink>.  This does essentially:</para>
         <itemizedlist>
           <listitem> <para>By using "<literal>git</literal>" and "<literal>git submodule</literal>", latest external packages, such as "<literal><emphasis>name</emphasis></literal>", are placed into <literal>~/.vim/pack/*/opt/<emphasis>name</emphasis></literal> and similar.</para> </listitem>
           <listitem> <para>By adding <literal>:packadd! <emphasis>name</emphasis></literal> line to user's vimrc file, these packages are placed on <literal>runtimepath</literal>.</para> </listitem>
@@ -383,12 +391,6 @@ nnoremap &lt;leader&gt;w         :WMToggle&lt;CR&gt;</screen>
           <listitem> <para>At the end of its initialization, tags for the installed documents are updated with "<literal>helptags ALL</literal>".</para> </listitem>
         </itemizedlist>
         <para>For more, please start <literal>vim</literal> with "<literal>vim --startuptime vimstart.log</literal>" to check actual execution sequence and time spent for each step.</para>
-        <para>Interesting external plugin packages can be found:</para>
-        <itemizedlist>
-          <listitem> <para> <ulink url="https://www.vim.org/"> Vim - the ubiquitous text editor </ulink> -- The official upstream site of Vim and vim scripts </para> </listitem>
-          <listitem> <para> <ulink url="https://vimawesome.com/"> VimAwsome </ulink> -- The listing of Vim plugins </para> </listitem>
-          <listitem> <para> <ulink url="https://packages.debian.org/unstable/vim-scripts">vim-scripts</ulink> -- Debian package: a collection of vim scripts </para> </listitem>
-        </itemizedlist>
         <para>It is quite confusing to see too many ways<footnote><para> <ulink url="https://packages.debian.org/unstable/vim-pathogen">vim-pathogen</ulink> was popular.  </para></footnote> to manage and load these external packages to <literal>vim</literal>.  Checking the original information is the best cure.</para>
         <table>
           <title>Information on the initialization of <literal>vim</literal></title>