diff --git a/docs/documentation/getting-started/structure/index.markdown b/docs/documentation/getting-started/structure/index.markdown
index 866655c0..566f02b8 100644
--- a/docs/documentation/getting-started/structure/index.markdown
+++ b/docs/documentation/getting-started/structure/index.markdown
@@ -42,9 +42,9 @@ repository the content will be a  raw git repository (e.g. objects, refs,
 etc.).
 
 * `revisions.log` is used to log every deploy or rollback. Each entry is
-timestamped and the executing  user (username from local machine) is listed.
-Depending on your VCS data like branchnames or revision  numbers are listed as
-well.
+timestamped and the executing  user (`:local_user`, defaulting to the local
+username) is listed. Depending on your VCS data like branch names or revision
+numbers are listed as well.
 
 * `shared` contains the `linked_files` and `linked_dirs` which are symlinked
 into each release. This  data persists across deployments and releases. It
diff --git a/lib/capistrano/templates/deploy.rb.erb b/lib/capistrano/templates/deploy.rb.erb
index 6faf3e9b..38a42cfa 100644
--- a/lib/capistrano/templates/deploy.rb.erb
+++ b/lib/capistrano/templates/deploy.rb.erb
@@ -29,5 +29,8 @@ set :repo_url, "git@example.com:me/my_repo.git"
 # Default value for default_env is {}
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }
 
+# Default value for local_user is ENV['USER']
+# set :local_user, -> { `git config user.name`.chomp }
+
 # Default value for keep_releases is 5
 # set :keep_releases, 5