Merge remote-tracking branch 'origin/master'

docs/admin.rst

@@ -117,3 +117,13 @@ group and create additional groups with finer privileges (eg. `Translators`
 group, which will be allowed to save translations and manage suggestions) and
 add selected users to this group. You can do all this from Django admin
 interface.
+
+.. _lazy-commit:
+
+Lazy commits
+------------
+
+Default behaviour (configured by :envvar:`LAZY_COMMITS`) of Weblate is to group
+commits from same author into one if possible. This heavily reduces number of
+commits, however you might need to do implicit sync to get Git repository in
+sync (you can do this in admin interface).

docs/changes.rst

@@ -15,6 +15,7 @@ Relased on ? 2012.
 * Machine translation services no longer block page loading.
 * Management interface now contains also useful actions to update data.
 * Records log of changes made by users.
+* Ability to postpone commit to Git to generate less commits from single user.
 
 weblate 0.7
 -----------

docs/config.rst

@@ -24,6 +24,8 @@ All settings are stored in :file:`settings.py` (as usual for Django).
     number of commits generated by Weblate at expense of temporarily not being
     able to merge some changes as they are not yet committed.
 
+    .. seelaso: :ref:`lazy-commits`
+
 .. envvar:: MT_APERTIUM_KEY
 
     API key for Apertium Web Service, you can register at http://api.apertium.org/register.jsp

docs/usage.rst

@@ -20,7 +20,7 @@ Profile information
 -------------------
 
 User profile contains your preferences, name and email. Name and email
-are bing used in Git commits, so keep this information accurate.
+are being used in Git commits, so keep this information accurate.
 
 In preferences, you can choose user interface language, languages which you
 prefer to translate (list of these will be offered to you on main page) and