Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

5 files changed, 59 insertions, 83 deletions

diff --git a/Makefile.am b/Makefile.am
index f89fdd79..a19a7613 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ dist_man1_MANS = tmux.1
 
 # Distribution tarball options.
 EXTRA_DIST = \
-	CHANGES FAQ NOTES TODO examples compat \
+	CHANGES FAQ README TODO examples compat \
 	array.h compat.h tmux.h osdep-*.c
 dist-hook:
 	grep "^#found_debug=" configure
diff --git a/NOTES b/README
index 12922950..42bfda97 100644
--- a/NOTES
+++ b/README
@@ -16,15 +16,16 @@ To build tmux from a release tarball, do:
 	$ ./configure && make
 	$ sudo make install
 
-To get and build the latest version control checkout:
+To get and build the latest from version control:
 
-	$ git clone git://tmux.git.sourceforge.net/gitroot/tmux/tmux
+	$ git clone git://git.code.sf.net/p/tmux/tmux-code tmux
 	$ cd tmux
 	$ sh autogen.sh
 	$ ./configure && make
 
 For more information see https://sourceforge.net/scm/?type=git&group_id=200378
-and http://git-scm.com.
+and http://git-scm.com. Patches should be sent by email to the mailing list at
+tmux-users@lists.sourceforge.net.
 
 For documentation on using tmux, see the tmux.1 manpage. It can be viewed from
 the source tree with:
@@ -34,20 +35,8 @@ the source tree with:
 Some common questions are answered in the FAQ file and a more extensive (but
 slightly out of date) guide is available in the OpenBSD FAQ at
 http://www.openbsd.org/faq/faq7.html#tmux. A rough todo list is in the TODO
-file.
-
-A Vim syntax file is available in the examples directory. To install it:
-
-- Drop the file in the syntax directory into runtimepath (such as
-  ~/.vim/syntax/tmux.vim).
-- Make the filetype recognisable by adding the following to filetype.vim
-  (~/.vim/filetype.vim):
-
-	augroup filetypedetect
-		au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
-	augroup END
-
-- Switch on syntax highlighting by adding "syntax enable" to .vimrc.
+file and some example configurations and a Vim syntax file are in the examples
+directory.
 
 For debugging, running tmux with -v or -vv will generate server and client log
 files in the current directory.
@@ -64,8 +53,7 @@ welcome. Please send by email to:
 This file and the CHANGES, FAQ and TODO files are licensed under the ISC
 license. Files under examples/ remain copyright their authors unless otherwise
 stated in the file but permission has been received to distribute them with
-tmux. All other files have a license and copyright notice at their
-start.
+tmux. All other files have a license and copyright notice at their start.
 
 -- Nicholas Marriott <nicm@users.sf.net>
 
diff --git a/SYNCING b/SYNCING
index 62351b2c..eba24177 100644
--- a/SYNCING
+++ b/SYNCING
@@ -138,7 +138,7 @@ Release tmux for next version
    don't have debugging enabled, otherwise make(1) aborts when
    preparing the distribution.
 
-2. Update and commit NOTES and CHANGES.  The former should be checked for
+2. Update and commit README and CHANGES.  The former should be checked for
    anything outdated and updated with a list of things that might break
    upgrades and the latter should mention all the major changes since
    the last version.
diff --git a/examples/tmux.vim b/examples/tmux.vim
index f1a98be4..076115c1 100644
--- a/examples/tmux.vim
+++ b/examples/tmux.vim
@@ -3,6 +3,20 @@
 " Maintainer: Tiago Cunha <tcunha@users.sourceforge.net>
 " Last Change: $Date: 2010-07-27 18:29:07 $
 " License: This file is placed in the public domain.
+"
+" To install this file:
+"
+" - Drop the file in the syntax directory into runtimepath (such as
+"  ~/.vim/syntax/tmux.vim).
+" - Make the filetype recognisable by adding the following to filetype.vim
+"   (~/.vim/filetype.vim):
+"
+"	augroup filetypedetect
+"		au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
+"	augroup END
+"
+" - Switch on syntax highlighting by adding "syntax enable" to .vimrc.
+"
 
 if version < 600
 	syntax clear
diff --git a/www/index.html.in b/www/index.html.in
index 36bc44c0..c2942393 100644
--- a/www/index.html.in
+++ b/www/index.html.in
@@ -12,79 +12,53 @@
 		<p id="upper-left-title">tmux</p>
 		<ul id="left-menu">
 		<li><a href="http://downloads.sourceforge.net/tmux/tmux-%%VERSION%%.tar.gz">Download</a></li>
-		<li><a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/NOTES">Release Notes</a></li>
+		<li><a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/README">README</a></li>
 		<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=tmux&sektion=1">Manual Page</a></li>
 		<li><a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/FAQ">FAQ</a></li>
