[PATCH 71/71] Change 'usually' to 'by default'

2014-11-24 Thread Richard Littauer
I've been confused several times by the docs when running across
the word 'usually'. It is difficult to know before hand if it
means 'under normal conditions' or 'by default'. I've gone through
the Documentation to identify specific cases where I think that 'by
default' is more explanatory than 'usually'. I know that patches
that touch too much code is unwelcome - as this is a small fix to
very specific lines, I think this might be OK.

For the majority of cases, usually works fine. However, especially
for the docs concerning flags, it is good to know if 'usually' was
just used by the documenter to mean 'unless your version has been
exntensively modified' or if it mean unless you've messed up.
Hopefully, this isn't too pedantic.

Signed-off-by: Richard Littauer richard.litta...@gmail.com
---
 Documentation/git-branch.txt  |  2 +-
 Documentation/git-cherry-pick.txt |  2 +-
 Documentation/git-commit.txt  |  2 +-
 Documentation/git-grep.txt|  2 +-
 Documentation/git-http-push.txt   |  2 +-
 Documentation/git-ls-files.txt|  2 +-
 Documentation/git-ls-remote.txt   |  2 +-
 Documentation/git-mailinfo.txt|  2 +-
 Documentation/git-pack-refs.txt   |  2 +-
 Documentation/git-push.txt|  4 ++--
 Documentation/git-read-tree.txt   |  6 +++---
 Documentation/git-rev-parse.txt   |  4 ++--
 Documentation/git-revert.txt  |  2 +-
 Documentation/git-send-pack.txt   |  2 +-
 Documentation/git-show-branch.txt |  2 +-
 Documentation/git-unpack-objects.txt  |  2 +-
 Documentation/gitattributes.txt   |  2 +-
 Documentation/gitcli.txt  |  6 +++---
 Documentation/gitweb.conf.txt | 10 +-
 Documentation/technical/api-parse-options.txt |  2 +-
 Documentation/technical/racy-git.txt  |  4 ++--
 Documentation/user-manual.txt |  9 -
 builtin/apply.c   |  2 +-
 contrib/hooks/multimail/README|  2 +-
 gitweb/INSTALL|  8 
 remote.c  |  2 +-
 remote.h  |  2 +-
 t/README  |  2 +-
 28 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 311b336..c5284e5 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -88,7 +88,7 @@ OPTIONS
Create the branch's reflog.  This activates recording of
all changes made to the branch ref, enabling use of date
based sha1 expressions such as branchname@\{yesterday}.
-   Note that in non-bare repositories, reflogs are usually
+   Note that in non-bare repositories, reflogs are
enabled by default by the `core.logallrefupdates` config option.
 
 -f::
diff --git a/Documentation/git-cherry-pick.txt 
b/Documentation/git-cherry-pick.txt
index 1c03c79..6d8a43e 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -86,7 +86,7 @@ OPTIONS
 
 -n::
 --no-commit::
-   Usually the command automatically creates a sequence of commits.
+   By default the command automatically creates a sequence of commits.
This flag applies the changes necessary to cherry-pick
each named commit to your working tree and the index,
without making any commit.  In addition, when this
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0bbc8f5..d82add3 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -203,7 +203,7 @@ variable (see linkgit:git-config[1]).
 -e::
 --edit::
The message taken from file with `-F`, command line with
-   `-m`, and from commit object with `-C` are usually used as
+   `-m`, and from commit object with `-C` are by default used as
the commit log message unmodified. This option lets you
further edit the message taken from these sources.
 
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 31811f1..f6b0638 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -124,7 +124,7 @@ OPTIONS
line.
 
 --full-name::
-   When run from a subdirectory, the command usually
+   When run from a subdirectory, the command by default
outputs paths relative to the current directory.  This
option forces paths to be output relative to the project
top directory.
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 2e67362..bd72f75 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -28,7 +28,7 @@ OPTIONS
ref's history exist in the remote repository.
 
 --force::
-   Usually, the command refuses to update a 

Re: [PATCH 71/71] Change 'usually' to 'by default'

