From f5e175647515b5e34c265dadad524e83c695cc93 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 20 Jun 2014 23:01:12 +0200 Subject: [PATCH] DOCS: remove en/ sub-directory This additional sub-directory doesn't serve any purpose anymore. Get rid of it. --- DOCS/man/{en => }/af.rst | 0 DOCS/man/{en => }/ao.rst | 0 DOCS/man/{en => }/changes.rst | 0 DOCS/man/{en => }/encode.rst | 0 DOCS/man/{en => }/input.rst | 0 DOCS/man/{en => }/lua.rst | 0 DOCS/man/{en => }/mpv.rst | 0 DOCS/man/{en => }/options.rst | 0 DOCS/man/{en => }/osc.rst | 0 DOCS/man/{en => }/vf.rst | 0 DOCS/man/{en => }/vo.rst | 0 README.md | 2 +- etc/input.conf | 2 +- old-makefile | 24 ++++++++++++------------ wscript_build.py | 12 ++++++------ 15 files changed, 20 insertions(+), 20 deletions(-) rename DOCS/man/{en => }/af.rst (100%) rename DOCS/man/{en => }/ao.rst (100%) rename DOCS/man/{en => }/changes.rst (100%) rename DOCS/man/{en => }/encode.rst (100%) rename DOCS/man/{en => }/input.rst (100%) rename DOCS/man/{en => }/lua.rst (100%) rename DOCS/man/{en => }/mpv.rst (100%) rename DOCS/man/{en => }/options.rst (100%) rename DOCS/man/{en => }/osc.rst (100%) rename DOCS/man/{en => }/vf.rst (100%) rename DOCS/man/{en => }/vo.rst (100%) diff --git a/DOCS/man/en/af.rst b/DOCS/man/af.rst similarity index 100% rename from DOCS/man/en/af.rst rename to DOCS/man/af.rst diff --git a/DOCS/man/en/ao.rst b/DOCS/man/ao.rst similarity index 100% rename from DOCS/man/en/ao.rst rename to DOCS/man/ao.rst diff --git a/DOCS/man/en/changes.rst b/DOCS/man/changes.rst similarity index 100% rename from DOCS/man/en/changes.rst rename to DOCS/man/changes.rst diff --git a/DOCS/man/en/encode.rst b/DOCS/man/encode.rst similarity index 100% rename from DOCS/man/en/encode.rst rename to DOCS/man/encode.rst diff --git a/DOCS/man/en/input.rst b/DOCS/man/input.rst similarity index 100% rename from DOCS/man/en/input.rst rename to DOCS/man/input.rst diff --git a/DOCS/man/en/lua.rst b/DOCS/man/lua.rst similarity index 100% rename from DOCS/man/en/lua.rst rename to DOCS/man/lua.rst diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/mpv.rst similarity index 100% rename from DOCS/man/en/mpv.rst rename to DOCS/man/mpv.rst diff --git a/DOCS/man/en/options.rst b/DOCS/man/options.rst similarity index 100% rename from DOCS/man/en/options.rst rename to DOCS/man/options.rst diff --git a/DOCS/man/en/osc.rst b/DOCS/man/osc.rst similarity index 100% rename from DOCS/man/en/osc.rst rename to DOCS/man/osc.rst diff --git a/DOCS/man/en/vf.rst b/DOCS/man/vf.rst similarity index 100% rename from DOCS/man/en/vf.rst rename to DOCS/man/vf.rst diff --git a/DOCS/man/en/vo.rst b/DOCS/man/vo.rst similarity index 100% rename from DOCS/man/en/vo.rst rename to DOCS/man/vo.rst diff --git a/README.md b/README.md index b09593c5b1..4b3fbd846f 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ instead. To contact the `mpv` team in private write to `mpv-team@googlegroups.com`. -[changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/man/en/changes.rst +[changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/man/changes.rst [mpv-build]: https://github.com/mpv-player/mpv-build [homebrew-mpv]: https://github.com/mpv-player/homebrew-mpv [issue-tracker]: https://github.com/mpv-player/mpv/issues diff --git a/etc/input.conf b/etc/input.conf index 325ff57b48..af5d5159e8 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -2,7 +2,7 @@ # # You are able to redefine default keyboard/joystick/mouse/LIRC bindings, or # add new ones here. -# See DOCS/man/en/input.rst for possible commands that can be bound. +# See DOCS/man/input.rst for possible commands that can be bound. # Also see mpv --input-cmdlist for other possible options. # The file should be placed in the $HOME/.mpv directory. # diff --git a/old-makefile b/old-makefile index 915bb08115..6649f583ce 100644 --- a/old-makefile +++ b/old-makefile @@ -289,7 +289,7 @@ INSTALL_MAN = ifeq ($(BUILD_MAN),yes) INSTALL_MAN += install-mpv-man - ALL_TARGETS += DOCS/man/en/mpv.1 + ALL_TARGETS += DOCS/man/mpv.1 endif DIRS = . \ @@ -402,14 +402,14 @@ version.h .version: version.sh common/version.c: version.h -DOCS/man/en/mpv.1: DOCS/man/en/af.rst \ - DOCS/man/en/ao.rst \ - DOCS/man/en/changes.rst \ - DOCS/man/en/encode.rst \ - DOCS/man/en/input.rst \ - DOCS/man/en/options.rst \ - DOCS/man/en/vf.rst \ - DOCS/man/en/vo.rst +DOCS/man/mpv.1: DOCS/man/af.rst \ + DOCS/man/ao.rst \ + DOCS/man/changes.rst \ + DOCS/mancode.rst \ + DOCS/man/input.rst \ + DOCS/man/options.rst \ + DOCS/man/vf.rst \ + DOCS/man/vo.rst ###### installation / clean / generic rules ####### @@ -429,9 +429,9 @@ install-%-strip: % install-dirs install-mpv-man: install-mpv-man-en -install-mpv-man-en: DOCS/man/en/mpv.1 +install-mpv-man-en: DOCS/man/mpv.1 if test ! -d $(MANDIR)/man1 ; then $(INSTALL) -d $(MANDIR)/man1 ; fi - $(INSTALL) -m 644 DOCS/man/en/mpv.1 $(MANDIR)/man1/ + $(INSTALL) -m 644 DOCS/man/mpv.1 $(MANDIR)/man1/ ICONSIZES = 16x16 32x32 64x64 @@ -461,7 +461,7 @@ install-data: install-mpv-icons install-mpv-desktop install-mpv-config install-m uninstall: $(RM) $(BINDIR)/mpv - $(RM) $(MANDIR)/man1/mpv.1 $(MANDIR)/en/man1/mpv.1 + $(RM) $(MANDIR)/man1/mpv.1 $(MANDIR)/man1/mpv.1 $(RM) $(prefix)/share/applications/mpv.desktop $(RM) $(prefix)/share/zsh/vendor-completions/_mpv $(RM) $(foreach size,$(ICONSIZES),$(prefix)/share/icons/hicolor/$(size)/apps/mpv.png) diff --git a/wscript_build.py b/wscript_build.py index 88c836e278..4f7efdfbb9 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -5,18 +5,18 @@ def _add_rst_manual_dependencies(ctx): options.rst ao.rst vo.rst af.rst vf.rst encode.rst input.rst osc.rst lua.rst changes.rst""".split() - manpage_sources = ['DOCS/man/en/'+x for x in manpage_sources_basenames] + manpage_sources = ['DOCS/man/'+x for x in manpage_sources_basenames] for manpage_source in manpage_sources: ctx.add_manual_dependency( - ctx.path.find_node('DOCS/man/en/mpv.rst'), + ctx.path.find_node('DOCS/man/mpv.rst'), ctx.path.find_node(manpage_source)) def _build_man(ctx): ctx( name = 'rst2man', - target = 'DOCS/man/en/mpv.1', - source = 'DOCS/man/en/mpv.rst', + target = 'DOCS/man/mpv.1', + source = 'DOCS/man/mpv.rst', rule = '${RST2MAN} ${SRC} ${TGT}', install_path = ctx.env.MANDIR + '/man1') @@ -25,8 +25,8 @@ def _build_man(ctx): def _build_pdf(ctx): ctx( name = 'rst2pdf', - target = 'DOCS/man/en/mpv.pdf', - source = 'DOCS/man/en/mpv.rst', + target = 'DOCS/man/mpv.pdf', + source = 'DOCS/man/mpv.rst', rule = '${RST2PDF} -c --repeat-table-rows ${SRC} -o ${TGT}', install_path = ctx.env.DOCDIR)