-		<li><a href="http://www.openbsd.org/faq/faq7.html#tmux">tmux in the OpenBSD FAQ</a></li>
-		<li><a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/examples/">Examples</a></li>
-		<li>&nbsp;</li>
-		<li class="menu-headings">Source Code</li>
-		<li><a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/">SourceForge</a></li>
-		<li><a href="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/tmux/">OpenBSD</a></li>
-		<li>&nbsp;</li>
-		<li class="menu-headings">Support</li>
-		<li><a href="https://lists.sourceforge.net/lists/listinfo/tmux-users">tmux-users</a></li>
-		<li><a href="https://lists.sourceforge.net/lists/listinfo/tmux-cvs">tmux-cvs</a></li>
-		<li>IRC: #tmux on Freenode</li>
-		<li><a href="http://sf.net/projects/tmux">SourceForge Project Page</a></li>
+		<li><a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/">Source Code</a></li>
+		<li><a href="http://sf.net/projects/tmux">Project Page</a></li>
+		<li><a href="https://lists.sourceforge.net/lists/listinfo/tmux-users">Mailing List</a></li>
+		<li><a href="irc://irc.freenode.net/tmux">IRC Channel</a></li>
 		</ul>
 	    </div>
 	    <div id="main-content-wrapper">
 
-<p>tmux is a terminal multiplexer: it enables a number of terminals (or
-windows), each running a separate program, to be created, accessed, and
-controlled from a single screen. tmux may be detached from a screen and
-continue running in the background, then later reattached.</p>
+<p><b>tmux is a terminal multiplexer</b></p>
 
-<p>The
-<a href="http://downloads.sourceforge.net/tmux/tmux-%%VERSION%%.tar.gz">
-latest release is tmux %%VERSION%%</a> or
-<a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/">
-get the development version from git.</a></p>
-
-<p>tmux uses a client-server model. The server holds multiple sessions and each
-window is an independent entity which may be freely linked to multiple sessions,
-moved between sessions and otherwise manipulated. Each session may be attached
-to (display and accept keyboard input from) multiple clients.</p>
+<p><b>What is a terminal multiplexer?</b> It lets you switch easily between
+several programs in one terminal, detach them (they keep running in the
+background) and reattach them to a different terminal. And do a lot more. See
+<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=tmux&sektion=1">
+the manual</a>.</p>
 
-<p>tmux is intended to be a modern, BSD-licensed alternative to programs such
-as GNU screen. Major features include:</p>
-
-<ul>
-<li>A powerful, consistent, well-documented and easily scriptable command
-interface.</li>
-<li>A window may be split horizontally and vertically into panes.</li>
-<li>Panes can be freely moved and resized, or arranged into preset
-layouts. </li>
-<li>Support for UTF-8 and 256-colour terminals.</li>
-<li>Copy and paste with multiple buffers.</li>
-<li>Interactive menus to select windows, sessions or clients.</li>
-<li>Change the current window by searching for text in the target.</li>
-<li>Terminal locking, manually or after a timeout.</li>
-<li>A clean, easily extended, BSD-licensed codebase, under active
-development.</li>
-</ul>
+<p><b><a href="http://downloads.sourceforge.net/tmux/tmux-%%VERSION%%.tar.gz">
+Download tmux %%VERSION%%</a></b> or
+<a href="https://sourceforge.net/p/tmux/tmux-code/ci/master/tree/">
+get the development version.</a>
+tmux is hosted on
+<a href="http://sf.net/projects/tmux">SourceForge</a>
+and needs
+<a href="http://www.monkey.org/~provos/libevent/">libevent</a>
+and
+<a href="http://invisible-island.net/ncurses/">ncurses</a>
+.</p>
 
-<p>tmux is part of the <a href="http://www.openbsd.org">OpenBSD</a> base
-system. The portable version is hosted on <a href="http://sf.net/projects/tmux">
-SourceForge</a> and runs on Linux, FreeBSD, NetBSD, Solaris and AIX.
-It depends on <a href="http://www.monkey.org/~provos/libevent/">libevent 1.4 or 2.0</a> and a
-terminfo implementation (normally <a href="http://invisible-island.net/ncurses/">ncurses</a>).</p>
+<p>For support contact the
+<a href="mailto:tmux-users@lists.sf.net">tmux-users@lists.sf.net</a>
+mailing list or IRC channel
+<a href="irc://irc.freenode.net/tmux">#tmux on freenode</a>.</p>
 
-<p>A few people have written programs which can be used with tmux:
-<a href="https://github.com/dominikh/tmux-ruby">tmux-ruby</a>,
-<a href="https://github.com/aziz/tmuxinator">tmuxinator</a>,
-<a href="https://github.com/lmartinking/tmux-applets">tmux-applets</a> and
-<a href="https://github.com/remiprev/teamocil">teamocil</a>.
-There is a
-<a href="http://pragprog.com/book/bhtmux/tmux">book on tmux</a> by Brian P Hogan.</p>
+<p>There are some programs to use with tmux
+<a href="https://github.com/search?q=tmux&type=Repositories&ref=simplesearch">
+on GitHub</a> and a
+<a href="http://pragprog.com/book/bhtmux/tmux">book on tmux</a>.</p>
 
-		<div id="screenshots">
-		    <a href="tmux3.png"><img src="small-tmux3.png" alt="Screenshot"/></a>
-		    <a href="tmux4.png"><img src="small-tmux4.png" alt="Screenshot"/></a>
-		    <a href="tmux5.png"><img src="small-tmux5.png" alt="Screenshot"/></a>
-		</div>
+<div id="screenshots">
+  <a href="tmux3.png"><img src="small-tmux3.png" alt="Screenshot"/></a>
+  <a href="tmux4.png"><img src="small-tmux4.png" alt="Screenshot"/></a>
+  <a href="tmux5.png"><img src="small-tmux5.png" alt="Screenshot"/></a>
+</div>
 	    </div>
-       </div>
+	</div>
     </body>
 </html>