From 5d0807b6c740510a16edfe7612a806324b62b886 Mon Sep 17 00:00:00 2001
From: René Genz <liebundartig@freenet.de>
Date: Apr 22 2017 16:22:20 +0000
Subject: include feedback and minor fix


---

diff --git a/doc/install.rst b/doc/install.rst
index f13b0ae..0001d9f 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -247,7 +247,7 @@ You can save the current revision in the database using the following command:
 ::
 
     cd /etc/pagure
-    alembic stamp $(alembic heads |awk '{ print $1 }')
+    alembic stamp $(alembic heads | awk '{ print $1 }')
 
 The ``cd /etc/pagure`` is needed as the command must be run in the folder
 where the file ``alembic.ini`` is. This file contains two important pieces
@@ -266,7 +266,7 @@ database was just created, it is at the latest revision.
 
 
 Set up virus scanning
------------------------
+---------------------
 Pagure can automatically scan uploaded attachments for viruses using Clam.
 To set this up, first install clamav-data-empty, clamav-server,
 clamav-server-systemd and clamav-update.
diff --git a/doc/usage/forks.rst b/doc/usage/forks.rst
index 4fe51e7..5b4ac4d 100644
--- a/doc/usage/forks.rst
+++ b/doc/usage/forks.rst
@@ -63,8 +63,9 @@ Afterwards, you are ready to push your changes to your remote fork::
 
     $ git push -u origin my-feature-or-bugfix # upload changes
 
-In case you cloned the repo using `https://pagure.io/forks/jcline/pagure.git <https://pagure.io/forks/jcline/pagure.git>`_
-the push will fail. An easy temporary workaround is to use::
+In case you cloned the repo via HTTP, for example using a command like `git
+clone https://...`_, the push will fail. Pagure.io does not support pushing
+over HTTP. An easy workaround is to use::
 
     $ git push -u origin my-feature-or-bugfix ssh://git@pagure.io/forks/jcline/pagure.git
 
diff --git a/pagure/lib/repo.py b/pagure/lib/repo.py
index 98f15d0..9d2f61f 100644
--- a/pagure/lib/repo.py
+++ b/pagure/lib/repo.py
@@ -79,7 +79,6 @@ class PagureRepo(pygit2.Repository):
                         'Pulling remote changes leads to a conflict')
                 else:
                     _log.debug(
-                        'Un-expected merge result: %s' % (
                         'Unexpected merge result: %s' % (
                             pygit2.GIT_MERGE_ANALYSIS_NORMAL))
                     raise AssertionError('Unknown merge analysis result')