nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release-4.3' into next

This commit is contained in:
Michael Stapelberg 2012-09-19 18:12:35 +02:00
parent 672c965c56 b9fde552d0
commit d7215ac54d
6 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3-config-wizard/i3-config-wizard.mk
View File

@ -34,4 +34,4 @@ install-i3-config-wizard: i3-config-wizard/i3-config-wizard
clean-i3-config-wizard: clean-i3-config-wizard:
echo "[i3-config-wizard] Clean" echo "[i3-config-wizard] Clean"
rm -f $(i3_config_wizard_OBJECTS) $(i3_config_wizard_SOURCES_GENERATED) i3-config-wizard/i3-config-wizard i3-config-wizard/cfgparse.{output,dot} rm -f $(i3_config_wizard_OBJECTS) $(i3_config_wizard_SOURCES_GENERATED) i3-config-wizard/i3-config-wizard i3-config-wizard/cfgparse.{output,dot,tab.h,y.o}

2
libi3/libi3.mk
View File

@ -18,4 +18,4 @@ libi3.a: $(libi3_OBJECTS)
clean-libi3: clean-libi3:
echo "[libi3] Clean" echo "[libi3] Clean"
rm -f $(libi3_OBJECTS) libi3.a rm -f $(libi3_OBJECTS) libi3/libi3.a

2
man/asciidoc.conf
View File

@ -7,7 +7,7 @@ template::[header-declarations]
<refentrytitle>{mantitle}</refentrytitle> <refentrytitle>{mantitle}</refentrytitle>
<manvolnum>{manvolnum}</manvolnum> <manvolnum>{manvolnum}</manvolnum>
<refmiscinfo class="source">i3</refmiscinfo> <refmiscinfo class="source">i3</refmiscinfo>
<refmiscinfo class="version">4.1.2</refmiscinfo> <refmiscinfo class="version">4.3</refmiscinfo>
<refmiscinfo class="manual">i3 Manual</refmiscinfo> <refmiscinfo class="manual">i3 Manual</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>

16
man/i3.man
View File

@ -1,7 +1,7 @@
i3(1) i3(1)
===== =====
Michael Stapelberg <michael@i3wm.org> Michael Stapelberg <michael@i3wm.org>
v4.2, August 2012 v4.3, September 2012
== NAME == NAME
@ -32,6 +32,18 @@ Display version number (and date of the last commit).
-V:: -V::
Be verbose. Be verbose.
--force-xinerama::
Use Xinerama instead of RandR. This option should only be used if you are stuck
with the old nVidia closed source driver (older than 302.17) which does not
support RandR.
--get-socketpath::
Retrieve the i3 IPC socket path from X11, print it, then exit.
--shmlog-size <limit>::
Limits the size of the i3 SHM log to <limit> bytes. Setting this to 0 disables
SHM logging entirely. The default is 0 bytes.
== DESCRIPTION == DESCRIPTION
=== INTRODUCTION === INTRODUCTION
@ -316,7 +328,7 @@ and the "how to hack" guide. If you are building from source, run:
You can also access these documents online at http://i3wm.org/ You can also access these documents online at http://i3wm.org/
i3-input(1), i3-msg(1), i3-wsbar(1), i3-nagbar(1), i3-config-wizard(1), i3-input(1), i3-msg(1), i3bar(1), i3-nagbar(1), i3-config-wizard(1),
i3-migrate-config-to-v4(1) i3-migrate-config-to-v4(1)
== AUTHOR == AUTHOR

2
src/i3.mk
View File

@ -82,4 +82,4 @@ install-i3: i3
clean-i3: clean-i3:
echo "[i3] Clean" echo "[i3] Clean"
rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) include/loglevels.h loglevels.tmp include/all.h.pch i3-command-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot} src/cmdparse.* rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) include/loglevels.h loglevels.tmp include/all.h.pch i3-command-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot,tab.h,y.o} src/cmdparse.*

3
src/main.c
View File

@ -391,7 +391,8 @@ int main(int argc, char *argv[]) {
fprintf(stderr, "\t--force-xinerama\n" fprintf(stderr, "\t--force-xinerama\n"
"\tUse Xinerama instead of RandR.\n" "\tUse Xinerama instead of RandR.\n"
"\tThis option should only be used if you are stuck with the\n" "\tThis option should only be used if you are stuck with the\n"
"\tnvidia closed source driver which does not support RandR.\n"); "\told nVidia closed source driver (older than 302.17), which does\n"
"\tnot support RandR.\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "\t--get-socketpath\n" fprintf(stderr, "\t--get-socketpath\n"
"\tRetrieve the i3 IPC socket path from X11, print it, then exit.\n"); "\tRetrieve the i3 IPC socket path from X11, print it, then exit.\n");