8 years ago · 96fa1e8414
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 
				 borg/_version.py export-subst
			
 
				 
			
 
				 *.py diff=python
			
 
				+docs/usage/* merge=ours
			
 
				+docs/man/* merge=ours
			
--- a/docs/man_intro.rst
+++ b/docs/man_intro.rst
@@ -46,7 +46,7 @@ A step-by-step example
 
				 NOTES
			
 
				 -----
			
 
				 
			
 
				-.. include:: usage/general.rst.inc
			
 
				+.. include:: usage_general.rst.inc
			
 
				 
			
 
				 SEE ALSO
			
 
				 --------
			
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -12,7 +12,7 @@ command in detail.
 
				 General
			
 
				 -------
			
 
				 
			
 
				-.. include:: usage/general.rst.inc
			
 
				+.. include:: usage_general.rst.inc
			
 
				 
			
 
				 In case you are interested in more details (like formulas), please see
			
 
				 :ref:`internals`.
			
--- a/docs/usage_general.rst.inc
+++ b/docs/usage_general.rst.inc