diff --git a/doc/lib/pgBackRestDoc/Common/DocRender.pm b/doc/lib/pgBackRestDoc/Common/DocRender.pm index 6ded7486b..96b651df7 100644 --- a/doc/lib/pgBackRestDoc/Common/DocRender.pm +++ b/doc/lib/pgBackRestDoc/Common/DocRender.pm @@ -732,7 +732,8 @@ sub processTag my $strSection = $oTag->paramGet('section', false); # If a page/section link points to the current page then remove the page portion - if (defined($strPage) && defined($strSection) && $strPage eq $self->{strRenderOutKey}) + if (defined($strPage) && defined($strSection) && defined($self->{strRenderOutKey}) && + $strPage eq $self->{strRenderOutKey}) { undef($strPage); } @@ -821,6 +822,10 @@ sub processTag $strBuffer = "\\hyperref[$strUrl]{" . $oTag->valueGet() . "}"; } } + elsif ($strType eq 'text') + { + $strBuffer = $oTag->valueGet(); + } else { confess "'link' tag not valid for type ${strType}"; diff --git a/src/config/define.auto.c b/src/config/define.auto.c index 275f5d714..68ace58b2 100644 --- a/src/config/define.auto.c +++ b/src/config/define.auto.c @@ -101,7 +101,33 @@ static ConfigDefineCommandData configDefineCommandData[] = CFGDEFDATA_COMMAND_LI "summary of backups for the stanza(s) requested. This format is subject to change with any release.\n" "\n" "For machine-readable output use --output=json. The JSON output contains far more information than the text output and " - "is kept stable unless a bug is found." + "is kept stable unless a bug is found.\n" + "\n" + "Each stanza has a separate section and it is possible to limit output to a single stanza with the --stanza option. " + "The stanza 'status' gives a brief indication of the stanza's health. If this is 'ok' then pgBackRest is " + "functioning normally. The 'wal archive min/max' shows the minimum and maximum WAL currently stored in the " + "archive. Note that there may be gaps due to archive retention policies or other reasons.\n" + "\n" + "The 'backup/expire running' message will appear beside the 'status' information if one of those commands is currently " + "running on the host.\n" + "\n" + "The backups are displayed oldest to newest. The oldest backup will always be a full backup (indicated by an F at the " + "end of the label) but the newest backup can be full, differential (ends with D), or incremental (ends with I).\n" + "\n" + "The 'timestamp start/stop' defines the time period when the backup ran. The 'timestamp stop' can be used to determine " + "the backup to use when performing Point-In-Time Recovery. More information about Point-In-Time Recovery can be " + "found in the Point-In-Time Recovery section.\n" + "\n" + "The 'wal start/stop' defines the WAL range that is required to make the database consistent when restoring. The " + "backup command will ensure that this WAL range is in the archive before completing.\n" + "\n" + "The 'database size' is the full uncompressed size of the database while 'backup size' is the amount of data actually " + "backed up (these will be the same for full backups). The 'repository size' includes all the files from this " + "backup and any referenced backups that are required to restore the database while 'repository backup size' " + "includes only the files in this backup (these will also be the same for full backups). Repository sizes reflect " + "compressed file sizes if compression is enabled in pgBackRest or the filesystem.\n" + "\n" + "The 'backup reference list' contains the additional backups that are required to restore this backup." ) )