runtime(doc): Renamed "makefile_*.mak" for Vim documentation (#13517)

* Rename makefile_all.mak and makefile_mvc.mak

Signed-off-by: Christian Brabandt <cb@256bit.org>

3 files changed, 105 insertions, 110 deletions

diff --git a/runtime/doc/makefile_all.mak b/runtime/doc/Make_all.mak
index 460130bffb..ed41d7dad7 100644
--- a/runtime/doc/makefile_all.mak
+++ b/runtime/doc/Make_all.mak
@@ -1,4 +1,4 @@
-# makefile with common components
+# Makefile with common components
 
 DOCS = \
 	arabic.txt \
diff --git a/runtime/doc/makefile_mvc.mak b/runtime/doc/Make_mvc.mak
index 218aaa67bc..f9ddf8400f 100644
--- a/runtime/doc/makefile_mvc.mak
+++ b/runtime/doc/Make_mvc.mak
@@ -4,16 +4,16 @@
 # 17.11.23, Restorer, <restorer@mail2k.ru>
 
 # Common components
-!INCLUDE makefile_all.mak
+!INCLUDE Make_all.mak
 
 
 # TODO: to think about what to use instead of awk. PowerShell?
 #AWK =
 
-#
+# Correct the following line for the where executeable file vim is installed
 VIMEXE = D:\Programs\Vim\vim90\vim.exe
 
-#
+# Correct the following line for the directory where gettext et al is installed
 GETTEXT_PATH = D:\Programs\GetText\bin
 
 # In case some package like GnuWin32, UnixUtils
@@ -21,7 +21,7 @@ GETTEXT_PATH = D:\Programs\GetText\bin
 # If the "touch" program is installed on the system, but it is not registered
 # in the %PATH% environment variable, then specify the full path to this file.
 !IF EXIST ("touch.exe")
-TOUCH = touch.exe $@ 
+TOUCH = touch.exe $@
 !ELSE
 TOUCH = @if exist $@ ( copy /b $@+,, ) else ( type nul >$@ )
 !ENDIF
@@ -47,9 +47,9 @@ all : tags perlhtml $(CONVERTED)
 # Use "doctags" to generate the tags file.  Only works for English!
 tags : doctags $(DOCS)
 	doctags $(DOCS) | sort /L C /O tags
-	powershell -nologo -noprofile -Command\
-	"(Get-Content -Raw tags | Get-Unique | % {$$_ -replace \"`r\", \"\"}) |\
-	New-Item -Force -Path . -ItemType file -Name tags"
+	powershell -nologo -noprofile -Command \
+		"(Get-Content -Raw tags | Get-Unique | % {$$_ -replace \"`r\", \"\"}) \
+		| New-Item -Force -Path . -ItemType file -Name tags"
 
 doctags : doctags.c
 	$(CC) doctags.c
@@ -61,16 +61,15 @@ vimtags : $(DOCS)
 	$(VIMEXE) --clean -esX -V1 -u doctags.vim
 
 
-
 uganda.nsis.txt : uganda.*
-	!powershell -nologo -noprofile -Command\
-	$$ext=(Get-Item $?).Extension; (Get-Content $? ^| \
-	% {$$_ -replace '\s*\*[-a-zA-Z0-9.]*\*', '' -replace 'vim:tw=78:.*', ''})\
-	^| Set-Content $*$$ext
-	!powershell -nologo -noprofile -Command\
-	$$ext=(Get-Item $?).Extension;\
-	(Get-Content -Raw $(@B)$$ext).Trim() -replace '(\r\n){3,}', '$$1$$1'\
-	 ^| Set-Content $(@B)$$ext
+	!powershell -nologo -noprofile -Command \
+		$$ext=(Get-Item $?).Extension; (Get-Content $? ^| \
+		% {$$_ -replace '\s*\*[-a-zA-Z0-9.]*\*', '' -replace 'vim:tw=78:.*', ''}) \
+		^| Set-Content $*$$ext
+	!powershell -nologo -noprofile -Command \
+		$$ext=(Get-Item $?).Extension; \
+		(Get-Content -Raw $(@B)$$ext).Trim() -replace '(\r\n){3,}', '$$1$$1' \
+		^| Set-Content $(@B)$$ext
 
 
 # TODO:
@@ -177,9 +176,9 @@ vim-da.UTF-8.1 : vim-da.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimdiff-da.UTF-8.1 : vimdiff-da.1
@@ -187,9 +186,9 @@ vimdiff-da.UTF-8.1 : vimdiff-da.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimtutor-da.UTF-8.1 : vimtutor-da.1
@@ -197,9 +196,9 @@ vimtutor-da.UTF-8.1 : vimtutor-da.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vim-de.UTF-8.1 : vim-de.1
@@ -207,9 +206,9 @@ vim-de.UTF-8.1 : vim-de.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 evim-fr.UTF-8.1 : evim-fr.1
@@ -217,9 +216,9 @@ evim-fr.UTF-8.1 : evim-fr.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vim-fr.UTF-8.1 : vim-fr.1
@@ -227,9 +226,9 @@ vim-fr.UTF-8.1 : vim-fr.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimdiff-fr.UTF-8.1 : vimdiff-fr.1
@@ -237,9 +236,9 @@ vimdiff-fr.UTF-8.1 : vimdiff-fr.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimtutor-fr.UTF-8.1 : vimtutor-fr.1
@@ -247,9 +246,9 @@ vimtutor-fr.UTF-8.1 : vimtutor-fr.1
 	$(ICONV) -f ISO-8859-1 -t utf-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 xxd-fr.UTF-8.1 : xxd-fr.1
@@ -257,9 +256,9 @@ xxd-fr.UTF-8.1 : xxd-fr.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 evim-it.UTF-8.1 : evim-it.1
@@ -267,9 +266,9 @@ evim-it.UTF-8.1 : evim-it.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vim-it.UTF-8.1 : vim-it.1
@@ -277,9 +276,9 @@ vim-it.UTF-8.1 : vim-it.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimdiff-it.UTF-8.1 : vimdiff-it.1
@@ -287,9 +286,9 @@ vimdiff-it.UTF-8.1 : vimdiff-it.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimtutor-it.UTF-8.1 : vimtutor-it.1
@@ -297,9 +296,9 @@ vimtutor-it.UTF-8.1 : vimtutor-it.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 xxd-it.UTF-8.1 : xxd-it.1
@@ -307,9 +306,9 @@ xxd-it.UTF-8.1 : xxd-it.1
 	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 evim-pl.UTF-8.1 : evim-pl.1
@@ -317,9 +316,9 @@ evim-pl.UTF-8.1 : evim-pl.1
 	$(ICONV) -f ISO-8859-2 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vim-pl.UTF-8.1 : vim-pl.1
@@ -327,9 +326,9 @@ vim-pl.UTF-8.1 : vim-pl.1
 	$(ICONV) -f ISO-8859-2 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimdiff-pl.UTF-8.1 : vimdiff-pl.1
@@ -337,9 +336,9 @@ vimdiff-pl.UTF-8.1 : vimdiff-pl.1
 	$(ICONV) -f ISO-8859-2 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimtutor-pl.UTF-8.1 : vimtutor-pl.1
@@ -347,9 +346,9 @@ vimtutor-pl.UTF-8.1 : vimtutor-pl.1
 	$(ICONV) -f ISO-8859-2 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 xxd-pl.UTF-8.1 : xxd-pl.1
@@ -357,9 +356,9 @@ xxd-pl.UTF-8.1 : xxd-pl.1
 	$(ICONV) -f ISO-8859-2 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 evim-ru.UTF-8.1 : evim-ru.1
@@ -367,9 +366,9 @@ evim-ru.UTF-8.1 : evim-ru.1
 	$(ICONV) -f KOI8-R -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vim-ru.UTF-8.1 : vim-ru.1
@@ -377,9 +376,9 @@ vim-ru.UTF-8.1 : vim-ru.1
 	$(ICONV) -f KOI8-R -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimdiff-ru.UTF-8.1 : vimdiff-ru.1
@@ -387,9 +386,9 @@ vimdiff-ru.UTF-8.1 : vimdiff-ru.1
 	$(ICONV) -f KOI8-R -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimtutor-ru.UTF-8.1 : vimtutor-ru.1
@@ -397,9 +396,9 @@ vimtutor-ru.UTF-8.1 : vimtutor-ru.1
 	$(ICONV) -f KOI8-R -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 xxd-ru.UTF-8.1 : xxd-ru.1
@@ -407,22 +406,19 @@ xxd-ru.UTF-8.1 : xxd-ru.1
 	$(ICONV) -f KOI8-R -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 evim-tr.UTF-8.1 : evim-tr.1
 !IF DEFINED (ICONV)
 	$(ICONV) -f ISO-8859-9 -t UTF-8 $? >$@
 !ELSE
-!    IF [powershell -nologo -noprofile "exit $$psversiontable.psversion.major"] == 2
-!    ERROR Для работы требуется программа «PowerShell» версии 3.0 или выше
-!    ENDIF
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vim-tr.UTF-8.1 : vim-tr.1
@@ -430,9 +426,9 @@ vim-tr.UTF-8.1 : vim-tr.1
 	$(ICONV) -f ISO-8859-9 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimdiff-tr.UTF-8.1 : vimdiff-tr.1
@@ -440,9 +436,9 @@ vimdiff-tr.UTF-8.1 : vimdiff-tr.1
 	$(ICONV) -f ISO-8859-9 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 vimtutor-tr.UTF-8.1 : vimtutor-tr.1
@@ -450,9 +446,9 @@ vimtutor-tr.UTF-8.1 : vimtutor-tr.1
 	$(ICONV) -f ISO-8859-9 -t UTF-8 $? >$@
 !ELSE
 # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending
-	powershell -nologo -noprofile -Command\
-	[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^|\
-	1>nul New-Item -Force -Path . -ItemType file -Name $@
+	powershell -nologo -noprofile -Command \
+		[IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \
+		1>nul New-Item -Force -Path . -ItemType file -Name $@
 !ENDIF
 
 
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 0445511b6c..fc042872cf 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -13,9 +13,8 @@ VIMEXE = vim
 # AWK, used for "make html".  Comment this out if the include gives problems.
 include ../../src/auto/config.mk
 
-# 17.10.23, added by Restorer
 # Common components
-include makefile_all.mak
+include Make_all.mak
 
 .SUFFIXES:
 .SUFFIXES: .c .o .txt .html
@@ -148,16 +147,16 @@ os_win32.txt:
 
 # Note that $< works with GNU make while $> works for BSD make.
 # Is there a solution that works for both??
-vim-da.UTF-8.1: vim-da.1		 # 17.10.23, added by Restorer
+vim-da.UTF-8.1: vim-da.1
 	iconv -f latin1 -t utf-8 $< >$@
 
-vimdiff-da.UTF-8.1: vimdiff-da.1	 # 17.10.23, added by Restorer
+vimdiff-da.UTF-8.1: vimdiff-da.1
 	iconv -f latin1 -t utf-8 $< >$@
 
-vimtutor-da.UTF-8.1: vimtutor-da.1	 # 17.10.23, added by Restorer
+vimtutor-da.UTF-8.1: vimtutor-da.1
 	iconv -f latin1 -t utf-8 $< >$@
 
-vim-de.UTF-8.1: vim-de.1		 # 17.10.23, added by Restorer
+vim-de.UTF-8.1: vim-de.1
 	iconv -f latin1 -t utf-8 $< >$@
 
 vim-fr.UTF-8.1: vim-fr.1