浏览代码

Merge pull request #457 from ThomasWaldmann/docs-add-resources

docs: add resources, fixes #149
TW 9 年之前
父节点
当前提交
19f0b16d4d
共有 3 个文件被更改,包括 42 次插入8 次删除
  1. 2 8
      README.rst
  2. 1 0
      docs/index.rst
  3. 39 0
      docs/resources.rst

+ 2 - 8
README.rst

@@ -109,7 +109,7 @@ Now doing another backup, just to show off the great deduplication::
     This archive:          57.16 MB           46.78 MB            151.67 kB  <--- !
     All archives:         114.02 MB           93.46 MB             44.81 MB
 
-For a graphical frontend refer to our complementary project `BorgWeb`_.
+For a graphical frontend refer to our complementary project `BorgWeb <https://borgbackup.github.io/borgweb/>`_.
 
 Links
 =====
@@ -125,18 +125,12 @@ Links
  * `(Old Mailing List's Archives <http://librelist.com/browser/borgbackup/>`_)
  * `License <https://borgbackup.github.io/borgbackup/authors.html#license>`_
 
-Related Projects
-----------------
-
- * `BorgWeb <https://borgbackup.github.io/borgweb/>`_
- * `Atticmatic <https://github.com/witten/atticmatic/>`_
- * `Attic <https://github.com/jborg/attic>`_
-
 Notes
 -----
 
 Borg is a fork of `Attic`_ and maintained by "`The Borg collective`_".
 
+.. _Attic: https://github.com/jborg/attic
 .. _The Borg collective: https://borgbackup.readthedocs.org/en/latest/authors.html
 
 Differences between Attic and Borg

+ 1 - 0
docs/index.rst

@@ -14,6 +14,7 @@ Borg Documentation
    usage
    faq
    support
+   resources
    changes
    internals
    development

+ 39 - 0
docs/resources.rst

@@ -0,0 +1,39 @@
+.. include:: global.rst.inc
+.. _resources:
+
+Resources
+=========
+
+This is a collection of additional resources that are somehow related to
+borgbackup.
+
+
+Videos, Talks, Presentations
+----------------------------
+
+Some of them refer to attic, but you can do the same stuff (and more) with borgbackup.
+
+- `BorgBackup Installation and Basic Usage <https://asciinema.org/a/28691?autoplay=1&speed=2>`_  (english screencast)
+
+- `TW's slides for borgbackup talks / lightning talks <https://slides.com/thomaswaldmann>`_ (just grab the latest ones)
+
+- "Attic / Borg Backup" talk from GPN 2015 (video, german audio, english slides):
+  `media.ccc.de <https://media.ccc.de/browse/conferences/gpn/gpn15/gpn15-6942-attic_borg_backup.html#video>`_
+  or
+  `youtube <https://www.youtube.com/watch?v=Nb5nXEKSN-k>`_
+
+- "Attic" talk from Easterhegg 2015 (video, german audio, english slides):
+  `media.ccc.de <https://media.ccc.de/v/eh15_-_49_-__-_saal_-_201504042130_-_attic_-_the_holy_grail_of_backups_-_thomas#video>`_
+  or
+  `youtube <https://www.youtube.com/watch?v=96VEAAFDtJw>`_
+
+- "Attic Backup: Mount your encrypted backups over ssh", 2014 (video, english):
+  `youtube <https://www.youtube.com/watch?v=BVXDFv9YMp8>`_
+
+
+Software
+--------
+
+- `BorgWeb - a very simple web UI for BorgBackup <https://borgbackup.github.io/borgweb/>`_
+- some other stuff found at the `BorgBackup Github organisation <https://github.com/borgbackup/>`_
+- `atticmatic <https://github.com/witten/atticmatic/>`_ (includes borgmatic)