Skip to content

Conversation

@hoclun-rigsep
Copy link
Contributor

No description provided.

Copy link
Contributor

@StefanMoch StefanMoch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay

@DrHyde
Copy link
Member

DrHyde commented Dec 30, 2021

This needs to be applied to the docbook source, does it not, not to the HTML output?

@StefanMoch
Copy link
Contributor

The text itself is contained in multiple files:

$ git grep -l 'contents of whatever it does into'
docs/HOWTOs/rsnapshot-HOWTO.en.html
docs/docbook/rsnapshot-HOWTO.en.fo
docs/docbook/rsnapshot-HOWTO.en.xhtml
docs/docbook/rsnapshot-HOWTO.en.xml

It seems like the html file is the canonical version as of v1.3.0, however: 319fafd

From 319fafdbe162e4ad1a978287dad686fdaeeba149 Mon Sep 17 00:00:00 2001
From: drhyde <drhyde>
Date: Fri, 6 Oct 2006 14:32:01 +0000
Subject: [PATCH] Added HTML version of HOWTO to CVS.  This is the version
 we'll maintain for v1.3.0 onwards

---
 docs/HOWTOs/rsnapshot-HOWTO.en.html | 1596 +++++++++++++++++++++++++++
 1 file changed, 1596 insertions(+)
 create mode 100644 docs/HOWTOs/rsnapshot-HOWTO.en.html

All doc text changes after that commit have been made to this file. So, no: making the changes here seems right.

The docbook files have also been imported after that, but besides some cleanup, no text changes there:

  • 66da0ff (import, first and last change to docs/docbook/rsnapshot-HOWTO.en.xml)
  • c4b2531 (cleanup)
  • a1a75f3 (cleanup)

The Makefile also does not handle the changed html file -- it has only rules for xhtml and others, not html.

I don't know. Maybe we should remove the docbook files altogether. We can always bring them back if needed.

@DrHyde
Copy link
Member

DrHyde commented Jan 4, 2022

Deleting the docbook monstrosity would DELIGHT me! So I'll merge this.

@DrHyde DrHyde merged commit 2a0efa3 into rsnapshot:master Jan 4, 2022
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Jan 4, 2023
Changelog:
==========
- Fix regression (openembedded#310)
- Merge pull request openembedded#303 from rsnapshot/update-HOWTO-to-talk-about-retain-instead-of-interval
- Removing legacy Docbook files, as per discussion at rsnapshot/rsnapshot#296
- Merge pull request openembedded#296 from hoclun-rigsep/hoclun-rigsep-patch-1
- Use @Prefix@ instead of hardcoded value in rsnapshot.conf.default.in comment line (openembedded#289).

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Jan 4, 2023
Changelog:
==========
- Fix regression (openembedded#310)
- Merge pull request openembedded#303 from rsnapshot/update-HOWTO-to-talk-about-retain-instead-of-interval
- Removing legacy Docbook files, as per discussion at rsnapshot/rsnapshot#296
- Merge pull request openembedded#296 from hoclun-rigsep/hoclun-rigsep-patch-1
- Use @Prefix@ instead of hardcoded value in rsnapshot.conf.default.in comment line (openembedded#289).

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Jan 5, 2023
Changelog:
==========
- Fix regression (openembedded#310)
- Merge pull request openembedded#303 from rsnapshot/update-HOWTO-to-talk-about-retain-instead-of-interval
- Removing legacy Docbook files, as per discussion at rsnapshot/rsnapshot#296
- Merge pull request openembedded#296 from hoclun-rigsep/hoclun-rigsep-patch-1
- Use @Prefix@ instead of hardcoded value in rsnapshot.conf.default.in comment line (openembedded#289).

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Jan 6, 2023
Changelog:
==========
- Fix regression (openembedded#310)
- Merge pull request openembedded#303 from rsnapshot/update-HOWTO-to-talk-about-retain-instead-of-interval
- Removing legacy Docbook files, as per discussion at rsnapshot/rsnapshot#296
- Merge pull request openembedded#296 from hoclun-rigsep/hoclun-rigsep-patch-1
- Use @Prefix@ instead of hardcoded value in rsnapshot.conf.default.in comment line (openembedded#289).

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Nov 30, 2025
Based on PR 59809 by Bartosz Kuzma.

------------------------------------------------------------------------------
VERSION 1.5.1 (Jan 27 2025)
------------------------------------------------------------------------------
- Fix make tar.

VERSION 1.5.0 (Jan 27 2025)
------------------------------------------------------------------------------
- Rotate only if there will be a new <interval>.0 folder (#331)
- Add publish GitHub workflow. (#367)
- Use POSIX::lchown (#360)
- Add test GitHub workflow. (#366)
- Add new backup script for sqlite3 databases (#364)
- wait between rsync tries (#352)
- Update AUTHORS
- Update rsnapshot-HOWTO.en.md
- Point at the new Markdown HOWTO from the repo's README
- Docs: add description for `rsync_numtries` to man page (#342)
- Docs: fix spelling issues
- Docs: mention the behavior of "sync" cron job in case of "warnings"
- Remove Benedikt Heine from maintainer list (#337)
- Docs: Use L<...> for other man pages
- Docs: Use F<...> for filenames
- Docs: Fix some styling issues
- Docs: Fix literal hyphens being turned into en-dash
- Docs: Fix grammatical error
- Fix rsync_numtries example in default config
- Fix validation of rsync_numtries = 0 (#323)
- update readme with info on cross interval rotation
- replace deprecated `interval` with `retain` in readme example
- Minor bugfix: Check retval for termination by signal (#315)
- Fix typo in docs: rm trailing slash in backup_exec example (#314).

VERSION 1.4.5 (Dec 27 2022)
------------------------------------------------------------------------------
- Fix regression (#310)
- Merge pull request #303 from rsnapshot/update-HOWTO-to-talk-about-retain-instead-of-interval
- Removing legacy Docbook files, as per discussion at rsnapshot/rsnapshot#296
- Merge pull request #296 from hoclun-rigsep/hoclun-rigsep-patch-1
- Use @Prefix@ instead of hardcoded value in rsnapshot.conf.default.in comment line (#289).

VERSION 1.4.4 (Jun 12 2021)
------------------------------------------------------------------------------
- Add sentence explaining rsync_long|short_args + sign to man page (ref #11)
- Fix rsnapreport problems (incorrect header, fail when rsync present, fail with LVM) (#204)
- Add notes about documentation, and link to the website repo
- Fix for 'rsync_cleanup_after_native_cp_al() only works on directories' fail when sync_first on and cmd_cp not set (#133). Add test
- Fix for rm -rf failing when the path contains ./
- Suppress noisy error from non-GNU cp on BSD-ish machines, including MacOS
- Add CentOS 7 to successfully tested to docs
- Minor tidy up rel configure options --with-test-(true|false). Refs #189 (#248)
- Update travis build settings (#189). Dont use m4_esyscmd_s in configure.ac (#245)
- Update docs to remove dangling refs to HOWTO on rsnapshot.org.
- Skip both SSH tests (rather one) if SSH doesn't work
- Use perl-5.30 for tests (used in ubuntu 20.04 focal)
- Lower verbose level of rsync output to 1.3.x equivalent to work with rsnapreport.pl again
- Fix location of true and false binaries on macOS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants