summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/af.rst (renamed from DOCS/man/en/af.rst)0
-rw-r--r--DOCS/man/ao.rst (renamed from DOCS/man/en/ao.rst)0
-rw-r--r--DOCS/man/changes.rst (renamed from DOCS/man/en/changes.rst)0
-rw-r--r--DOCS/man/encode.rst (renamed from DOCS/man/en/encode.rst)0
-rw-r--r--DOCS/man/input.rst (renamed from DOCS/man/en/input.rst)0
-rw-r--r--DOCS/man/lua.rst (renamed from DOCS/man/en/lua.rst)0
-rw-r--r--DOCS/man/mpv.rst (renamed from DOCS/man/en/mpv.rst)0
-rw-r--r--DOCS/man/options.rst (renamed from DOCS/man/en/options.rst)0
-rw-r--r--DOCS/man/osc.rst (renamed from DOCS/man/en/osc.rst)0
-rw-r--r--DOCS/man/vf.rst (renamed from DOCS/man/en/vf.rst)0
-rw-r--r--DOCS/man/vo.rst (renamed from DOCS/man/en/vo.rst)0
-rw-r--r--README.md2
-rw-r--r--etc/input.conf2
-rw-r--r--old-makefile24
-rw-r--r--wscript_build.py12
15 files changed, 20 insertions, 20 deletions
diff --git a/DOCS/man/en/af.rst b/DOCS/man/af.rst
index 0512376ff2..0512376ff2 100644
--- a/DOCS/man/en/af.rst
+++ b/DOCS/man/af.rst
diff --git a/DOCS/man/en/ao.rst b/DOCS/man/ao.rst
index 64c9e308d3..64c9e308d3 100644
--- a/DOCS/man/en/ao.rst
+++ b/DOCS/man/ao.rst
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/changes.rst
index f1f336ac7c..f1f336ac7c 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/changes.rst
diff --git a/DOCS/man/en/encode.rst b/DOCS/man/encode.rst
index f23467d823..f23467d823 100644
--- a/DOCS/man/en/encode.rst
+++ b/DOCS/man/encode.rst
diff --git a/DOCS/man/en/input.rst b/DOCS/man/input.rst
index 9e9863b9db..9e9863b9db 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/input.rst
diff --git a/DOCS/man/en/lua.rst b/DOCS/man/lua.rst
index 80467f8f8c..80467f8f8c 100644
--- a/DOCS/man/en/lua.rst
+++ b/DOCS/man/lua.rst
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/mpv.rst
index ec03c4d252..ec03c4d252 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/mpv.rst
diff --git a/DOCS/man/en/options.rst b/DOCS/man/options.rst
index b6b08d7d6e..b6b08d7d6e 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/options.rst
diff --git a/DOCS/man/en/osc.rst b/DOCS/man/osc.rst
index 2df6ff6feb..2df6ff6feb 100644
--- a/DOCS/man/en/osc.rst
+++ b/DOCS/man/osc.rst
diff --git a/DOCS/man/en/vf.rst b/DOCS/man/vf.rst
index 7c5c3a0893..7c5c3a0893 100644
--- a/DOCS/man/en/vf.rst
+++ b/DOCS/man/vf.rst
diff --git a/DOCS/man/en/vo.rst b/DOCS/man/vo.rst
index 57fe41f5b7..57fe41f5b7 100644
--- a/DOCS/man/en/vo.rst
+++ b/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)