diff --git a/UPGRADE b/UPGRADE
index 21217a6938e1caf8a53213f1049ba41fc2e7eafb..7f29cf1af01b0d94a1a7a277ac8dc205bee12d64 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -257,3 +257,9 @@ Beta 2 switched the config file format to JSON. Steps to upgrade:
 
 The OS definition also need to be upgraded. There is a new version of the
 debian-etch-instance OS (0.2) that goes along with beta 2.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/doc/design-htools-2.3.rst b/doc/design-htools-2.3.rst
index 1e5cd3bbf12066bf07acee7e3caf11f692411531..527963f07bdf13931c5eb7dad31b5e7f4c1f0dc7 100644
--- a/doc/design-htools-2.3.rst
+++ b/doc/design-htools-2.3.rst
@@ -319,3 +319,9 @@ evacuation or not.
 
 In case that Ganeti doesn't provide complete cluster data, just the
 local group, the inter-group relocation won't be attempted.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/doc/design-oob.rst b/doc/design-oob.rst
index 51e8e8aa72d6c18769e68d2f469617df84420515..f6aebbccc1dc1bfa50914a14d88f62e5105ef848 100644
--- a/doc/design-oob.rst
+++ b/doc/design-oob.rst
@@ -386,3 +386,9 @@ The ``gnt-node power-[on|off]`` (power state changes) commands will create log
 entries following current Ganeti logging practices. In addition, health items
 with status WARNING or CRITICAL will be logged for each run of ``gnt-node
 health``.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/footer.rst b/man/footer.rst
index 98e63973827c1f0d21b7da582e8cbb8beb22b4f6..44d7f958d84e9155449fc91ff96508ffbfccf0e2 100644
--- a/man/footer.rst
+++ b/man/footer.rst
@@ -38,3 +38,9 @@ option) any later version.
 
 On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-cleaner.rst b/man/ganeti-cleaner.rst
index 78feebe72f29779ab5f51b1c1bdf61d5b22d8faa..ca37a5f0fd0edb89b1a39583b177267043ab697d 100644
--- a/man/ganeti-cleaner.rst
+++ b/man/ganeti-cleaner.rst
@@ -21,3 +21,9 @@ certificates and keys.
 **ganeti-cleaner** automatically removes all files older than 21 days
 from ``@LOCALSTATEDIR@/lib/ganeti/queue/archive`` and all expired
 certificates and keys from ``@LOCALSTATEDIR@/run/ganeti/crypto``.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-confd.rst b/man/ganeti-confd.rst
index 3370664eb0905252fd2913bc55a4e1be6f52fd34..b937751ef50671bfdf5b2d55062f9743924b5f38 100644
--- a/man/ganeti-confd.rst
+++ b/man/ganeti-confd.rst
@@ -47,3 +47,9 @@ format, over UDP. A client library is provided to make it easy to
 write software to query confd. More information can be found in the
 Ganeti 2.1 design doc, and an example usage can be seen in the
 (external) NBMA daemon for Ganeti.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-listrunner.rst b/man/ganeti-listrunner.rst
index bfa0cad7fab28dfd5d3a5a1993d5cd971ce1ff03..12fddda92d9c9a2128d2de6396fabd96f6b45ddb 100644
--- a/man/ganeti-listrunner.rst
+++ b/man/ganeti-listrunner.rst
@@ -96,3 +96,9 @@ SEE ALSO
 --------
 
 dsh(1), cssh(1)
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-masterd.rst b/man/ganeti-masterd.rst
index 34fad8d5d01efdf93de4860b9fe364518aef0f18..b435d0710445c8fd79f5a74158410ecabe5448e8 100644
--- a/man/ganeti-masterd.rst
+++ b/man/ganeti-masterd.rst
@@ -76,3 +76,9 @@ COMMUNICATION PROTOCOL
 The master accepts commands over a Unix socket, using JSON
 serialized messages separated by a specific byte sequence. For more
 details, see the design documentation supplied with Ganeti.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-noded.rst b/man/ganeti-noded.rst
