DOCS: remove en/ sub-directory

This additional sub-directory doesn't serve any purpose anymore. Get rid
of it.

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

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.
 #

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)

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)