diff --git a/Client-configuration.md b/Client-configuration.md
index 9de27d4..5ea1909 100644
--- a/Client-configuration.md
+++ b/Client-configuration.md
@@ -24,14 +24,15 @@ pick the one that's best for you.
 **Note**: square brackets []() in examples indicate optional parts.
 When using the example, delete the square brackets.
 
-##  Configuration files 
+##  Configuration files
 
 The configuration is read from: **cc_config.xml**, **nvc_config.xml**, and (for each project) **app_config.xml**.
 If the file is absent, the default configuration is used.
 To create or edit the file, use a text editor such as Notepad,
 and save it in your [BOINC Data directory](BOINC_Data_directory) or project directory.
 
-###  Client configuration 
+###  
+<h2 id="Client">Client configuration</h2> 
 
 The **cc_config.xml** file has the format:
 
@@ -45,7 +46,8 @@ The **cc_config.xml** file has the format:
     </cc_config>
 
 
-####  Options 
+####  
+<h3 id="Options">Options</h3> 
 
 The <tt><options></tt> section contains settings that control the behavior of BOINC
 (default values will be used for any options not specified):
@@ -603,7 +605,8 @@ Resets inter-project debts. Intended to be applied one time, then tag set back t
 </dl>
 
 
-####  Logging flags 
+####  
+<h3 id="Logging">Logging flags</h3> 
 
 The BOINC client writes "log messages" describing what it's doing.
 These are written to stdout, and to the BOINC Manager's "Event log".
@@ -954,7 +957,8 @@ Work fetch policy decisions.
 </dl>
 
 
-###  Project-level configuration 
+###  
+<h2 id="Project-level">Project-level configuration</h2>
 
 This mechanism allows you to specify scheduling parameters for specific applications
 or app versions.
@@ -1111,7 +1115,8 @@ If set, report this project's completed tasks immediately.
 
 If you remove **app_config.xml**, or one of its entries, you must reset the project in order to restore the proper values.
 
-###  Branded-client configuration 
+###  
+<h2 id="Branded-client">Branded-client configuration</h2> 
 
 The **nvc_config.xml** file contains up to four tags.
 This file is used mainly by ''branded'' clients to set special values used to determine and report whether there is a newer version available for download.
@@ -1165,7 +1170,8 @@ The URL to use when checking network connectivity; default is **http://www.googl
 </dl>
 
 
-##  Command-line options 
+##  
+<h3 id="Command-line">Command-line options</h3> 
 The BOINC client has the following command-line options.
 More detailed control, and the ability to interact with a running client, is provided by the [boinccmd tool](boinccmd_tool).
 
@@ -1410,7 +1416,8 @@ Contact a project's server to obtain new preferences. This will also report comp
 </dl>
 
 
-####  Debugging options 
+####  
+<h3 id="Debugging">Debugging options</h3> 
 The following command-line options are for debugging:
 
 <dl><dt>