From 0086c0a53b17d99bb336832f45899ee1fb6a67b7 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 11 May 2015 17:30:18 -0400 Subject: [PATCH] Man pages: Move to nvim namespace and out of `runtime/` Also clean up man page references in `runtime/doc/Makefile` as it doesn't deal with them anymore. --- .../manpages/de/vim-de.1 => man/de/nvim-de.1 | 0 .../manpages/fr/vim-fr.1 => man/fr/nvim-fr.1 | 0 .../fr/vimtutor-fr.1 => man/fr/nvimtutor-fr.1 | 0 {runtime/doc/manpages => man}/fr/xxd-fr.1 | 0 .../manpages/it/vim-it.1 => man/it/nvim-it.1 | 0 .../it/vimtutor-it.1 => man/it/nvimtutor-it.1 | 0 {runtime/doc/manpages => man}/it/xxd-it.1 | 0 .../manpages/ja/vim-ja.1 => man/ja/nvim-ja.1 | 0 .../ja/vimtutor-ja.1 => man/ja/nvimtutor-ja.1 | 0 {runtime/doc/manpages => man}/ja/xxd-ja.1 | 0 runtime/doc/manpages/vim.1 => man/nvim.1 | 0 .../manpages/vimtutor.1 => man/nvimtutor.1 | 0 .../manpages/pl/vim-pl.1 => man/pl/nvim-pl.1 | 0 .../pl/vimtutor-pl.1 => man/pl/nvimtutor-pl.1 | 0 {runtime/doc/manpages => man}/pl/xxd-pl.1 | 0 .../manpages/ru/vim-ru.1 => man/ru/nvim-ru.1 | 0 .../ru/vimtutor-ru.1 => man/ru/nvimtutor-ru.1 | 0 {runtime/doc/manpages => man}/ru/xxd-ru.1 | 0 {runtime/doc/manpages => man}/xxd.1 | 0 runtime/doc/Makefile | 33 ++----------------- 20 files changed, 3 insertions(+), 30 deletions(-) rename runtime/doc/manpages/de/vim-de.1 => man/de/nvim-de.1 (100%) rename runtime/doc/manpages/fr/vim-fr.1 => man/fr/nvim-fr.1 (100%) rename runtime/doc/manpages/fr/vimtutor-fr.1 => man/fr/nvimtutor-fr.1 (100%) rename {runtime/doc/manpages => man}/fr/xxd-fr.1 (100%) rename runtime/doc/manpages/it/vim-it.1 => man/it/nvim-it.1 (100%) rename runtime/doc/manpages/it/vimtutor-it.1 => man/it/nvimtutor-it.1 (100%) rename {runtime/doc/manpages => man}/it/xxd-it.1 (100%) rename runtime/doc/manpages/ja/vim-ja.1 => man/ja/nvim-ja.1 (100%) rename runtime/doc/manpages/ja/vimtutor-ja.1 => man/ja/nvimtutor-ja.1 (100%) rename {runtime/doc/manpages => man}/ja/xxd-ja.1 (100%) rename runtime/doc/manpages/vim.1 => man/nvim.1 (100%) rename runtime/doc/manpages/vimtutor.1 => man/nvimtutor.1 (100%) rename runtime/doc/manpages/pl/vim-pl.1 => man/pl/nvim-pl.1 (100%) rename runtime/doc/manpages/pl/vimtutor-pl.1 => man/pl/nvimtutor-pl.1 (100%) rename {runtime/doc/manpages => man}/pl/xxd-pl.1 (100%) rename runtime/doc/manpages/ru/vim-ru.1 => man/ru/nvim-ru.1 (100%) rename runtime/doc/manpages/ru/vimtutor-ru.1 => man/ru/nvimtutor-ru.1 (100%) rename {runtime/doc/manpages => man}/ru/xxd-ru.1 (100%) rename {runtime/doc/manpages => man}/xxd.1 (100%) diff --git a/runtime/doc/manpages/de/vim-de.1 b/man/de/nvim-de.1 similarity index 100% rename from runtime/doc/manpages/de/vim-de.1 rename to man/de/nvim-de.1 diff --git a/runtime/doc/manpages/fr/vim-fr.1 b/man/fr/nvim-fr.1 similarity index 100% rename from runtime/doc/manpages/fr/vim-fr.1 rename to man/fr/nvim-fr.1 diff --git a/runtime/doc/manpages/fr/vimtutor-fr.1 b/man/fr/nvimtutor-fr.1 similarity index 100% rename from runtime/doc/manpages/fr/vimtutor-fr.1 rename to man/fr/nvimtutor-fr.1 diff --git a/runtime/doc/manpages/fr/xxd-fr.1 b/man/fr/xxd-fr.1 similarity index 100% rename from runtime/doc/manpages/fr/xxd-fr.1 rename to man/fr/xxd-fr.1 diff --git a/runtime/doc/manpages/it/vim-it.1 b/man/it/nvim-it.1 similarity index 100% rename from runtime/doc/manpages/it/vim-it.1 rename to man/it/nvim-it.1 diff --git a/runtime/doc/manpages/it/vimtutor-it.1 b/man/it/nvimtutor-it.1 similarity index 100% rename from runtime/doc/manpages/it/vimtutor-it.1 rename to man/it/nvimtutor-it.1 diff --git a/runtime/doc/manpages/it/xxd-it.1 b/man/it/xxd-it.1 similarity index 100% rename from runtime/doc/manpages/it/xxd-it.1 rename to man/it/xxd-it.1 diff --git a/runtime/doc/manpages/ja/vim-ja.1 b/man/ja/nvim-ja.1 similarity index 100% rename from runtime/doc/manpages/ja/vim-ja.1 rename to man/ja/nvim-ja.1 diff --git a/runtime/doc/manpages/ja/vimtutor-ja.1 b/man/ja/nvimtutor-ja.1 similarity index 100% rename from runtime/doc/manpages/ja/vimtutor-ja.1 rename to man/ja/nvimtutor-ja.1 diff --git a/runtime/doc/manpages/ja/xxd-ja.1 b/man/ja/xxd-ja.1 similarity index 100% rename from runtime/doc/manpages/ja/xxd-ja.1 rename to man/ja/xxd-ja.1 diff --git a/runtime/doc/manpages/vim.1 b/man/nvim.1 similarity index 100% rename from runtime/doc/manpages/vim.1 rename to man/nvim.1 diff --git a/runtime/doc/manpages/vimtutor.1 b/man/nvimtutor.1 similarity index 100% rename from runtime/doc/manpages/vimtutor.1 rename to man/nvimtutor.1 diff --git a/runtime/doc/manpages/pl/vim-pl.1 b/man/pl/nvim-pl.1 similarity index 100% rename from runtime/doc/manpages/pl/vim-pl.1 rename to man/pl/nvim-pl.1 diff --git a/runtime/doc/manpages/pl/vimtutor-pl.1 b/man/pl/nvimtutor-pl.1 similarity index 100% rename from runtime/doc/manpages/pl/vimtutor-pl.1 rename to man/pl/nvimtutor-pl.1 diff --git a/runtime/doc/manpages/pl/xxd-pl.1 b/man/pl/xxd-pl.1 similarity index 100% rename from runtime/doc/manpages/pl/xxd-pl.1 rename to man/pl/xxd-pl.1 diff --git a/runtime/doc/manpages/ru/vim-ru.1 b/man/ru/nvim-ru.1 similarity index 100% rename from runtime/doc/manpages/ru/vim-ru.1 rename to man/ru/nvim-ru.1 diff --git a/runtime/doc/manpages/ru/vimtutor-ru.1 b/man/ru/nvimtutor-ru.1 similarity index 100% rename from runtime/doc/manpages/ru/vimtutor-ru.1 rename to man/ru/nvimtutor-ru.1 diff --git a/runtime/doc/manpages/ru/xxd-ru.1 b/man/ru/xxd-ru.1 similarity index 100% rename from runtime/doc/manpages/ru/xxd-ru.1 rename to man/ru/xxd-ru.1 diff --git a/runtime/doc/manpages/xxd.1 b/man/xxd.1 similarity index 100% rename from runtime/doc/manpages/xxd.1 rename to man/xxd.1 diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 36ea60860f..07b4226151 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -12,31 +12,10 @@ VIMEXE = vim DOCS = $(wildcard *.txt) HTMLS = $(DOCS:.txt=.html) -MANPAGES = \ - manpages/vim.man \ - manpages/vimtutor.man \ - manpages/xxd.man \ - manpages/de/vim-de.man \ - manpages/fr/vim-fr.man \ - manpages/fr/vimtutor-fr.man \ - manpages/fr/xxd-fr.man \ - manpages/pl/vim-pl.man \ - manpages/pl/vimtutor-pl.man \ - manpages/pl/xxd-pl.man \ - manpages/it/vim-it.man \ - manpages/it/vimtutor-it.man \ - manpages/it/xxd-it.man \ - manpages/ru/vim-ru.man \ - manpages/ru/vimtutor-ru.man \ - manpages/ru/xxd-ru.man \ - manpages/ja/vim-ja.man \ - manpages/ja/vimtutor-ja.man \ - manpages/ja/xxd-ja.man - .SUFFIXES: -.SUFFIXES: .c .o .txt .html .1 .man +.SUFFIXES: .c .o .txt .html -all: tags manpages html +all: tags html # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. @@ -51,12 +30,6 @@ tags: doctags $(DOCS) doctags: doctags.c $(CC) doctags.c -o doctags -manpages: $(MANPAGES) - -# OSX groff doesn't support utf-8 as input encoding, so this won't work there. -.1.man: - groff -k -mandoc -Tutf8 $< | sed -e s/.^H//g > $@ - # Awk version of .txt to .html conversion. html: noerrors tags $(HTMLS) @if test -f errors.log; then cat errors.log; fi @@ -81,5 +54,5 @@ tags.ref tags.html: tags $(AWK) -f maketags.awk tags >tags.html clean: - -rm -f doctags *.html tags.ref $(MANPAGES) $(HTMLS) errors.log + -rm -f doctags *.html tags.ref $(HTMLS) errors.log