2014-11-24 Thread Eric Sunshine
On Mon, Nov 24, 2014 at 4:07 PM, Richard Littauer
richard.litta...@gmail.com wrote:
 I've been confused several times by the docs when running across
 the word 'usually'. It is difficult to know before hand if it
 means 'under normal conditions' or 'by default'. I've gone through
 the Documentation to identify specific cases where I think that 'by
 default' is more explanatory than 'usually'. I know that patches
 that touch too much code is unwelcome - as this is a small fix to
 very specific lines, I think this might be OK.

 For the majority of cases, usually works fine. However, especially
 for the docs concerning flags, it is good to know if 'usually' was
 just used by the documenter to mean 'unless your version has been
 exntensively modified' or if it mean unless you've messed up.
 Hopefully, this isn't too pedantic.

 Signed-off-by: Richard Littauer richard.litta...@gmail.com
 ---
 diff --git a/Documentation/git-pack-refs.txt b/Documentation/git-pack-refs.txt
 index 154081f..c97e62a 100644
 --- a/Documentation/git-pack-refs.txt
 +++ b/Documentation/git-pack-refs.txt
 @@ -56,7 +56,7 @@ a repository with many branches of historical interests.

  --no-prune::

 -The command usually removes loose refs under `$GIT_DIR/refs`
 +The command be default removes loose refs under `$GIT_DIR/refs`

s/be/by/

  hierarchy after packing them.  This option tells it not to.


 diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
 index ebe7a6c..dc07b64 100644
 --- a/Documentation/gitweb.conf.txt
 +++ b/Documentation/gitweb.conf.txt
 @@ -222,7 +222,7 @@ The values of these variables are paths on the filesystem.

  $GIT::
 Core git executable to use.  By default set to `$GIT_BINDIR/git`, 
 which
 -   in turn is by default set to `$(bindir)/git`.  If you use Git 
 installed
 +   in turn is defaulted to `$(bindir)/git`.  If you use Git installed

This would read better as:

in turn defaults to ...

 from a binary package, you should usually set this to /usr/bin/git.
 This can just be git if your web server has a sensible PATH; from
 security point of view it is better to use absolute path to git 
 binary.
 @@ -633,10 +633,10 @@ override::
 overridable, which means that it can be configured
 (or enabled/disabled) on a per-repository basis.
  +
 -Usually given feature is configurable via the `gitweb.feature`
 +Usually the given feature is configurable via the `gitweb.feature`
  config variable in the per-repository Git configuration file.
  +
 -*Note* that no feature is overridable by default.
 +*Note* that no feature is overridable usually.

This reads strangely and seems more ambiguous than the original text.

  sub::
 Internal detail of implementation.  What is important is that
 diff --git a/Documentation/technical/racy-git.txt 
 b/Documentation/technical/racy-git.txt
 index 242a044..8c577ee 100644
 --- a/Documentation/technical/racy-git.txt
 +++ b/Documentation/technical/racy-git.txt
 @@ -38,10 +38,10 @@ files vs symbolic links) and executable bits (only for 
 regular
  files) from `st_mode` member, `st_mtime` and `st_ctime`
  timestamps, `st_uid`, `st_gid`, `st_ino`, and `st_size` members.
  With a `USE_STDEV` compile-time option, `st_dev` is also
 -compared, but this is not enabled by default because this member
 +compared, but this is not enabled usually because this member
  is not stable on network filesystems.  With `USE_NSEC`
  compile-time option, `st_mtim.tv_nsec` and `st_ctim.tv_nsec`
 -members are also compared, but this is not enabled by default
 +members are also compared, but this is not enabled usually

These reverse changes from by default to usually seem to make the
text more ambiguous.

In fact, all the reverse changes from by default to usually
throughout this patch make the text less clear. Your commit message
does not explain this decision.

  because in-core timestamps can have finer granularity than
  on-disk timestamps, resulting in meaningless changes when an
  inode is evicted from the inode cache.  See commit 8ce13b0 diff --git 
 a/gitweb/INSTALL b/gitweb/INSTALL
 index 408f285..23636b9 100644
 --- a/gitweb/INSTALL
 +++ b/gitweb/INSTALL
 @@ -140,7 +140,7 @@ You can specify the following configuration variables 
 when building GIT:
 gitweb.cgi script.  [No default]
   * GITWEB_HOME_LINK_STR
 String of the home link on top of all pages, leading to $home_link
 -   (usually main gitweb page, which means projects list).  Used as first
 +   (by default main gitweb page, which means projects list).  Used as first

In an earlier change in this patch, you inserted the word the to
improve grammar. Such a change could be applied here:

   (by default, the main ...

 part of gitweb view breadcrumb trail: home / project / view.
 [Default: projects]
   * GITWEB_SITENAME
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo