Merge branch 'main' into add-docs-for-launchpad-quickstart-setup

.custom_wordlist.txt

@@ -41,13 +41,15 @@ Bionic's
 Blazingly
 bool
 boolean
+borked
 BranchMergeProposal
 breakpoint
 browserconfig
 BrowserNotificationMessages
 brz
 BugSubscription
 bugtracker
+BugTask
 BugWatch
 BugWatches
 bugzilla
@@ -57,8 +59,13 @@ buildd
 builddeb
 bzr
 bzr's
+callgrind
 Canonical's
 CanonicalUrlData
+capitalization
+CategoryTesting
+CategoryTipsAndTricks
+cd
 Centralized
 centralized
 cfg
@@ -68,10 +75,12 @@ changelog
 changeset
 changesets
 charmcraft
+chroot
 Cmd
 CMDLINE
 Cobol
 codebase
+codebrowse
 Codehosting
 codehosting
 codeimport
@@ -91,9 +100,11 @@ cryptographic
 cryptographically
 CSCVS
 css
+ctl
 Ctrl
 customisable
 customisations
+customizations
 customize
 CVE
 Dalia
@@ -122,11 +133,15 @@ DecoratedResultSet
 DecoratedResultSets
 defense
 defense
+del
 deps
+deryck
 Desc
 dev
+devpad
 dh
 dia
+dir
 DirectDelivery
 directDelivery
 Distro
@@ -152,7 +167,9 @@ el
 else's
 emphasizes
 emphazising
+ENOSPC
 EnumCol
+environ
 epydoc
 Epytext
 ExceptionGuidelines
@@ -162,6 +179,7 @@ fastdowntime
 fastnodowntime
 favicons
 FK
+fk
 flavor
 FooBar
 foofunc
@@ -181,6 +199,7 @@ fti
 functiondef
 ganesha
 gangotri
+GDB
 geoIP
 geoip
 getFeatureFlag
@@ -196,6 +215,8 @@ hba
 hg
 hirsute's
 hostnames
+hotfix
+hotfixes
 howto
 HSTS
 html
@@ -206,6 +227,7 @@ IBranchMergeProposal
 IBranchTarget
 ICanonicalUrlData
 ICodeReviewMessage
+idx
 iframe
 iharness
 IMailDelivery
@@ -225,8 +247,13 @@ IPv
 IPython
 IRangeFactory
 irc
+IrcId
+ircid
 IRCMeetings
+IrcNickname
+ircnickname
 iter
+iterable
 Javadoc
 javascript
 JavascriptUnitTesting
@@ -235,7 +262,10 @@ jenkins
 jinja
 js
 JScript
+json
 JSONEncoder
+KCacheGrind
+kcachegrind
 keyring
 kiko
 kompare
@@ -247,6 +277,7 @@ LaunchpadFormView
 LaunchpadObjectFactory
 LaunchpadPpa
 LaunchpadProductionStatus
+LaunchpadStatementTracer
 LaunchpadView
 lazr
 libera
@@ -256,6 +287,7 @@ listdir
 ListRangeFactory
 LivePatching
 LiveScript
+LocationError
 logpoints
 logrotate
 lookup
@@ -268,6 +300,7 @@ Lp's
 lpbuildbot
 lpbuildd
 lpci
+LPCONFIG
 LPHowTo
 lpnet
 lpreview
@@ -287,6 +320,8 @@ matic
 maximize
 mbox
 mboxMailer
+Meinel's
+meliae
 MemCache
 memcache
 milestoneoverlay
@@ -297,14 +332,18 @@ minimize
 mmm
 MockIo
 mockups
+moin
 mojo
 mozilla
+mta
 natively
 NavigationMenu
 NavigationMenus
 newsampledata
+nextval
 nfs
 NPM
+normalized
 NTP
 NULLs
 né
@@ -327,6 +366,8 @@ organizing
 orm
 os
 OSA
+osageorang
+osageorange
 OWASP
 OWASP's
 PackageBranchTarget
@@ -341,10 +382,12 @@ pdb
 PersonBranchTarget
 pentested
 performant
+PerLanguageStatisticsView
 pgbouncer
 pgSQL
 pgsql
 pipx
+pkey
 plaintext
 png
 po
@@ -360,6 +403,7 @@ poller
 POMsgID
 pooler
 portlets
+postfix
 PostGreSQL
 PostgreSQL
 postgresql
@@ -394,10 +438,12 @@ programmatically
 prometheus
 proname
 proxied
+pstats
 psql
 px
 py
 pydoctor
+pygdb
 pypa
 PyPI
 qa
@@ -417,6 +463,7 @@ realizes
 ReleaseCycles
 repl
 repo
+RequestLogging
 RESTful
 resultset
 ResultSets
@@ -445,6 +492,7 @@ setupDTCBrowser
 setupRosettaExpertBrowser
 setuptools
 SFTP
+SIGHUP
 simplejson
 simplestreams
 Slony
@@ -470,14 +518,17 @@ sqlbuilder
 SQLObject
 SQLObject's
 SQLObjectResultSets
+sqltrace
 SRE
 SREs
 srv
 SshConnectionMultiplexing
 SSO
 StagingServer
 standardized
+stderr
 stdin
+stdout
 stepto
 steve
 stg
@@ -505,8 +556,10 @@ synchronize
 synchronizing
 syntax
 syntaxes
+sysctl
 systemd
 TableRenamePatch
+tal
 talisker
 TAs
 TeamEmail
@@ -526,21 +579,26 @@ TestsFromChanges
 TestsStyleGuide
 testtools
 textarea
+thusly
 TipsForReviewers
 TLS
+tmp
 todrop
 traceback
+tracebacks
 tradeoff
 tradeoffs
 Transactional
 TranslationGroup
 TranslationImportQueue
 TranslationMessage
 TranslationTemplateItem
+traveled
 traversers
 triaged
 triaging
 tsearch
+txt
 Ubuntu
 ubuntu
 UCT
@@ -549,11 +607,14 @@ unauthorized
 uncheck
 Uncomment
 unittest
+unittests
 unobvious
 unproxied
 unsuffixed
 untriaged
 untrusted
+upd
+updatable
 upstreams
 url
 urls
@@ -573,12 +634,14 @@ VM
 VMs
 VPN
 VPOTExport
+VSCode
 webapp
 webdav
 webhook
 webservice
 webservice's
 webservices
+wget
 wgrant's
 whitespace
 wildcherry

.wordlist.txt

@@ -9,6 +9,7 @@ Charmhub
 CLI
 conf
 contactuser
+cronscripts
 datetime
 DateTime
 DBA

custom_conf.py

@@ -127,10 +127,7 @@
     'https://wiki.canonical.com/InformationInfrastructure/OSA/LPHowTo/ManualCdImageMirrorProber',  # private
     'Trunk/Glue',  # needs update
     '/Background', 
-    '/HowToUseCodehostingLocally',  # needs update
-    'Database/TableRenamePatch',  # needs update
-    'Debugging#Profiling%20page%20requests',  # needs update
-    'Debugging#Special%20URLs',  # needs update
+    '/Concepts',  # needs update
     'JavascriptUnitTesting/MockIo',  # needs update
     'https://git.launchpad.net/launchpad-mojo-specs/tree/mojo-lp-git/services',  # private
     'https://wiki.canonical.com/InformationInfrastructure/OSA/LaunchpadProductionStatus',  # private
@@ -142,6 +139,7 @@
     r'https://github\.com/canonical/fetch-operator*',  # private
     'https://git.launchpad.net/charm-launchpad-buildd-image-modifier/tree/files/scripts/setup-ppa-buildd',  # private
     'https://git.zx2c4.com/cgit/', # unfortunately very flaky
+    'https://wiki.canonical.com/InformationInfrastructure/OSA/RequestLogging/LP/Cowboys',  # private
     ]
 
 # Pages on which to ignore anchors

explanation/charms.rst

@@ -17,7 +17,7 @@ with one or more `units <https://juju.is/docs/olm/unit>`_.  The layers
 provide common code used by multiple charms.  The specs are used with `Mojo
 <https://mojo.canonical.com/>`_ to coordinate whole deployments of multiple
 applications; they contain configuration of individual applications and
-`integrations <https://juju.is/docs/olm/integration>`_ between applications.
+`integrations <https://juju.is/docs/juju/relation>`_ between applications.
 
 Principles
 ==========
@@ -71,7 +71,7 @@ Creating a Launchpad charm
 --------------------------
 
 If you don't already have a suitable testbed, then see the `Juju tutorial
-<https://juju.is/docs/olm/get-started-with-juju>`_ for how to set one up;
+<https://juju.is/docs/juju/tutorial>`_ for how to set one up;
 you should use the non-Kubernetes approach here.
 
 Assuming you have a suitable testbed to deploy charms with Juju, you can follow

explanation/code.rst

@@ -31,8 +31,7 @@ other asynchronous jobs associated with them.
 The `codehosting overview diagram :attachment:../images/codehosting.png`
 summarises how some of these systems interact.
 
-You can `run the codehosting system
-locally </HowToUseCodehostingLocally>`__.
+You can :doc:`run the codehosting system locally <../how-to/codehosting-locally>`.
 
 We no longer put significant effort into bzr hosting beyond making sure
 it remains functional. The future of bzr is