2
0
Эх сурвалжийг харах

Merge pull request #6215 from ThomasWaldmann/docs-patterns-stable-1.1

docs updates about features not experimental any more (1.1)
TW 3 жил өмнө
parent
commit
656ca1dafa

+ 1 - 1
docs/usage/mount.rst

@@ -22,7 +22,7 @@ Examples
     root  sbin  srv  tmp  usr  var
     root  sbin  srv  tmp  usr  var
     $ borg umount /tmp/mymountpoint
     $ borg umount /tmp/mymountpoint
 
 
-    # The experimental "versions view" merges all archives in the repository
+    # The "versions view" merges all archives in the repository
     # and provides a versioned view on files.
     # and provides a versioned view on files.
     $ borg mount -o versions /path/to/repo /tmp/mymountpoint
     $ borg mount -o versions /path/to/repo /tmp/mymountpoint
     $ ls -l /tmp/mymountpoint/home/user/doc.txt/
     $ ls -l /tmp/mymountpoint/home/user/doc.txt/

+ 5 - 8
src/borg/archiver.py

@@ -2262,8 +2262,7 @@ class Archiver:
 
 
         File patterns support these styles: fnmatch, shell, regular expressions,
         File patterns support these styles: fnmatch, shell, regular expressions,
         path prefixes and path full-matches. By default, fnmatch is used for
         path prefixes and path full-matches. By default, fnmatch is used for
-        ``--exclude`` patterns and shell-style is used for the experimental
-        ``--pattern`` option.
+        ``--exclude`` patterns and shell-style is used for the ``--pattern`` option.
 
 
         If followed by a colon (':') the first two characters of a pattern are
         If followed by a colon (':') the first two characters of a pattern are
         used as a style selector. Explicit style selection is necessary when a
         used as a style selector. Explicit style selection is necessary when a
@@ -2376,11 +2375,9 @@ class Archiver:
             EOF
             EOF
             $ borg create --exclude-from exclude.txt backup /
             $ borg create --exclude-from exclude.txt backup /
 
 
-        .. container:: experimental
-
             A more general and easier to use way to define filename matching patterns exists
             A more general and easier to use way to define filename matching patterns exists
-            with the experimental ``--pattern`` and ``--patterns-from`` options. Using these, you
-            may specify the backup roots (starting points) and patterns for inclusion/exclusion.
+            with the ``--pattern`` and ``--patterns-from`` options. Using these, you may
+            specify the backup roots (starting points) and patterns for inclusion/exclusion.
             A root path starts with the prefix `R`, followed by a path (a plain path, not a
             A root path starts with the prefix `R`, followed by a path (a plain path, not a
             file pattern). An include rule starts with the prefix +, an exclude rule starts
             file pattern). An include rule starts with the prefix +, an exclude rule starts
             with the prefix -, an exclude-norecurse rule starts with !, all followed by a pattern.
             with the prefix -, an exclude-norecurse rule starts with !, all followed by a pattern.
@@ -2799,9 +2796,9 @@ class Archiver:
             add_option('--exclude-from', metavar='EXCLUDEFILE', action=ArgparseExcludeFileAction,
             add_option('--exclude-from', metavar='EXCLUDEFILE', action=ArgparseExcludeFileAction,
                        help='read exclude patterns from EXCLUDEFILE, one per line')
                        help='read exclude patterns from EXCLUDEFILE, one per line')
             add_option('--pattern', metavar='PATTERN', action=ArgparsePatternAction,
             add_option('--pattern', metavar='PATTERN', action=ArgparsePatternAction,
-                       help='experimental: include/exclude paths matching PATTERN')
+                       help='include/exclude paths matching PATTERN')
             add_option('--patterns-from', metavar='PATTERNFILE', action=ArgparsePatternFileAction,
             add_option('--patterns-from', metavar='PATTERNFILE', action=ArgparsePatternFileAction,
-                       help='experimental: read include/exclude patterns from PATTERNFILE, one per line')
+                       help='read include/exclude patterns from PATTERNFILE, one per line')
 
 
             if tag_files:
             if tag_files:
                 add_option('--exclude-caches', dest='exclude_caches', action='store_true',
                 add_option('--exclude-caches', dest='exclude_caches', action='store_true',