From: Per Cederqvist <cederp@opera.com>
To: Jeff Sipek <jeffpc@josefsipek.net>
Cc: git@vger.kernel.org, Per Cederqvist <cederp@opera.com>
Subject: [GUILT 3/5] doc: don't use guilt-foo invocations in examples.
Date: Fri, 23 Jan 2015 14:24:57 +0100 [thread overview]
Message-ID: <1422019499-2012-4-git-send-email-cederp@opera.com> (raw)
In-Reply-To: <1422019499-2012-1-git-send-email-cederp@opera.com>
Note: there is one place where I replace guilt-repair with "guilt
repair" instead of "+guilt repair+". At least the version of docbook
I'm using mishandles the "+" signs in that particular spot (even
though it works properly for "+guilt select+" in another file. I know
too little docbook to be able to find the cause.
Signed-off-by: Per Cederqvist <cederp@opera.com>
---
Documentation/guilt-add.txt | 2 +-
Documentation/guilt-delete.txt | 2 +-
Documentation/guilt-diff.txt | 2 +-
Documentation/guilt-help.txt | 4 ++--
Documentation/guilt-new.txt | 6 +++---
Documentation/guilt-repair.txt | 2 +-
Documentation/guilt-select.txt | 4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Documentation/guilt-add.txt b/Documentation/guilt-add.txt
index 6d2785a..a276f09 100644
--- a/Documentation/guilt-add.txt
+++ b/Documentation/guilt-add.txt
@@ -24,7 +24,7 @@ EXAMPLES
Create and add a new file example.c
$ touch example.c
- $ guilt-add example.c
+ $ guilt add example.c
Author
------
diff --git a/Documentation/guilt-delete.txt b/Documentation/guilt-delete.txt
index ef57dc6..4e8c28c 100644
--- a/Documentation/guilt-delete.txt
+++ b/Documentation/guilt-delete.txt
@@ -25,7 +25,7 @@ EXAMPLES
--------
Delete a patch called 'foobar':
- $ guilt-delete foobar
+ $ guilt delete foobar
Author
------
diff --git a/Documentation/guilt-diff.txt b/Documentation/guilt-diff.txt
index 986ceca..0ee062c 100644
--- a/Documentation/guilt-diff.txt
+++ b/Documentation/guilt-diff.txt
@@ -18,7 +18,7 @@ OPTIONS
-------
-z::
Output a interdiff against the top-most applied patch. This should
- produce the same diff as "+guilt-new -f foo+".
+ produce the same diff as "+guilt new -f foo+".
<path>...::
Restrict diff output to a given set of files.
diff --git a/Documentation/guilt-help.txt b/Documentation/guilt-help.txt
index ed6a5cf..df0e0fb 100644
--- a/Documentation/guilt-help.txt
+++ b/Documentation/guilt-help.txt
@@ -18,11 +18,11 @@ EXAMPLES
Open the guilt-status man page
- $ guilt-help status
+ $ guilt help status
Open the guilt man page
- $ guilt-help
+ $ guilt help
Author
------
diff --git a/Documentation/guilt-new.txt b/Documentation/guilt-new.txt
index a2c8a4c..698dcb7 100644
--- a/Documentation/guilt-new.txt
+++ b/Documentation/guilt-new.txt
@@ -42,16 +42,16 @@ EXAMPLES
Create a new patch called 'foobar':
- $ guilt-new foobar
+ $ guilt new foobar
Create a patch called 'foo' and supply a patch description interactively:
- $ guilt-new -e foo
+ $ guilt new -e foo
Create a patch called 'bar' with a provided patch description and sign off
on the patch:
- $ guilt-new -s -m patch-fu bar
+ $ guilt new -s -m patch-fu bar
Author
------
diff --git a/Documentation/guilt-repair.txt b/Documentation/guilt-repair.txt
index 4aa472b..4faf113 100644
--- a/Documentation/guilt-repair.txt
+++ b/Documentation/guilt-repair.txt
@@ -22,7 +22,7 @@ Perform various repository repairs. You must specify one mode of repair:
WARNING: Running this command may result in commits and working
directory changes being lost. You may want to create a new reference
(e.g., branch, or reflog) to the original HEAD before using
- guilt-repair.
+ "guilt repair".
--status::
Upgrade the status file from old format to new.
diff --git a/Documentation/guilt-select.txt b/Documentation/guilt-select.txt
index f7fb5f7..dd5833e 100644
--- a/Documentation/guilt-select.txt
+++ b/Documentation/guilt-select.txt
@@ -19,10 +19,10 @@ the following way:
* An unguarded patch is always applied.
* A patch with a positive guard is applied *only* if the guard is
-selected with guilt-select.
+selected with "+guilt select+".
* A patch with a negative guard is applied *unless* the guard is
-selected with guilt-select.
+selected with "+guilt select+".
OPTIONS
-------
--
2.1.0
next prev parent reply other threads:[~2015-01-23 13:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-23 13:24 [GUILT 0/5] doc: less guilt-foo invocations, minor Makefile fixes Per Cederqvist
2015-01-23 13:24 ` [GUILT 1/5] Fix generation of Documentation/usage-%.txt Per Cederqvist
2015-01-23 14:21 ` Jeff Sipek
2015-01-23 14:33 ` Per Cederqvist
2015-01-23 14:36 ` Jeff Sipek
2015-01-23 13:24 ` [GUILT 2/5] doc: guilt.xml depends on cmds.txt Per Cederqvist
2015-01-23 14:23 ` Jeff Sipek
2015-01-23 13:24 ` Per Cederqvist [this message]
2015-01-23 14:25 ` [GUILT 3/5] doc: don't use guilt-foo invocations in examples Jeff Sipek
2015-01-23 13:24 ` [GUILT 4/5] doc: don't use guilt-foo invocations in usage messages Per Cederqvist
2015-01-23 14:27 ` Jeff Sipek
2015-01-23 13:24 ` [GUILT 5/5] doc: git doesn't use git-foo invocations Per Cederqvist
2015-01-23 14:29 ` Jeff Sipek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422019499-2012-4-git-send-email-cederp@opera.com \
--to=cederp@opera.com \
--cc=git@vger.kernel.org \
--cc=jeffpc@josefsipek.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).