index 63cbade07d5f37c8d43d7b88c1da2fb99d9a136d..fcc8b60168f26566a485a44f6d7ab6b8edb75cbe 100644
--- a/man/ganeti-noded.rst
+++ b/man/ganeti-noded.rst
@@ -61,3 +61,9 @@ COMMUNICATION PROTOCOL
 
 Currently the master-node RPC is done using a simple RPC protocol
 built using JSON over HTTP(S).
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-os-interface.rst b/man/ganeti-os-interface.rst
index ba9380982f4eba9cc09ec918778124da2e66b760..e531e4eda2367f2d44ad2563d9e0eb0cf21792af 100644
--- a/man/ganeti-os-interface.rst
+++ b/man/ganeti-os-interface.rst
@@ -338,3 +338,9 @@ definition to version 5 by creating the rename script simply as::
     exit 0
 
 Note that the script must be executable.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-rapi.rst b/man/ganeti-rapi.rst
index 2e5e3b4114c3b2531071ca285fbc4a58dab8bfe9..35ba870f5f141be091090a816b2b662da0ff6008 100644
--- a/man/ganeti-rapi.rst
+++ b/man/ganeti-rapi.rst
@@ -56,3 +56,9 @@ different than not using authentication at all.
 
 More details (including on how to use hashed passwords) can be found
 in the Ganeti documentation.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti-watcher.rst b/man/ganeti-watcher.rst
index cc38a83cb4e355bf4d6b8432522d24a74f490d27..3a55595fe1de2f96a76d6b7ec3ee2847f77167b6 100644
--- a/man/ganeti-watcher.rst
+++ b/man/ganeti-watcher.rst
@@ -74,3 +74,9 @@ and a log file at ``@LOCALSTATEDIR@/log/ganeti/watcher.log``. Removal
 of either file will not affect correct operation; the removal of the
 state file will just cause the restart counters for the instances to
 reset to zero.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/ganeti.rst b/man/ganeti.rst
index 90399f881de83d2cf60918ff934820257762f3b2..9b31845d79ee5827a902c830c492793ea8610b38 100644
--- a/man/ganeti.rst
+++ b/man/ganeti.rst
@@ -292,3 +292,9 @@ Common daemon functionality
 
 All Ganeti daemons re-open the log file(s) when sent a SIGHUP signal.
 **logrotate**(8) can be used to rotate Ganeti's log files.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-backup.rst b/man/gnt-backup.rst
index 106efd01089a5f3cdeeec555e06e34d1c3f50536..74bf9158079052662ac42de087c02f89758bed51 100644
--- a/man/gnt-backup.rst
+++ b/man/gnt-backup.rst
@@ -224,3 +224,9 @@ REMOVE
 Removes the backup for the given instance name, if any. If the backup
 was for a deleted instance, it is needed to pass the FQDN of the
 instance, and not only the short hostname.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index 1205a95f6522602e56c32566a6369f036aa32a9b..08e275cee0cf262af6d96f91f768ac7eb24f75d2 100644
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -611,3 +611,9 @@ VERSION
 **version**
 
 Show the cluster version.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-debug.rst b/man/gnt-debug.rst
index 805cf7e86f7e3ab41282dcf9fc79789b2d6fbe05..639274ac66502bd5f9105cc39db8136c2e145b8c 100644
--- a/man/gnt-debug.rst
+++ b/man/gnt-debug.rst
@@ -118,3 +118,9 @@ the entire list of fields.
 
 Use ``--interval`` to repeat the listing. A delay specified by the
 option value in seconds is inserted.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-group.rst b/man/gnt-group.rst
