From ff36b231535e7dae67878779341b7e52137b8102 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Tue, 15 Mar 2016 17:56:43 +0100
Subject: Fix instructions for omitting "have" lines

In 002d348 (Describe how to omit "have" lines, 2015-11-14), we added
instructions on how to omit "have" lines originating from other package
repositories. Fix those instructions such that the HEAD ref of the
repository is transferred properly.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 doc/git-interface.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/git-interface.txt b/doc/git-interface.txt
index 4a24eef..69c558b 100644
--- a/doc/git-interface.txt
+++ b/doc/git-interface.txt
@@ -89,7 +89,7 @@ so-called "have" lines. This is normally used to reduce traffic but it has the
 opposite effect in the case of aurweb: Many essentially useless lines are
 transferred to the Git client during `git push` operations.
 
-In order to omit these advertisements, add the strings "^refs/" and "!refs/" to
-the transfer.hideRefs configuration setting. Note that the order of these
-patterns is important ("^refs/" must come first) and that Git 2.7 or newer is
-required for them to work.
+In order to omit these advertisements, add the strings "^refs/", "!refs/" and
+"!HEAD" to the transfer.hideRefs configuration setting. Note that the order of
+these patterns is important ("^refs/" must come first) and that Git 2.7 or
+newer is required for them to work.
-- 
cgit v1.2.3-54-g00ecf


From 333596ab4aca12bd9444196066f1511f07650f3f Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Wed, 8 Jun 2016 22:02:03 +0200
Subject: Update Arch Linux projects subdomain

The projects.archlinux.org subdomain was moved to git.archlinux.org.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 INSTALL                 | 2 +-
 README                  | 2 +-
 doc/i18n.txt            | 2 +-
 web/template/footer.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/INSTALL b/INSTALL
index 8b0cd29..dab48cc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Setup on Arch Linux
 1) Clone the AUR project:
 
    $ cd /srv/http/
-   $ git clone git://projects.archlinux.org/aurweb.git
+   $ git clone git://git.archlinux.org/aurweb.git
 
 2) Setup a web server with PHP and MySQL. Configure the web server to redirect
    all URLs to /index.php/foo/bar/. The following block can be used with nginx:
diff --git a/README b/README
index 71e8481..1988186 100644
--- a/README
+++ b/README
@@ -42,7 +42,7 @@ web::
 Links
 -----
 
-* The repository is hosted at git://projects.archlinux.org/aurweb.git -- see
+* The repository is hosted at git://git.archlinux.org/aurweb.git -- see
   doc/CodingGuidelines for information on submitting patches.
 
 * Discovered bugs can be submitted to the aurweb bug tracker:
diff --git a/doc/i18n.txt b/doc/i18n.txt
index d5b6764..a1c21fe 100644
--- a/doc/i18n.txt
+++ b/doc/i18n.txt
@@ -21,7 +21,7 @@ strings for the translation to be usable, and it may have to be disabled.
 
 1. Check out the aurweb source using git:
 
-$ git clone git://projects.archlinux.org/aurweb.git aurweb-git
+$ git clone git://git.archlinux.org/aurweb.git aurweb-git
 
 2. Go into the "po/" directory in the aurweb source and run msginit(1) to
    create a initial translation file from our translation catalog:
diff --git a/web/template/footer.php b/web/template/footer.php
index f5dc2d0..572dbb2 100644
--- a/web/template/footer.php
+++ b/web/template/footer.php
@@ -3,7 +3,7 @@
 
 			<div id="footer">
 				<?php if ($ver): ?>
-				<p>aurweb <a href="https://projects.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p>
+				<p>aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p>
 				<?php endif; ?>
 				<p><?= __('Copyright %s 2004-%d aurweb Development Team.', '&copy;', date('Y')) ?></p>
 				<p><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p>
-- 
cgit v1.2.3-54-g00ecf


From 9cab008e15aeb9327f319afee98479248b888a1d Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Mon, 11 Jul 2016 17:44:19 +0200
Subject: Update the Git/SSH interface documentation

Add information on the new set-keywords command and slightly reword some
paragraphs.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 doc/git-interface.txt | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'doc')

diff --git a/doc/git-interface.txt b/doc/git-interface.txt
index 69c558b..14ff0c5 100644
--- a/doc/git-interface.txt
+++ b/doc/git-interface.txt
@@ -22,15 +22,15 @@ Authentication: git-auth
 Pushing to package repositories is possible via SSH. In order to access the SSH
 interface, users first need to add an SSH public key to their account using the
 web interface. Authentication is performed by the git-auth
-AuthorizedKeysCommand script (see sshd_config(5) for details) that looks up the
-public key in the AUR user table. Using this concept of "virtual users", there
-is no need to create separate UNIX accounts for each registered AUR user.
+AuthorizedKeysCommand script (see sshd_config(5) for details) which looks up
+the public key in the AUR user table. Using this concept of "virtual users",
+there is no need to create separate UNIX accounts for each registered AUR user.
 
 If the public key is found, the corresponding authorized_keys line is printed
 to stdout. If the public key does not exist, the login is denied. The
 authorized_keys line also contains a forced command such that authenticated
 users cannot access anything on the server except for the aurweb SSH interface.
-The forced command can be configured in the aurweb configuration file and
+The forced command can be configured in the aurweb configuration file and it
 usually points to the git-serve program.
 
 The INSTALL file in the top-level directory contains detailed instructions on
@@ -43,17 +43,18 @@ The git-serve command, the "aurweb shell", provides different subcommands:
 
 * The help command shows a list of available commands.
 * The list-repos command lists all repositories of the authenticated user.
+* The set-keywords command modifies the keywords assigned to a package base.
 * The setup-repo command can be used to create a new repository.
 * The restore command can be used to restore a deleted package base.
 * The git-{receive,upload}-pack commands are redirected to git-shell(1).
 
-The requested command is extracted from the SSH_ORIGINAL_COMMAND environment
-variable which is usually set by the SSH daemon. If no command is specified,
-git-serve displays a message that aurweb does not provide an interactive shell.
+The command is extracted from the SSH_ORIGINAL_COMMAND environment variable
+which is usually set by the SSH daemon. If no command is specified, git-serve
+displays a message stating that aurweb does not provide an interactive shell.
 
 When invoking git-shell(1), the git-serve command also redirects all paths to
 the shared Git repository and sets up the GIT_NAMESPACE environment variable
-such that Git updates the right namespaced branch.
+such that Git updates the correct namespaced branch.
 
 The Update Hook: git-update
 ---------------------------
@@ -62,7 +63,7 @@ The Git update hook, called git-update, performs several subtasks:
 
 * Prevent from creating branches or tags other than master.
 * Deny non-fast-forwards, except for Trusted Users and Developers.
-* Check each new commit (validate meta data, impose file size limits, ...)
+* Verify each new commit (validate meta data, impose file size limits, ...)
 * Update package base information and package information in the database.
 * Update the named branch and the namespaced HEAD ref of the package.
 
@@ -74,9 +75,8 @@ Accessing Git repositories via HTTP
 
 Git repositories can also be accessed via HTTP by configuring the web server to
 forward specific requests to git-http-backend(1). Note that, since Git
-namespaces are used internally, the web server also needs to rewrite URIs and
-setup the GIT_NAMESPACE environment variable accordingly before forwarding a
-request.
+namespaces are used internally, the web server needs to rewrite URIs and setup
+the GIT_NAMESPACE environment variable accordingly before forwarding a request.
 
 An example configuration for nginx and fcgiwrap can be found in the INSTALL
 instructions in the top-level directory.
@@ -86,10 +86,11 @@ Further Configuration
 
 When using Git namespaces, Git advertises refs outside the current namespace as
 so-called "have" lines. This is normally used to reduce traffic but it has the
-opposite effect in the case of aurweb: Many essentially useless lines are
-transferred to the Git client during `git push` operations.
-
-In order to omit these advertisements, add the strings "^refs/", "!refs/" and
-"!HEAD" to the transfer.hideRefs configuration setting. Note that the order of
-these patterns is important ("^refs/" must come first) and that Git 2.7 or
-newer is required for them to work.
+opposite effect in the case of aurweb: Most of the refs transferred to the
+client during `git push` operations belong to branches of other package bases
+and are essentially useless.
+
+In order to omit these advertisements, one can add the strings "^refs/",
+"!refs/" and "!HEAD" to the transfer.hideRefs configuration setting. Note that
+the order of these patterns is important ("^refs/" must come first) and that
+Git 2.7 or newer is required for them to work.
-- 
cgit v1.2.3-54-g00ecf