summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2017-01-25 00:38:59 +0000
committerMaxime Coste <mawww@kakoune.org>2017-01-25 00:38:59 +0000
commit2475ffa612bb91874eeb050aaed7904775d6e90f (patch)
tree9cb487d2ece316926d460c502542c1dcc67de2d0
parentd3ecc9f31112b5df2007d79dcb51cb50f42d7d8d (diff)
parent8ff2d0ba4110cde987595ba37bc12ad4c7aadb7d (diff)
Merge remote-tracking branch 'ekie/tiny_tweaks'
-rw-r--r--README.asciidoc6
-rw-r--r--doc/kak.1.txt7
2 files changed, 9 insertions, 4 deletions
diff --git a/README.asciidoc b/README.asciidoc
index b071fbd8..4e26f6d1 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -5,6 +5,7 @@
:travis-url: https://travis-ci.org/mawww/kakoune
:icons: font
:toc: right
+:pp: ++
TL;DR
-----
@@ -99,8 +100,8 @@ Building
Kakoune dependencies are:
- * A C\+\+11 compliant compiler (GCC >= 5 or clang >= 3.4) along with its
- associated C\+\+ standard library (libstdc\+\+ or libc\+\+)
+ * A {cpp}11 compliant compiler (GCC >= 5 or clang >= 3.4) along with its
+ associated {cpp} standard library (libstdc{pp} or libc{pp})
* boost (>= 1.50)
* ncurses with wide-characters support (>= 5.3, generally referred to as libncursesw)
* asciidoc (for the `a2k` tool), to generate man pages
@@ -243,6 +244,7 @@ Just running *kak* launch a new kak session with a client on local terminal.
* `-l`: list existing sessions, and check the dead ones
* `-clear`: clear dead sessions socket files
* `-ro`: prevent modifications to all buffers from being saved to disk
+ * `+line[:column]`: specify a target line and column for the first file
Configuration
^^^^^^^^^^^^^
diff --git a/doc/kak.1.txt b/doc/kak.1.txt
index cacd6c5b..4c7710c9 100644
--- a/doc/kak.1.txt
+++ b/doc/kak.1.txt
@@ -7,7 +7,7 @@ kak - a vim inspired, selection oriented code editor
SYNOPSIS
--------
-*kak* [-q] [-n] [-l] [-ro] [-clear] [-ui ui_type] [-e command] [-f keys] [-p session_id] [-c session_id|[[-d] -s session_id] file ...
+*kak* [-q] [-n] [-l] [-ro] [-clear] [-ui ui_type] [-e command] [-f keys] [-p session_id] [-c session_id|[[-d] -s session_id] [+line[:column]] file ...
DESCRIPTION
-----------
@@ -51,7 +51,7 @@ OPTIONS
connect to the given session
-s <session_id>::
- rename the current session name to *session_id*
+ set the current session name to *session_id*
-ui <type>::
select the user interface, can be one of 'ncurses', 'dummy' or 'json'
@@ -62,6 +62,9 @@ OPTIONS
-ro::
enter in 'readonly mode', all the buffers opened will not be written to disk
++line[:column]::
+ specify a target line and column for the first file
+
file::
one or more files to edit