index f65ccb4418eac51cc8839c2749bebac05a759b9f..068ef4a7a48fc17f4c25d06f047d4cee07bd6130 100644
--- a/man/gnt-group.rst
+++ b/man/gnt-group.rst
@@ -136,3 +136,9 @@ RENAME
 | **rename** {*oldname*} {*newname*}
 
 Renames a given group from *oldname* to *newname*.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index 397466ed177ab5983ad556228dccd9a8ca520d54..9f78629c81ca0f860fa53518929674f9e3a4d525 100644
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -1350,3 +1350,7 @@ you do, tags from both sources will be removed). A file name of - will
 be interpreted as stdin.
 
 .. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-job.rst b/man/gnt-job.rst
index 4b07af3f08bb7f5f1b19dfadcee4284866f9f433..6b31cb022cd4111d04fa3dad7c799f5bb76aa109 100644
--- a/man/gnt-job.rst
+++ b/man/gnt-job.rst
@@ -135,3 +135,9 @@ WATCH
 
 This command follows the output of the job by the given *id* and
 prints it.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-node.rst b/man/gnt-node.rst
index 98e8177dc1dd4bd536edd3de2f9108a9c584666c..1874cca6ed304b079ef82db7d84d9be37a6d27fd 100644
--- a/man/gnt-node.rst
+++ b/man/gnt-node.rst
@@ -530,3 +530,9 @@ element with their status in a ``item=status`` manner. Where ``item`` is script
 specific and ``status`` can be one of ``OK``, ``WARNING``, ``CRITICAL`` or
 ``UNKNOWN``. Items with status ``WARNING`` or ``CRITICAL`` are logged and
 annotated in the command line output.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/gnt-os.rst b/man/gnt-os.rst
index 401ea91b8ff5956178f74e3ac8ea330e1953cefc..ac47c68f61cab11e92e9f3a81800c6d5f88658a2 100644
--- a/man/gnt-os.rst
+++ b/man/gnt-os.rst
@@ -65,3 +65,9 @@ creations (but can be used for reinstalling old instances).
 Note: The given operating system doesn't have to exists. This allows
 preseeding the settings for operating systems not yet known to
 **gnt-os**.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/hail.rst b/man/hail.rst
index e5a5156f0a2edfa340672489513129ac5c07b75d..c4f7fb75c45c70054e2defac3fbe13f7490f2287 100644
--- a/man/hail.rst
+++ b/man/hail.rst
@@ -93,3 +93,9 @@ EXIT STATUS
 
 The exist status of the command will be zero, unless for some reason
 the algorithm fatally failed (e.g. wrong node or instance data).
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/hbal.rst b/man/hbal.rst
index edff5dfc58f36f2f869ee05ab319309276d469a8..f8f2fb1a5a393d7cf6baea4b384a52754d20edb1 100644
--- a/man/hbal.rst
+++ b/man/hbal.rst
@@ -647,3 +647,9 @@ e.g. in step 8, both the migrate and the replace-disks are
 done. Otherwise, if only the migrate is done, the input data is
 changed in a way that the program will output a different solution
 list (but hopefully will end in the same state).
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/hscan.rst b/man/hscan.rst
index f5b78650efab7f3fdde17b5395aee8d3dd2514ea..8a6f7aca1b4db7d5439dc3c9c8c257dbbf6c6ee4 100644
--- a/man/hscan.rst
+++ b/man/hscan.rst
@@ -107,3 +107,9 @@ EXAMPLE
     cluster1     2     2     0     0   1008    652    255    253 0.24404762
     $ ls -l cluster1.data
     -rw-r--r-- 1 root root 364 2009-03-23 07:26 cluster1.data
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/man/hspace.rst b/man/hspace.rst
index 386b4ad67a8d771fd0e3367df7b1bf44ddf057c8..bb87e3364e68e85e40a6a11397f68412889c6a92 100644
--- a/man/hspace.rst
+++ b/man/hspace.rst
@@ -401,3 +401,9 @@ really big clusters.
 The algorithm doesn't rebalance the cluster or try to get the optimal
 fit; it just allocates in the best place for the current step, without
 taking into consideration the impact on future placements.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End: